Open

Nathan's awesome pull request#20
n8xm wants to merge 108 commits intoCIS565-Fall-2013:masterfrom n8xm:master

Nathan's awesome pull request#20

Open

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

+22,828-364

Commits on Nov 3, 2013

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

Commits on Nov 4, 2013

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

Commits on Nov 5, 2013

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

Commits on Nov 7, 2013

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

Commits on Nov 8, 2013

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

Commits on Nov 9, 2013

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