Commit graph

1819 commits

Author SHA1 Message Date
ZappoMan
823e23d50a add VoxelConstants.h 2013-04-29 17:46:02 -07:00
ZappoMan
33f86513ab make new voxel distribution default behavior 2013-04-29 17:45:36 -07:00
ZappoMan
accda966d5 Add LOD culling to the server protocol.
- Add LOD/distance culling to VoxelTree:encodeTreeBitstreamRecursion()
  and VoxelTree::searchForColoredNodesRecursion()
- added new levels to boundaryDistanceForRenderLevel()
- added more spheres to the scene to get a better sense of LOD behavior
2013-04-29 17:38:52 -07:00
ZappoMan
a638542aa0 added support for LOD scanned sendding order of voxel scene 2013-04-29 14:34:17 -07:00
ZappoMan
e7296e1851 made tempOutputBuffer static, added some comments 2013-04-29 08:00:31 -07:00
ZappoMan
781721b79c clean up constants for voxels 2013-04-29 06:49:57 -07:00
ZappoMan
78e8751a79 use constant for 'V' header 2013-04-29 06:31:06 -07:00
ZappoMan
7c180c800f printf/pringLog cleanup 2013-04-29 06:28:19 -07:00
ZappoMan
ff996c9946 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-29 06:18:25 -07:00
Philip Rosedale
84a8af4808 Merge pull request #154 from PhilipRosedale/master
Code cleanup, better gyro look, removed cloud/field
2013-04-28 14:51:00 -07:00
Philip Rosedale
3787c93142 Fixes per review 2013-04-28 14:49:08 -07:00
Philip Rosedale
b9234b0a02 Merge remote-tracking branch 'upstream/master' 2013-04-27 17:19:55 -07:00
Philip Rosedale
bb4500886b Merge pull request #160 from Ventrella/master
made camera first-person prototype and improved avatar collisions
2013-04-27 17:18:22 -07:00
Jeffrey Ventrella
37e304fd14 Merge remote-tracking branch 'upstream/master' 2013-04-27 16:45:58 -07:00
Philip Rosedale
5e737ce5d4 Merge remote-tracking branch 'upstream/master' 2013-04-27 16:39:19 -07:00
Philip Rosedale
f6ef117788 Merge pull request #157 from tschw/19165
19165
2013-04-27 16:37:46 -07:00
ZappoMan
0ebf339562 removed some dead code 2013-04-27 15:25:44 -07:00
ZappoMan
2f9c3da914 removed some dead code 2013-04-27 15:22:50 -07:00
ZappoMan
628b74b8e1 removed some dead code 2013-04-27 15:21:40 -07:00
ZappoMan
7fda49a5e1 removed some dead code 2013-04-27 15:17:59 -07:00
ZappoMan
7155557127 removed some dead code 2013-04-27 15:13:24 -07:00
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