Commit graph

48308 commits

Author SHA1 Message Date
Leonardo Murillo
e5b0843212 Resolving conflicts 2013-03-22 13:40:16 -06:00
Leonardo Murillo
dc92f0be42 More agent IDing around the code 2013-03-22 13:34:35 -06:00
Stephen Birarda
3518ee15a8 add readCodeColorBufferToTree method to VoxelTree for point cloud render 2013-03-22 12:32:57 -07:00
Stephen Birarda
6a39934cb1 capitals are important 2013-03-22 12:11:48 -07:00
Stephen Birarda
24d26a3a01 check for dead agents in VS so we can re-request from interface 2013-03-22 12:10:04 -07:00
Stephen Birarda
4474e5dfa8 include cstdio for sscanf 2013-03-22 12:06:47 -07:00
Stephen Birarda
1161cd6a5a include cstring for memcpy in VoxelAgentData 2013-03-22 12:04:28 -07:00
Stephen Birarda
0dc06fef1f pump up the mixer jitter buffer for smoother demo 2013-03-22 12:01:48 -07:00
Stephen Birarda
8ec5298c4a add groundwork for LOD specific transmissions from VS 2013-03-22 12:01:30 -07:00
Stephen Birarda
6346a14cb5 remove voxelServerAddCallback 2013-03-22 10:48:41 -07:00
Stephen Birarda
dd37d60b65 remove extra _WIN32 declaration 2013-03-22 10:47:15 -07:00
Stephen Birarda
bb47967126 send head data to VS for level differentiation, remove the VS add callback 2013-03-22 10:46:37 -07:00
Leonardo Murillo
f604b574c5 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-22 11:46:36 -06:00
Leonardo Murillo
a4f6d85676 Fixing definitions 2013-03-22 11:45:19 -06:00
Leonardo Murillo
e3d842dff7 Packing agent ID on domain broadcast packet 2013-03-22 11:43:16 -06:00
Stephen Birarda
2c701c8e69 add VoxelAgentData class for VS to hold position and level data for clients 2013-03-22 10:36:19 -07:00
Stephen Birarda
3fa0439f29 add method to SharedUtil to chdir to OS X bundle resources 2013-03-22 10:35:55 -07:00
Leonardo Murillo
a1691f54a1 Starting agent count at 1 to allow for 0 to be non-id specifier and packing the id into boadcast packet 2013-03-22 11:30:17 -06:00
Leonardo Murillo
a76f8a46cd Handle new and existing agent Ids 2013-03-22 11:20:45 -06:00
Stephen Birarda
6712d23cd1 push and pop the matrix for voxel system draw 2013-03-21 17:12:50 -07:00
Stephen Birarda
5f052d7c9e scale back heads after voxel system draw 2013-03-21 17:03:52 -07:00
Stephen Birarda
95926cb7fc conditional chdir for OS X resources, revert windows Head changes 2013-03-21 17:02:41 -07:00
Stephen Birarda
e2a28b48db revert Head.cpp to earlier commit to confirm source of direction changes 2013-03-21 16:51:45 -07:00
Stephen Birarda
d61ae179ae hide the cloud again 2013-03-21 16:16:25 -07:00
Stephen Birarda
9c73bf286e remove cast to int * in socket recvfrom 2013-03-21 16:13:52 -07:00
Stephen Birarda
0b48eab1fb Merge branch 'master' of github.com:worklist/hifi 2013-03-21 16:12:09 -07:00
Stephen Birarda
4552140f61 add a sound when moving so we aren't ninjas 2013-03-21 16:11:17 -07:00
Leonardo Murillo
d8b80006b8 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-21 14:25:35 -06:00
Kees van Prooijen
f308d8e004 merge with upstream master 2013-03-21 10:10:33 -07:00
Leonardo Murillo
203bf333c4 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-20 20:53:16 -06:00
Stephen Birarda
f97932353b fix conditional inclusion of voxel in vertices and color arrays 2013-03-20 16:28:28 -07:00
Stephen Birarda
f8485ab5da output total number of packets and bytes sent to agent from VS 2013-03-20 16:23:10 -07:00
Stephen Birarda
f4e9594f72 dumb way to keep voxel server alive for testing 2013-03-20 16:22:38 -07:00
Stephen Birarda
abc0deaa78 increase the far clip 2013-03-20 16:22:24 -07:00
Stephen Birarda
e7254ff216 fix shift in return of octal code section value 2013-03-20 16:22:01 -07:00
Stephen Birarda
1efbaef44b only add voxel to be drawn if not transparent 2013-03-20 16:21:45 -07:00
Stephen Birarda
d2da9000f4 return correct nodeForOctalCode 2013-03-20 16:21:22 -07:00
Stephen Birarda
e8f84aee78 fix rendering bugs 2013-03-20 15:32:12 -07:00
Stephen Birarda
fc3a499cb3 include cstring for use of memset 2013-03-20 13:48:59 -07:00
Stephen Birarda
c28a3e1bd4 add cstring for use of memcpy 2013-03-20 13:47:13 -07:00
Stephen Birarda
6ce4ed2d40 add cstring for use of memcpy 2013-03-20 13:45:48 -07:00
Stephen Birarda
1abce28310 use int instead of forced 8-bit types where appropriate 2013-03-20 13:44:09 -07:00
Stephen Birarda
9ac664dbab include cstdio for uint8_t 2013-03-20 13:34:53 -07:00
Stephen Birarda
b24353957c include cstdio for printf in SharedUtil 2013-03-20 13:29:10 -07:00
Stephen Birarda
68765c5a2c mixer and voxel server must report EC2 address 2013-03-20 13:27:27 -07:00
Stephen Birarda
634e9c4bf7 parse the bitstream tree and create an in memory representation to render 2013-03-20 13:25:11 -07:00
Stephen Birarda
65e9626e72 remove superfluous debugging 2013-03-20 13:24:43 -07:00
Stephen Birarda
adb45c825b add method to return the start vertex for an octal code 2013-03-20 13:24:18 -07:00
Kees van Prooijen
9ae11ffe77 more windows port 2013-03-20 12:13:14 -07:00
Stephen Birarda
f8f098cf2c Merge branch 'master' of github.com:worklist/hifi 2013-03-19 15:58:19 -07:00