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
Stephen Birarda
9658c40dd6
change lastAgentId member variable to _lastAgentID
2013-05-07 17:17:47 -07:00
Stephen Birarda
8daae1dd1d
bring eve closer to the ground after scale changes
2013-05-07 15:11:01 -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
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
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
ZappoMan
239aa1ed49
some cleanup pre CR
2013-05-06 16:18:30 -07:00
ZappoMan
dc481002ec
fixed Xcode compiler warnings
2013-05-06 16:00:43 -07:00
ZappoMan
35c840fefa
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 15:57:44 -07:00
ZappoMan
89226b18a5
switched getAABox() interface
2013-05-06 15:50:42 -07:00
ZappoMan
96561e97d8
added VIEW_CULLING_RATE_IN_MILLISECONDS
2013-05-06 15:49:54 -07:00
ZappoMan
c975699cea
added debug to ViewFrustum::matches()
2013-05-06 15:48:05 -07:00
Stephen Birarda
90a8027f69
include cstdlib for call to exit
2013-05-06 15:36:48 -07:00
Stephen Birarda
c742c292b6
have the audio mixer output a stacktrace when it crashes
2013-05-06 15:29:21 -07:00
ZappoMan
043a284d4d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 13:36:31 -07:00
Stephen Birarda
499899c6e0
if there are no active agents in list begin() iterator should be end()
2013-05-06 13:11:40 -07:00
Stephen Birarda
beca9cac8d
update timestamp variables in Agent, use new packet headers for DS
2013-05-06 12:40:52 -07:00
ZappoMan
e0d040a73b
added removeChildAtIndex() which removes a node, but doesn't delete it
2013-05-06 11:02:28 -07:00
ZappoMan
17b137cc53
changed VoxelNodeBag to just compare pointers, since we don't really care about ordering the bag
2013-05-06 11:01:29 -07:00
ZappoMan
16b93f8c92
added PerformanceWarning class
2013-05-06 11:00:01 -07:00
ZappoMan
17e26b2d42
add matches()
2013-05-06 10:59:09 -07:00
Andrzej Kapolka
4d33c462fe
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/voxels/src/VoxelTree.h
2013-05-06 09:45:57 -07:00
ZappoMan
2c8c6a2600
Coding standard cleanup and VoxelNode optimization
...
- make octalCode and children members private
- add public getters for accessing these private members
- change constructor to require an OctalCode for all non-roots
- default constructor constructs a rootNode
- make primary access for deleting, adding, and accessing children through public methods that do bookkeeping
- calculate AABox on voxel creation so that we don't need to do all the math when we deal with voxels
- added methods on VoxelNode for common items like getCorner(), getCenter(), getLevel(), etc
2013-05-05 10:17:02 -07:00
ZappoMan
34982227e4
removed color reaveraging from readNodeData() because server will already send averages
2013-05-04 21:58:16 -07:00
ZappoMan
6a32424fb2
make readFromFileV2() return bool for file exists
2013-05-04 09:41:10 -07:00
ZappoMan
c1847a7511
set dirty bit on tree in a couple new places
2013-05-04 09:19:46 -07:00
ZappoMan
3ed19ccb91
fixed comment
2013-05-04 08:28:00 -07:00
Andrzej Kapolka
aff465b17b
Missed a spot with the conversion from pointers to references.
2013-05-04 07:59:45 -07:00