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
244da2f9a5
code cleanup, new scene
2013-05-08 01:08:05 -07:00
ZappoMan
93a5f662f7
dead code cleanup
2013-05-08 01:06:43 -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
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
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
ZappoMan
c8fbb037ab
Merge pull request #240 from birarda/master
...
member variable change in AgentList
2013-05-07 17:47:42 -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
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
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
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
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
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
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
Stephen Birarda
589e524090
remove debugging and a couple of lines
2013-05-07 12:04:59 -07:00
