ZappoMan
4301506f0c
Merge pull request #249 from ey6es/master
...
Fix for build error on OS X.
2013-05-08 15:07:08 -07:00
Andrzej Kapolka
1f58e28b36
Need the ARB suffix on this. I'm surprised it compiled for me!
2013-05-08 15:05:35 -07:00
Philip Rosedale
5e450827d8
Merge pull request #237 from ey6es/master
...
Added basic environment data and atmosphere rendering.
2013-05-08 15:01:12 -07:00
Philip Rosedale
fd5789abb8
Merge remote-tracking branch 'upstream/master'
2013-05-08 14:40:53 -07:00
Philip Rosedale
a9882d054f
Invensense gyros now correctly controlling head motion, code cleanups.
2013-05-08 14:39:41 -07:00
Andrzej Kapolka
1c8b835bb8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 13:15:21 -07:00
Andrzej Kapolka
caeccf59ec
When the stars and the atmosphere are both on, adjust the stars' alpha value
...
based on the distance from the atmosphere.
2013-05-08 13:13:56 -07:00
ZappoMan
0b873dddc8
Merge pull request #244 from Ventrella/master
...
moved Orientation class to shared folder
2013-05-08 12:51:26 -07:00
Andrzej Kapolka
8a21823469
Render the stars, when enabled, before the atmosphere.
2013-05-08 12:11:48 -07:00
ZappoMan
7a5ce57b4e
added alwaysDisplay mode to PerformanceWarnings class
2013-05-08 12:01:55 -07:00
Andrzej Kapolka
c34b6df2f4
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
voxel-server/src/main.cpp
2013-05-08 11:56:03 -07:00
Andrzej Kapolka
5138f62aef
Use the "proper" alpha value (i.e., the one from the original shader). This
...
makes the sky somewhat darker, but that probably just means we need more
scattering or a brighter sun.
2013-05-08 11:50:59 -07:00
Andrzej Kapolka
82f16e7f34
Include the "sky from space" shaders, too, and use them when the camera is
...
outside the atmosphere's outer radius.
2013-05-08 11:42:31 -07:00
Philip Rosedale
131377aaf9
Converted gyro values to floats and converted to exact degrees/second per docs.
2013-05-08 11:22:49 -07:00
Andrzej Kapolka
8d4a74cf03
Render environment -> render atmosphere.
2013-05-08 10:00:31 -07:00
Andrzej Kapolka
4567c31a26
Added licensing information from the GPU Gems site, fixed spacing.
2013-05-08 09:55:46 -07:00
Jeffrey Ventrella
9e60c8a36e
increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder
2013-05-08 08:59:29 -07:00
ZappoMan
de969891d8
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 01:19:35 -07:00
ZappoMan
ddf49ffdec
removed addRandomSphere() which was dead code
2013-05-08 00:46:02 -07:00
ZappoMan
f1425216ba
removed VoxelSystem::createSphere() which was dead code
2013-05-08 00:45:27 -07:00
Andrzej Kapolka
80cdd597f4
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:53:27 -07:00
ZappoMan
085bfa384a
Merge pull request #225 from PhilipRosedale/master
...
Added perlin noise example function noiseTest()
2013-05-07 17:53:07 -07:00
ZappoMan
005b2fce35
Merge pull request #223 from Ventrella/master
...
cleaned up a bunch of spacings inside of parentheses
2013-05-07 17:51:43 -07:00
Andrzej Kapolka
9e6e5acf19
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:42:47 -07:00
Andrzej Kapolka
7c8a06ed4d
Added wrapper classes for shaders/shader programs to ease the process of
...
compiling, linking, assigning uniforms, etc. They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
2013-05-07 17:40:55 -07:00
Stephen Birarda
75ba88923f
remove the serial interface close in destructor, incorrect solution
2013-05-07 17:09:49 -07:00
Andrzej Kapolka
c7e31ec414
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-07 14:44:17 -07:00
Andrzej Kapolka
47f3566929
Wavelengths, switch for environment rendering, far plane adjustment.
2013-05-07 14:40:30 -07:00
Stephen Birarda
92daa8e6e0
revert the type squish
2013-05-07 13:43:07 -07:00
Stephen Birarda
9be92cebdd
revert type squish, spacing, code review comment
2013-05-07 13:41:48 -07:00
Stephen Birarda
d5d9479b65
make eve send her ID to identify with the avatar mixer
2013-05-07 13:38:56 -07:00
Stephen Birarda
0566330a8a
some magic number removals
2013-05-07 12:44:45 -07:00
Andrzej Kapolka
7faa9e4318
More work on atmosphere rendering; rendering now working.
2013-05-07 12:40:15 -07:00
Stephen Birarda
85dfb23fbd
add constant for UNKNOWN_AGENT_ID
2013-05-07 12:39:35 -07:00
Stephen Birarda
83e59b1aa8
more deletions
2013-05-07 12:05:32 -07:00
Stephen Birarda
5c90b4575e
trivial deletions for cleanup
2013-05-07 12:05:25 -07:00
Stephen Birarda
4eeb1ed5b1
have interface clients tell the avatar-mixer and voxel-server what their ID is
2013-05-07 12:05:19 -07:00
Philip Rosedale
331d4116d9
Finished noiseTest example (in util.h) that uses Perlin noise to draw a bitmap in 2D.
2013-05-07 11:14:12 -07:00
Philip Rosedale
be1b803656
Noise Test function, adjust chat position
2013-05-07 10:41:39 -07:00
Philip Rosedale
27540f1286
Fixes per code review
2013-05-07 09:59:37 -07:00
Jeffrey Ventrella
fe11d929e3
cleaned up code spacing
2013-05-07 08:43:14 -07:00
Philip Rosedale
c7635604a9
Fixes in merge.
2013-05-07 08:40:11 -07:00
Jeffrey Ventrella
65181cb4e0
changed some spacing formatting things
2013-05-06 22:23:16 -07:00
Philip Rosedale
31593dccd4
improved comment of function
2013-05-06 18:46:19 -07:00
Philip Rosedale
00c8673ceb
Added Utility function angleBetween() which returns the positive angle between any two 3D vectors.
2013-05-06 18:45:06 -07:00
Jeffrey Ventrella
ef76c6ba0a
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:29:42 -07:00
Jeffrey Ventrella
22a0e39d6c
more work on avatar touch, reachable radius, and hand states
2013-05-06 18:29:20 -07:00
Philip Rosedale
631ee8f478
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:23:06 -07:00
Stephen Birarda
d4ca60a668
remove image files that are no longer in use
2013-05-06 18:11:57 -07:00
Stephen Birarda
55a1e26585
remove the Texture class no longer in use
2013-05-06 18:10:21 -07:00
