Nathan's awesome pull request#20

Open

n8xm wants to merge 108 commits into

CIS565-Fall-2013:masterfrom

n8xm:master

Commits on Nov 3, 2013

Now we have a nice, pleasant wave! But it doesn't animate yet.
Nathan Marshak
committed
Got some motion going! Now I just have to color it to be able to make
Nathan Marshak
committed
We haz color!
Nathan Marshak
committed
Got simplex noise to work!
Nathan Marshak
committed
Got the night color working
Nathan Marshak
committed
Added some day/night blending. Doesn't work well though
Nathan Marshak
committed
Got a nice, smooth, day/night transition going
Nathan Marshak
committed
Got a NIGHT_EPSILON that actually looks good...
Nathan Marshak
committed

Commits on Nov 4, 2013

Now we added specular map to the globe.
Nathan Marshak
committed
Static clouds working. They don't scroll yet, and we also haven't
Nathan Marshak
committed
Black clouds working.
Nathan Marshak
committed
Added diffuse shading on the clouds
Nathan Marshak
committed
Merge remote-tracking branch 'upstream/master'
Nathan Marshak
committed

Commits on Nov 5, 2013

Normal map almost works. I don't think we should be applying the normal
Nathan Marshak
committed
Now the clouds aren't affected by the bump-mapping.
Nathan Marshak
committed
Added rim lighting.
Nathan Marshak
committed

Commits on Nov 7, 2013

Added heightmap. Last commit before I try to do terrain rendering.
Nathan Marshak
committed
Added terrain renderer.
Nathan Marshak
committed
Code for texture... I think works?
Nathan Marshak
committed
Now we've put in the basic parts to get the texture and bind the
Nathan Marshak
committed
Well... we have a flat plane. No cool results yet.
Nathan Marshak
committed
I don't think we are reading the texture in properly...
Nathan Marshak
committed
Changed texture size to a power of 2
Nathan Marshak
committed
Back at square one. Now using Mozilla's tutorial to inject textures
Nathan Marshak
committed
Proof that positions are between 0 and 1.
Nathan Marshak
committed
TEH HEIGHT FIELD IS WORKING ZOMG
Nathan Marshak
committed
Got height field to rotate!
Nathan Marshak
committed
Got Mt. Fuji Working!
Nathan Marshak
committed
Reinier working... and now it looks like real terrain!
Nathan Marshak
committed
Got a properly-scaled Mt. Fuji working
Nathan Marshak
committed
Now we can toggle the rotation direction...
Nathan Marshak
committed
All the parts are in place for loading two height fields. Now I just
Nathan Marshak
committed
Toggling between the two textures as height maps works!
Nathan Marshak
committed
Halfway blend between the two height fields is working....
Nathan Marshak
committed
Renamed "rotateDir" to "blendDir". Also, added clamping to heightBlend.
Nathan Marshak
committed
Added and centered the "Mt. Fuji" and "Mt. Rainier" buttons.
Nathan Marshak
committed
Code is down but there iz no blending
Nathan Marshak
committed
Blending between fragments works! WOO HOO!!!
Nathan Marshak
committed
Dark background a-go-go!
Nathan Marshak
committed
Got rid of unnecessary uniform.
Nathan Marshak
committed

Commits on Nov 8, 2013

I think my GET request actualy worked!
Nathan Marshak
committed
I think that the GET request succeeded?
Nathan Marshak
committed
We get a response back but there's nothing in it...
Nathan Marshak
committed
ZOMG WE HAZ THE LATITUDE IN THE CONSOLE
Nathan Marshak
committed
JSON working in my javascript file!!! YAY
Nathan Marshak
committed
Added a part3 to add the orbiting ISS visualization.
Nathan Marshak
committed
We haz a new initializeSphere() function that makes the globe smaller...
Nathan Marshak
committed
Allright, now we put the vertex attributes for sphere2 in a different
Nathan Marshak
committed
Allright! We were able to initialize a separate shader for the other
Nathan Marshak
committed
Named programs as globe_program and iss_program
Nathan Marshak
committed
We wre able to recenter the small globe which represents the ISS. Now we
Nathan Marshak
committed
Moved initializeSphere into the animation loop... not the best idea,
Nathan Marshak
committed
We haz two models! YAY!
Nathan Marshak
committed
Got the "ISS" to orbit at a reasonable "altitude"
Nathan Marshak
committed
Now we finally got the ISS coordinates out of the JSON function
Nathan Marshak
committed

