Skip to content

Nathan's pull request#11

Open
n8xm wants to merge 47 commits intoCIS565-Fall-2013:masterfrom
n8xm:master
Open

Nathan's pull request#11
n8xm wants to merge 47 commits intoCIS565-Fall-2013:masterfrom
n8xm:master

Conversation

@n8xm
Copy link

@n8xm n8xm commented Nov 16, 2013

Whee!!

Nathan Marshak added 30 commits November 12, 2013 23:18
Got rid of the vingette (how do you spell that?) effect to make
ab9e2a6 
debugging a little easier.
Got a yellow quad working for a single light
b123b24
Merge remote-tracking branch 'upstream/master'
9486670
Now we have one light working, except that we can see the edge of the
cfe6eba 
tile... yuck... how do we fix that?
Got a decent linear falloff going. Ideally the falloff should follow
8258790 
some inverse square law...
Well we have a bunch of lights now... they aren't adding to each other
659481a 
properly though.
Linear falloff looks more or less correct. I think the real problem is
c540086 
the linear falloff...
Using quadratic falloff. Looks way better.
dcbad0c
Got the light spacing to be a little more palatable
8af8211
Added teapot and scaled teapot models.
85bfaed
Updated readme with credits
6b3e438
Got toon shading working for ambient light!
aa0ac00
Got toon shading working in the deferred part of the shader now... time
e214692 
to add silhouetting...
Code in place for passing the view dir to the ambient shader.
c4bb6e8
Well... passing in the view dir sort of works. Seems somehow offset.
df8b54b
Well, passed model and view in
fb1c080
Camera view direction, DONE!
e6845c5
Now we have the view direction (dot normal) calculated korrectly. Time
503f493 
to use it to try to get some basic contouring...
Now we have an idea of the texcoords in the post-process shader
ca018c5
Got screenspace x and y working, I think?
f4d4baf
Successfully isolated 1/4 of the screen...
1b853a5
Now we got screenspace y to go down instead of up.
ba71bcb
Now we have some basic code down for convolution with a filter.
9b30d31
Added a pixToNDC function.
792ec1a
Blur filter works. It flips the image tho
0d97418
Blur filter now doesn't flip the image vertically
956733f
Got basic countouring working! Woot!
c95ccd7
Moved contouring to the ambient shader
99b2a6f
We can now toggle between toon and diffuse in the ambient shader.
e5dcbfe
Now we can toggle between toon and phong/diffuse. I still need to be
00dfc72 
able to toggle the outline.
Nathan Marshak and others added 17 commits November 15, 2013 16:52
Now we can toggle the outline when toggling toon shading.
ebefad7
Tried to add a specular channel to the G-buffer. Doesn't work though.
e85c906
I think I drew a specular texture without crashing everything
749cc6f
Now we can write to the specular map WITHOUT HAVING THE SCREEN TURN
db8e03e 
BLACK!
The specular map ACTUALLY WORKS NAO!!!
148b9ef
Got some basic code down for calculating the specular term. Now to
8e18892 
debug.
Got specular to work. I don't think I'm calculating the cosine power
480f1de 
correctly though
Changed the specular coefficients so that the difference is more visible
648a07b
Well, now we pass the view direction into the point shader with no
5d059b8 
incidents.
Got specular working on the point (deferred) lights too! That's it for
b60a0bc 
my additional g-buffer feature!
Now we are using a scalar filter response in Ambient.frag
83d5617
Added README
423eb89
Hopefully, fixed images
532cf96
Hopefully, fixed the readme a little more
3ccd31f
Now we moved light into a function for easier profiling.
c440b87
Added chart!
807b83a
Update README.md
ce7a80b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@n8xm