Nathan's pull request#11

Open

n8xm wants to merge 47 commits into

CIS565-Fall-2013:masterfrom

n8xm:master

Commits on Nov 13, 2013

Got rid of the vingette (how do you spell that?) effect to make
Nathan Marshak
committed
Got a yellow quad working for a single light
Nathan Marshak
committed

Commits on Nov 14, 2013

Merge remote-tracking branch 'upstream/master'
Nathan Marshak
committed
Now we have one light working, except that we can see the edge of the
Nathan Marshak
committed
Got a decent linear falloff going. Ideally the falloff should follow
Nathan Marshak
committed
Well we have a bunch of lights now... they aren't adding to each other
Nathan Marshak
committed
Linear falloff looks more or less correct. I think the real problem is
Nathan Marshak
committed
Using quadratic falloff. Looks way better.
Nathan Marshak
committed

Commits on Nov 15, 2013

Got the light spacing to be a little more palatable
Nathan Marshak
committed
Added teapot and scaled teapot models.
Nathan Marshak
committed
Updated readme with credits
Nathan Marshak
committed
Got toon shading working for ambient light!
Nathan Marshak
committed
Got toon shading working in the deferred part of the shader now... time
Nathan Marshak
committed
Code in place for passing the view dir to the ambient shader.
Nathan Marshak
committed
Well... passing in the view dir sort of works. Seems somehow offset.
Nathan Marshak
committed
Well, passed model and view in
Nathan Marshak
committed
Camera view direction, DONE!
Nathan Marshak
committed
Now we have the view direction (dot normal) calculated korrectly. Time
Nathan Marshak
committed
Now we have an idea of the texcoords in the post-process shader
Nathan Marshak
committed
Got screenspace x and y working, I think?
Nathan Marshak
committed
Successfully isolated 1/4 of the screen...
Nathan Marshak
committed
Now we got screenspace y to go down instead of up.
Nathan Marshak
committed
Now we have some basic code down for convolution with a filter.
Nathan Marshak
committed
Added a pixToNDC function.
Nathan Marshak
committed
Blur filter works. It flips the image tho
Nathan Marshak
committed
Blur filter now doesn't flip the image vertically
Nathan Marshak
committed
Got basic countouring working! Woot!
Nathan Marshak
committed
Moved contouring to the ambient shader
Nathan Marshak
committed
We can now toggle between toon and diffuse in the ambient shader.
Nathan Marshak
committed
Now we can toggle between toon and phong/diffuse. I still need to be
Nathan Marshak
committed
Now we can toggle the outline when toggling toon shading.
Nathan Marshak
committed

Commits on Nov 16, 2013

Tried to add a specular channel to the G-buffer. Doesn't work though.
Nathan Marshak
committed
I think I drew a specular texture without crashing everything
Nathan Marshak
committed
Now we can write to the specular map WITHOUT HAVING THE SCREEN TURN
Nathan Marshak
committed
The specular map ACTUALLY WORKS NAO!!!
Nathan Marshak
committed
Got some basic code down for calculating the specular term. Now to
Nathan Marshak
committed
Got specular to work. I don't think I'm calculating the cosine power
Nathan Marshak
committed
Changed the specular coefficients so that the difference is more visible
Nathan Marshak
committed
Well, now we pass the view direction into the point shader with no
Nathan Marshak
committed
Got specular working on the point (deferred) lights too! That's it for
Nathan Marshak
committed
Now we are using a scalar filter response in Ambient.frag
Nathan Marshak
committed
Added README
Nathan Marshak
committed
Hopefully, fixed images
Nathan Marshak
committed
Hopefully, fixed the readme a little more
Nathan Marshak
committed
Now we moved light into a function for easier profiling.
Nathan Marshak
committed
Added chart!
Nathan Marshak
committed
Update README.md
Nathan Marshak
committed