ZappoMan
c364ec0dc7
removed mutex locking from VoxelTree for now
2013-04-27 15:09:32 -07:00
ZappoMan
9d6c53a535
remove mutex locking from VoxelTree for now, isn't needed
2013-04-27 15:08:17 -07:00
ZappoMan
e55993abf1
removed accidental whitespace
2013-04-27 15:04:08 -07:00
ZappoMan
e373a8b866
removed accidentally added whitespace
2013-04-27 14:59:58 -07:00
ZappoMan
2d518520f5
removed extra AgentList() constructor which got accidentally included in merge mistake
2013-04-27 14:58:38 -07:00
ZappoMan
94bb6a1b0f
removed some testing/debug code
2013-04-27 14:57:23 -07:00
ZappoMan
999930743e
removed some debug code
2013-04-27 14:55:34 -07:00
ZappoMan
2f2af7ec09
removed some debug code
2013-04-27 14:53:08 -07:00
ZappoMan
e4c39369aa
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-27 14:49:03 -07:00
ZappoMan
2fb172f3db
added support for command line option to use OLD or NEW voxel distribution schemes
...
- moved new voxel distribution strategy to helper function
- added back old technique
- added "--newVoxelDistributor" command line option
- fixed crashing bug for derefrencing NULL pointer in case where server is started
which interface agents already in the domain. Basically agentData may not yet
be setup properly
- added proper cleanup support to node bag in case where voxel tree is erased
- first cut at new version of sphere scene, we will make it richer in case of
new distribution
- bumped packets per interval to 5
2013-04-27 12:12:43 -07:00
ZappoMan
82c5c3706a
Latest work on new voxel sending strategy
...
- removed mutex locking for now. do we need this?
- fixed bug in createMissingNode() where we would accidentally stomp on
a previously created peer tree while creating a new node
- improved printTreeForDebugging() to include more details
- fixed a bug in readBitstreamToTree() for multi-tree case where we
weren't correctly walking through the buffer
2013-04-27 12:08:50 -07:00
ZappoMan
d49607b4cd
fix typo
2013-04-27 12:05:38 -07:00
ZappoMan
5758e42870
Added deleteAll() member to VoxelNodeBag class
2013-04-27 12:04:33 -07:00
ZappoMan
70818bd3fe
Added some new debugging code, removed some old debugging code, some small coding standard tweaks
2013-04-27 12:03:20 -07:00
Jeffrey Ventrella
57cbd9c6d9
cleaned up collision code some
2013-04-27 09:47:46 -07:00
Jeffrey Ventrella
5c3bd5fe87
improved collisions between avatars
2013-04-27 09:33:58 -07:00
Jeffrey Ventrella
308b9dcf82
Merge remote-tracking branch 'upstream/master'
2013-04-26 17:44:42 -07:00
Jeffrey Ventrella
adccd62f87
made a different prototype for camera shifting into first-person
2013-04-26 17:43:47 -07:00
Philip Rosedale
16ea53f921
Merge remote-tracking branch 'upstream/master'
2013-04-26 17:40:27 -07:00
Philip Rosedale
ebc5d665c0
Merge pull request #158 from ey6es/master
...
Reverted threading change by default, since we're seeing lower frame rates.
2013-04-26 17:19:11 -07:00
birarda
7ddf33b9c3
Merge pull request #159 from birarda/audio
...
tune distance ratio, remove debugging in audio mixer
2013-04-26 17:14:36 -07:00
Stephen Birarda
14012ee44b
remove the debugging to confirm that distance attenuation is working
2013-04-26 17:11:51 -07:00
Andrzej Kapolka
c26becf6cb
Added toggle for nonblocking networking; default to threaded for now, since
...
we're seeing lower frame rates.
2013-04-26 17:10:52 -07:00
Philip Rosedale
99957f31f3
Merge remote-tracking branch 'upstream/master'
2013-04-26 17:09:05 -07:00
Stephen Birarda
5442362b3a
change DISTANCE_RATIO const in audio-mixer main
2013-04-26 17:01:54 -07:00
Philip Rosedale
69cf6e303d
Merge pull request #155 from Ventrella/master
...
merge
2013-04-26 16:54:28 -07:00
Philip Rosedale
996a8794d0
Merge remote-tracking branch 'upstream/master'
2013-04-26 16:37:58 -07:00
Philip Rosedale
1804357eab
Merge pull request #156 from ey6es/master
...
Style fixes to chat code, and moved packet reading to main thread to fix synchronization issues.
2013-04-26 16:34:41 -07:00
tosh
dbfef9d802
Merge branch 'master' of git://github.com/worklist/hifi into 19165
...
Conflicts:
interface/src/Audio.cpp
2013-04-27 00:53:29 +02:00
Jeffrey Ventrella
2486b6e15c
moved inline functions from Camera.h to Camera.cpp as per Stephen's request
2013-04-26 13:33:36 -07:00
Jeffrey Ventrella
59ef9e5d7e
removed incomplete code snippet in Avatar.h
2013-04-26 13:21:49 -07:00
Andrzej Kapolka
21f1669388
How'd those tabs get in there?
2013-04-26 13:10:44 -07:00
Andrzej Kapolka
c4776fcd27
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-26 13:03:09 -07:00
Jeffrey Ventrella
e9592f9360
moved handController
2013-04-26 12:55:13 -07:00
ZappoMan
3cb41a6fa6
re-apply agentlist changes to voxel server that somehow got smashed
2013-04-26 12:36:25 -07:00
ZappoMan
88039e6dac
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-26 12:17:09 -07:00
ZappoMan
bcdc4d6654
new version of voxel encoding and sending
2013-04-26 12:16:41 -07:00
Jeffrey Ventrella
10b6c7759d
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-26 12:16:22 -07:00
Jeffrey Ventrella
dc11055f8e
merge with upstream master and resolve conflicts
2013-04-26 12:15:48 -07:00
ZappoMan
8445790183
added new voxel sending support to VoxelAgentData
...
- added VoxelNodeBag member to keep track of which nodes this agent needs to
have sent to it
- added _voxelPacket and other members to keep track of the next packet to
be sent to this client. This is because as we fill in packets to send we
may run out of room in the current packet, but not want to have to reencode
that data
- cleaned up constructors to use common init() method
2013-04-26 12:13:37 -07:00
ZappoMan
e93cab40ed
change default grow size
2013-04-26 12:12:41 -07:00
Stephen Birarda
7744685de4
debug of distance should be float and not integer
2013-04-26 12:01:47 -07:00
Stephen Birarda
e2cb1866ed
add another line of debugging for audio mixer distance coeff
2013-04-26 11:59:26 -07:00
Philip Rosedale
824abca443
Removed field and Cloud classes
2013-04-26 11:57:04 -07:00
Stephen Birarda
57c39ceb99
add some debugging to audio mixer for distance attenuation
2013-04-26 11:53:10 -07:00
Stephen Birarda
948f9607f6
send head position as source position to mixer
2013-04-26 11:49:52 -07:00
Philip Rosedale
2e518f8dac
Removed renderPitchRate, renderYawRate, startYaw from main.cpp, they are not doing anything.
2013-04-26 11:36:44 -07:00
birarda
a987d95af0
Merge pull request #153 from birarda/audio
...
correct the sign of the absolute head yaw
2013-04-26 11:36:27 -07:00
Stephen Birarda
ded5da47ff
correct the sign of the absolute head yaw sent to avatar mixer
2013-04-26 11:35:55 -07:00
Andrzej Kapolka
0932a8b382
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-26 11:31:15 -07:00
