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
ff5294b
Got some motion going! Now I just have to color it to be able to make
Nathan Marshak
committed
214a186
We haz color!
Nathan Marshak
committed
d666939
Got simplex noise to work!
Nathan Marshak
committed
b613f9f
Got the night color working
Nathan Marshak
committed
bbb1739
Added some day/night blending. Doesn't work well though
Nathan Marshak
committed
3e5c3b3
Got a nice, smooth, day/night transition going
Nathan Marshak
committed
77d69fd
Got a NIGHT_EPSILON that actually looks good...
Nathan Marshak
committed
b7c0f39

Commits on Nov 4, 2013

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

Commits on Nov 5, 2013

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

Commits on Nov 7, 2013

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

Commits on Nov 8, 2013

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

Commits on Nov 9, 2013

Now I got spherical coordinates working properly.
Nathan Marshak
committed
ce18eaa
We are at (0,0) latitude and longitude! YAY!
Nathan Marshak
committed
2019839
I think I got the coordinates to work correctly in Degrees North and
Nathan Marshak
committed
73313d7
Iss location is now plugged in!
Nathan Marshak
committed
31db09a
Now we update once every five seconds! YAYNESS!
Nathan Marshak
committed
8df372d
Got mah square working!
Nathan Marshak
committed
e4ab952
Scaled the square to a more reasonable size.
Nathan Marshak
committed
9e71d20
Got the patch to face the camera...
Nathan Marshak
committed
9db20ab
Recentered the square so the rotation bug is slightly more palatable
Nathan Marshak
committed
802b25a
Ready to plug in the ISS shader (which just draws a transparent texture)
Nathan Marshak
committed
31fddeb
ISS working with a separate fragment shader. YAY!!!
Nathan Marshak
committed
342472a
ISS LOGO IS WORKING!!! WOO HOO!!!
Nathan Marshak
committed
bcb7249
ISS transparency, WORKING!
Nathan Marshak
committed
0bab738
Got the day/night on the globe to reflect the Earth's real day/night
Nathan Marshak
committed
b52257d
Incorporated minutes and seconds into the day/night calculation.
Nathan Marshak
committed
27ef446
We have drawn our single line!
Nathan Marshak
committed
0330330
ISS is just over south america
Nathan Marshak
committed
83e572c
Got num verts working correctly again!
Nathan Marshak
committed
c66dcf4
Added law for number of vertices for trail
Nathan Marshak
committed
ce33a9f
Allright, I think that the array for trail drawing is ready
Nathan Marshak
committed
e91933a
Trail draws! YAY!
Nathan Marshak
committed
41d7899
Fixed the depth-ordering problem by drawing the ISS logo AFTER drawing
Nathan Marshak
committed
a1f8513
Last commit before performance testing.
Nathan Marshak
committed
6b0380b
Fixed globe in part 2
Nathan Marshak
committed
1e48903
Now we got rid of unnecessary shader initialization
Nathan Marshak
committed
542a1f8
Well, now we initialize the shader 3 more intelligently
Nathan Marshak
committed
27d117c
NOW it's much faster because we don't initialize the stupid shaders each
Nathan Marshak
committed
6e955b3
Last commit before gh-pages.
Nathan Marshak
committed
6f543e5
Updated README for the first time
Nathan Marshak
committed
66a60a4
Updated heading
Nathan Marshak
committed
a994e4e
Updated title again
Nathan Marshak
committed
839f2ce
Added links and bullets to README
Nathan Marshak
committed
09466ac
Fixed bullets and links
Nathan Marshak
committed
21fd836
Added our first screenshot
Nathan Marshak
committed
7e336f1
Added more links, plus some glsl
Nathan Marshak
committed
9403c0c
Edited GLSL part
Nathan Marshak
committed
a39c528
Added glsl
Nathan Marshak
committed
57fff09
Got rid of the color adding thing
Nathan Marshak
committed
a461c04
Added links to the other wave demos
Nathan Marshak
committed
ae72821
Updated frag globe to be centered, plus back bg
Nathan Marshak
committed
89ffe6e
Added the day/night calculation to readme
Nathan Marshak
committed
1014264
Added performance analysis.
Nathan Marshak
committed
9ef927e
Adjusted spacing around performance analysis
Nathan Marshak
committed
efc5d75
Added link to video of the ISS tracker
Nathan Marshak
committed
360fd14
Got rid of those pesky periods
Nathan Marshak
committed
fe142c4
Fixed links to demos (hopefully)
Nathan Marshak
committed
6796c74
Added better disclaimer
Nathan Marshak
committed
6f03c35
fixed more broken URLs
Nathan Marshak
committed
6b468dc
Update README.md
Nathan Marshak
committed
16f19a0
Update README.md
Nathan Marshak
committed
e47efe1
Update README.md
Nathan Marshak
committed
dc7bbde
Update README.md
Nathan Marshak
committed
beb1bad
Update README.md
Nathan Marshak
committed
1578222