Commit graph

248 commits

Author SHA1 Message Date
ZappoMan
2ec2824e8f cr cleanup 2013-04-30 10:46:48 -07:00
ZappoMan
a6b486aa89 cr cleanup 2013-04-30 10:39:45 -07:00
ZappoMan
59ce921645 cr cleanup 2013-04-30 10:38:30 -07:00
ZappoMan
778d3715ce cr cleanup 2013-04-30 10:37:02 -07:00
ZappoMan
4cea0ffa10 cr cleanup 2013-04-30 10:33:13 -07:00
ZappoMan
5a90dc4487 cr cleanup 2013-04-30 10:32:55 -07:00
ZappoMan
0fd3f00054 cr cleanup 2013-04-30 10:28:34 -07:00
ZappoMan
218dd3d62b cr cleanup 2013-04-30 10:27:38 -07:00
ZappoMan
37b139621a cr cleanup 2013-04-30 10:27:32 -07:00
ZappoMan
6d378281a8 cr cleaup - third times a charm? 2013-04-30 10:24:13 -07:00
ZappoMan
3673ee36ad cr cleanup and optimization of isLeaf() 2013-04-30 10:23:35 -07:00
ZappoMan
bf3b014743 code review cleanup 2013-04-30 10:16:04 -07:00
ZappoMan
8a5633a0db got rid of compareOctalCodesDepth() and cleaned up compareOctalCodes() 2013-04-30 10:09:15 -07:00
ZappoMan
ee814d7ddc better version of boundaryDistanceForRenderLevel() 2013-04-29 19:18:38 -07:00
ZappoMan
429ba8c729 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-29 17:48:12 -07:00
ZappoMan
823e23d50a add VoxelConstants.h 2013-04-29 17:46:02 -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
ea219cdd16 Merge pull request #163 from birarda/no-avatars
remove half-baked ping reply setup from avatar mixer
2013-04-29 14:53:24 -07:00
ZappoMan
a638542aa0 added support for LOD scanned sendding order of voxel scene 2013-04-29 14:34:17 -07:00
Andrzej Kapolka
0fe4d57ad7 I think this is the least intrusive fix for the chat crashes: lock the agent
list when we're updating from the network, simulating, or rendering.  I think
there are likely to be other synchronization issues, but this is a start.
2013-04-29 13:17:39 -07:00
Stephen Birarda
7b8d377eb4 simplify the avatar mixer communication while publicly accessible 2013-04-29 12:47:03 -07:00
ZappoMan
781721b79c clean up constants for voxels 2013-04-29 06:49:57 -07:00
ZappoMan
7c180c800f printf/pringLog cleanup 2013-04-29 06:28:19 -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
e4c39369aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-27 14:49:03 -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
5758e42870 Added deleteAll() member to VoxelNodeBag class 2013-04-27 12:04:33 -07:00
ZappoMan
e93cab40ed change default grow size 2013-04-26 12:12:41 -07:00
Andrzej Kapolka
b9fdba2711 Rather than creating a thread to read datagrams, just set the socket to
nonblocking mode and check it before simulating.  This addresses one aspect
of the lack of synchronization on AgentList, but there are other issues...
2013-04-26 11:08:41 -07:00
Andrzej Kapolka
46041b2ed9 Style tweaks: preface privates with underscore, capitalize enum members. 2013-04-26 10:21:14 -07:00
ZappoMan
e1defb8681 added searchForColoredNodes() 2013-04-26 09:23:10 -07:00
ZappoMan
0dfa5d573a removed debug code 2013-04-26 09:22:26 -07:00
ZappoMan
99c0cbc7cd removed some debug code 2013-04-26 00:47:14 -07:00
ZappoMan
2ba24e1716 fixed a couple bugs in VoxelNodeBag 2013-04-26 00:46:29 -07:00
ZappoMan
17694b3f46 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
Fixed conflict in interface/src/main.cpp
2013-04-25 23:49:08 -07:00
ZappoMan
d6e27d8f2f thread safety in VoxelTree (aded mutex to prevent reads and adds/deletes at same time)
also added VoxelNodeBag class to handle running out of room in the encode tree functions
2013-04-25 23:45:34 -07:00
ZappoMan
3f158c0753 Added new version of compareOctalCodes() which actually compares octal codes 2013-04-25 23:42:35 -07:00
ZappoMan
c014abbe6c new VoxelNodeBag class which is used to store a collection of voxel node pointers 2013-04-25 23:41:07 -07:00
Andrzej Kapolka
c6af08d883 Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	avatar-mixer/src/main.cpp
2013-04-25 17:40:55 -07:00
ZappoMan
899068e3a6 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-25 17:35:02 -07:00
ZappoMan
3c7c85a98c Added second cut at new bitstream writers
- added encodeTreeBitstream() which is new version of bitstream encoder that handles
  only encoding nodes that are in view. Also handles detecting packet overflow with
  new technique
- added encodeTreeBitstreamRecursion() which is the private work horse function
- moved temporary code to searchAndEncodeMultiTreeBitstream() which is still not
  ready for prime time
2013-04-25 17:31:32 -07:00
ZappoMan
667fe11694 added VoxelNode::printDebugDetails() 2013-04-25 17:29:56 -07:00
Stephen Birarda
69ea567f77 use class key for AgentListIterator friend in AgentList 2013-04-25 17:12:11 -07:00
Stephen Birarda
ccbbf31beb fix for extraneous typedefs and reference to AgentListIterator as friend 2013-04-25 17:10:09 -07:00