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
Andrzej Kapolka
310c0288c7
Changed atmosphere radius to 1000 meters.
2013-05-08 10:31:13 -07:00
Andrzej Kapolka
8895cbeb6c
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 10:01:34 -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
ZappoMan
7d4663a2d5
Merge pull request #241 from Ventrella/master
...
cleaned up some spacing issues in code formatting in Orientation class
2013-05-08 01:34:58 -07:00
Jeffrey Ventrella
9d17df27bf
Merge remote-tracking branch 'upstream/master'
2013-05-07 18:33:21 -07:00
Jeffrey Ventrella
2d8c15e0cb
cleaned up some spacing issues in Orientarion class
2013-05-07 18:32:56 -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
44f596653e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:50:27 -07:00
ZappoMan
c8fbb037ab
Merge pull request #240 from birarda/master
...
member variable change in AgentList
2013-05-07 17:47:42 -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
9658c40dd6
change lastAgentId member variable to _lastAgentID
2013-05-07 17:17:47 -07:00
birarda
24193bf1a7
Merge pull request #239 from birarda/master
...
remove serial closing in SerialInterface destructor
2013-05-07 17:10:24 -07:00
Stephen Birarda
75ba88923f
remove the serial interface close in destructor, incorrect solution
2013-05-07 17:09:49 -07:00
birarda
106dd3c6d2
Merge pull request #238 from birarda/off-axis
...
exaggerate the off-axis effect, fix double variable declaration
2013-05-07 17:03:55 -07:00
Stephen Birarda
70a6466a56
fix for bearingRelativeAngleToSource breaking spatialised audio
2013-05-07 17:02:41 -07:00
Stephen Birarda
37aee09968
fix order of angle calculations
2013-05-07 15:43:28 -07:00
Stephen Birarda
681044e3a6
add debugging output and value change for off-axis
2013-05-07 15:24:15 -07:00
Andrzej Kapolka
a1c3e8515d
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:11:55 -07:00
birarda
ea12fbffa0
Merge pull request #236 from birarda/master
...
ground eve
2013-05-07 15:11:27 -07:00
Stephen Birarda
8daae1dd1d
bring eve closer to the ground after scale changes
2013-05-07 15:11:01 -07:00
Andrzej Kapolka
b245e16623
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:10:55 -07:00
Andrzej Kapolka
7c9b0d8f58
Have the voxel server push out an environment packet with its regular updates.
2013-05-07 15:10:02 -07:00
birarda
a1d9ee5bfe
Merge pull request #235 from birarda/master
...
fix bytes read per avatar due to inclusion of agent ID
2013-05-07 15:06:06 -07:00
Stephen Birarda
11b2271b91
size of agent ID must be included in bytes read per avatar
2013-05-07 15:05:31 -07:00
birarda
36c95bdee4
Merge pull request #234 from birarda/master
...
fix other avatar unpacking from avatar mixer bulk packet
2013-05-07 14:58:05 -07:00
Stephen Birarda
e8fbfcab05
fix unpacking of other avatars in avatar mixer bulk packet
2013-05-07 14:57:24 -07:00
Andrzej Kapolka
e40edd07e4
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 14:44:33 -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
birarda
a28f345847
Merge pull request #233 from birarda/master
...
spacing cleanup
2013-05-07 14:41:44 -07:00
Stephen Birarda
6bad72a18e
spacing cleanup in audio-mixer main
2013-05-07 14:41:20 -07:00
Andrzej Kapolka
47f3566929
Wavelengths, switch for environment rendering, far plane adjustment.
2013-05-07 14:40:30 -07:00
birarda
e69b0c17a3
Merge pull request #232 from birarda/master
...
variable fixes for audio mixer loopback
2013-05-07 14:32:44 -07:00
Stephen Birarda
a87e0d7f7f
variable fixes for audio-mixer loopback
2013-05-07 14:32:15 -07:00
birarda
68ead2f309
Merge pull request #231 from birarda/master
...
fix loopback from audio mixer
2013-05-07 14:30:29 -07:00
Stephen Birarda
82cff262b1
for agent loopback perform no distance and angle calculations
2013-05-07 14:28:48 -07:00
birarda
ff5fb0f729
Merge pull request #230 from birarda/master
...
fix audio mixer loopback
2013-05-07 13:50:27 -07:00
Stephen Birarda
00c11d82b2
if the agent stops asking for loopback make sure the flag is set false
2013-05-07 13:50:01 -07:00
ZappoMan
ab82bfc9d8
Merge pull request #229 from birarda/interface-send-id
...
make eve send her ID to identify with the avatar mixer
2013-05-07 13:47:50 -07:00
Stephen Birarda
3719454abd
use constants for eve's hand grabbing behavior
2013-05-07 13:47:12 -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
ZappoMan
cdc5112497
Merge pull request #228 from birarda/interface-send-id
...
have interface send ID to AM and VS
2013-05-07 12:45:49 -07:00
Stephen Birarda
0566330a8a
some magic number removals
2013-05-07 12:44:45 -07:00
Stephen Birarda
5ccc6d6d20
prefer sizeOf to hardcoded byte
2013-05-07 12:42:10 -07:00
