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
Philip Rosedale
9dd2f2e589
Merge pull request #242 from ZappoMan/render_voxels_optimization
...
Fixed some bugs, and made better scenes
2013-05-08 10:34:54 -07:00
Andrzej Kapolka
310c0288c7
Changed atmosphere radius to 1000 meters.
2013-05-08 10:31:13 -07:00
ZappoMan
e508c9fedc
removed a redundant comment
2013-05-08 10:04:06 -07:00
ZappoMan
9a9656708c
CR cleanup
2013-05-08 10:03:05 -07:00
Andrzej Kapolka
8895cbeb6c
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 10:01:34 -07:00
ZappoMan
bc55c09ed7
Added more SceneUtils support cleaned up voxel-edit to use scene utils
...
- Added addCornersAndAxisLines() scene
- Added addSurfaceScene() scene
- moved improved addSphereScene() from voxel-edit to SceneUtils.cpp
- added command line options to voxel-edit to create different scenes
2013-05-08 02:15:39 -07:00
ZappoMan
cdf72711b5
cleaned up compiler warning
2013-05-08 02:15:10 -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
b459cbc8ea
Fixed a couple bugs in pointToVoxel()
...
- fixed a byte packing bug related to having exactly 7 bits of octal data
where we weren't correctly packing the last bit and moving the byte count
forward. This resulted in bogus colors being written
- fixed a bug for points that exactly match an octet boundary test creating
voxels that are one a unit smaller than they should be
2013-05-08 01:16:07 -07:00
ZappoMan
6f05403c0d
added SceneUtils.h/.cpp which moves addSphereScene() to a common location
2013-05-08 01:06:10 -07:00
ZappoMan
7d6b28dd4d
Tweaks to createSphere() plus some new helper functions
...
- changed createSphere() to support new NATURAL mode which uses perlin
noise to create natural color and shape
- added getVoxelCount()
- coding standard cleanup
2013-05-08 01:02:55 -07:00
ZappoMan
146334e4d7
dead code cleanup
2013-05-08 00:49:37 -07:00
ZappoMan
2cee643e7c
update TREE_SCALE to 128 so it's power of 2, and MAX_VOXELS_PER_SYSTEM to 500k
2013-05-08 00:47:42 -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
44f596653e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:50:27 -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
Andrzej Kapolka
a1c3e8515d
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:11:55 -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
Stephen Birarda
11b2271b91
size of agent ID must be included in bytes read per avatar
2013-05-07 15:05:31 -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
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
82cff262b1
for agent loopback perform no distance and angle calculations
2013-05-07 14:28:48 -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
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
4eeb1ed5b1
have interface clients tell the avatar-mixer and voxel-server what their ID is
2013-05-07 12:05:19 -07:00
Stephen Birarda
722205682e
expect domain server to append one's own ID to end of packet
2013-05-07 12:05:13 -07:00
Stephen Birarda
43a3775633
add _ownerID member variable to AgentList
2013-05-07 12:05:06 -07:00
Philip Rosedale
3afb1dc7a8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 08:40:43 -07:00
ZappoMan
d11e490b62
cleaned up code in createSphere()
2013-05-06 21:07:42 -07:00
ZappoMan
94473d6b95
made TREE_SCALE 100
2013-05-06 21:07:10 -07:00
Philip Rosedale
631ee8f478
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:23:06 -07:00
Philip Rosedale
69cac10cee
null change
2013-05-06 18:21:33 -07:00
Philip Rosedale
ef68ef9c5d
Merge pull request #217 from birarda/off-axis
...
add off-axis attenuation to audio
2013-05-06 18:18:23 -07:00
Stephen Birarda
81fade33dc
refactoring in audio mixer in preparation for off axis attenuation
2013-05-06 17:07:57 -07:00
ZappoMan
bccad01e0e
fixed CR issue
2013-05-06 16:47:31 -07:00
ZappoMan
342e3e0407
fixed CR issue
2013-05-06 16:43:25 -07:00
ZappoMan
c2588e0120
fixed CR issue
2013-05-06 16:42:12 -07:00
ZappoMan
cfbcc4418f
some cleanup pre CR
2013-05-06 16:34:34 -07:00
ZappoMan
37b165c8e9
some cleanup pre CR
2013-05-06 16:30:34 -07:00
ZappoMan
f5808f43b5
some cleanup pre CR
2013-05-06 16:24:09 -07:00
ZappoMan
9fb57feb3b
some cleanup pre CR
2013-05-06 16:21:58 -07:00
