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
Stephen Birarda
cdb8b1b144
Merge remote-tracking branch 'upstream/master' into agentlist-array
2013-04-25 16:40:20 -07:00
Stephen Birarda
edc908b1cd
AgentList type squishes across project
2013-04-25 16:25:49 -07:00
Stephen Birarda
81322d01e5
spacing fixes in AgentList
2013-04-25 16:19:33 -07:00
Stephen Birarda
507f39a052
fix readability of agent dereference
2013-04-25 16:14:38 -07:00
Stephen Birarda
215efe3b78
bunch of const changes for glm::vec3 in Avatar and Orientation
2013-04-25 16:10:55 -07:00
Stephen Birarda
625a963918
prefer -> notation to (*TYPE) for AgentList iterator
2013-04-25 15:49:25 -07:00
Andrzej Kapolka
d5da35e91a
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-25 15:41:57 -07:00
Stephen Birarda
5ddd9a9f4f
Merge remote-tracking branch 'upstream/master' into agentlist-array
2013-04-25 15:27:40 -07:00
Andrzej Kapolka
d041072d40
Delete support (though the one on my numeric keypad doesn't work?),
...
sending key states.
2013-04-25 15:26:05 -07:00
Stephen Birarda
ef6593eb89
update audio-mixer to use new AgentList iterator
2013-04-25 15:21:56 -07:00
Stephen Birarda
ad530b4eb8
fix bug based on dynamic end of agentList iterator
2013-04-25 15:10:08 -07:00
Stephen Birarda
2850d74a84
add typedefs for stl iterator implementation
2013-04-25 14:48:07 -07:00
Andrzej Kapolka
675d06e4b9
More chat bits; basic functionality now working.
2013-04-25 14:03:31 -07:00
Stephen Birarda
836d286b75
initial transition from vector to multi-dimensional array in AgentList
2013-04-25 13:11:13 -07:00
Philip Rosedale
ba55175870
Gravity is ON near origin, off in space, and a gravity field can be created with getGravity()
2013-04-25 09:50:35 -07:00
ZappoMan
0bec7156aa
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-24 23:50:57 -07:00
ZappoMan
785ef88820
Code cleanup, change readBitstreamToTree() to support multiple trees, first cut at new loadBitstream()
...
- some small tweaks to cod to match coding standard for pointers
- changed readBitstreamToTree() to handle multiple trees in a single packet
- first cut at new version of loadBitstream() which is currently not in use
2013-04-24 23:47:38 -07:00
ZappoMan
0c692ca0c0
added isLeaf(), isInView(), and distanceToCamera() helper methods
2013-04-24 22:54:55 -07:00
ZappoMan
f449eafa63
added typedef for location enum
2013-04-24 22:53:34 -07:00
ZappoMan
bbdf97ccc4
added some helper functions for debugging and for improved voxel protocol
...
- added outputBufferBits() which will output an entire buffer as debug bits/bytes
- tweak to outputBits() to allow caller to ask for NewLine or not
- added insertIntoSortedArrays() which keeps a set of arrays sorted by a key
2013-04-24 22:50:40 -07:00
ZappoMan
4b726b7fba
added compareOctalCodes() and support for null octal code in printOctalCode()
2013-04-24 22:49:09 -07:00
Andrzej Kapolka
9d4fded901
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-04-24 17:11:37 -07:00
Andrzej Kapolka
f538e2bdbc
Added key state to avatar data, started on chat entry field.
2013-04-24 17:06:55 -07:00
Philip Rosedale
6c986a1049
Merge pull request #127 from tschw/19188
...
19188
2013-04-24 16:53:04 -07:00
Stephen Birarda
87386cb05a
line the consts back up in AvatarData
2013-04-24 13:54:35 -07:00
Stephen Birarda
461ca6ecb4
revert some of the const changes that make sense
2013-04-24 13:51:27 -07:00
Stephen Birarda
a423d3c38f
more const repairs in AvatarData
2013-04-24 13:49:24 -07:00
Stephen Birarda
142a8a6f08
remove double const in AvatarData.h
2013-04-24 13:45:17 -07:00
Stephen Birarda
cfbe8a719c
fix getter for hand state in AvatarData
2013-04-24 12:39:25 -07:00