Commits on Nov 9, 2013

Now I got spherical coordinates working properly.
Nathan Marshak
committed
We are at (0,0) latitude and longitude! YAY!
Nathan Marshak
committed
I think I got the coordinates to work correctly in Degrees North and
Nathan Marshak
committed
Iss location is now plugged in!
Nathan Marshak
committed
Now we update once every five seconds! YAYNESS!
Nathan Marshak
committed
Got mah square working!
Nathan Marshak
committed
Scaled the square to a more reasonable size.
Nathan Marshak
committed
Got the patch to face the camera...
Nathan Marshak
committed
Recentered the square so the rotation bug is slightly more palatable
Nathan Marshak
committed
Ready to plug in the ISS shader (which just draws a transparent texture)
Nathan Marshak
committed
ISS working with a separate fragment shader. YAY!!!
Nathan Marshak
committed
ISS LOGO IS WORKING!!! WOO HOO!!!
Nathan Marshak
committed
ISS transparency, WORKING!
Nathan Marshak
committed
Got the day/night on the globe to reflect the Earth's real day/night
Nathan Marshak
committed
Incorporated minutes and seconds into the day/night calculation.
Nathan Marshak
committed
We have drawn our single line!
Nathan Marshak
committed
ISS is just over south america
Nathan Marshak
committed
Got num verts working correctly again!
Nathan Marshak
committed
Added law for number of vertices for trail
Nathan Marshak
committed
Allright, I think that the array for trail drawing is ready
Nathan Marshak
committed
Trail draws! YAY!
Nathan Marshak
committed
Fixed the depth-ordering problem by drawing the ISS logo AFTER drawing
Nathan Marshak
committed
Last commit before performance testing.
Nathan Marshak
committed
Fixed globe in part 2
Nathan Marshak
committed
Now we got rid of unnecessary shader initialization
Nathan Marshak
committed
Well, now we initialize the shader 3 more intelligently
Nathan Marshak
committed
NOW it's much faster because we don't initialize the stupid shaders each
Nathan Marshak
committed
Last commit before gh-pages.
Nathan Marshak
committed
Updated README for the first time
Nathan Marshak
committed
Updated heading
Nathan Marshak
committed
Updated title again
Nathan Marshak
committed
Added links and bullets to README
Nathan Marshak
committed
Fixed bullets and links
Nathan Marshak
committed
Added our first screenshot
Nathan Marshak
committed
Added more links, plus some glsl
Nathan Marshak
committed
Edited GLSL part
Nathan Marshak
committed
Added glsl
Nathan Marshak
committed
Got rid of the color adding thing
Nathan Marshak
committed
Added links to the other wave demos
Nathan Marshak
committed
Updated frag globe to be centered, plus back bg
Nathan Marshak
committed
Added the day/night calculation to readme
Nathan Marshak
committed
Added performance analysis.
Nathan Marshak
committed
Adjusted spacing around performance analysis
Nathan Marshak
committed
Added link to video of the ISS tracker
Nathan Marshak
committed
Got rid of those pesky periods
Nathan Marshak
committed
Fixed links to demos (hopefully)
Nathan Marshak
committed
Added better disclaimer
Nathan Marshak
committed
fixed more broken URLs
Nathan Marshak
committed
Update README.md
Nathan Marshak
committed
Update README.md
Nathan Marshak
committed
Update README.md
Nathan Marshak
committed
Update README.md
Nathan Marshak
committed
Update README.md
Nathan Marshak
committed