Stephen Birarda
fcb8865d2e
resolve conflicts on merge with upstream master
2013-07-11 10:58:45 -07:00
Stephen Birarda
dc264c98ec
delete a function accidentally added on merge
2013-07-11 09:38:55 -07:00
Stephen Birarda
211204e878
Merge remote-tracking branch 'upstream/master' into timestamps
2013-07-11 09:23:16 -07:00
ZappoMan
ab8e2916d3
improvements to delta sending
2013-07-10 19:49:50 -07:00
ZappoMan
dc70675c22
removed obsolete ResIn mode
2013-07-10 19:04:28 -07:00
ZappoMan
50a5b60c55
spacing cleanup
2013-07-10 17:41:30 -07:00
ZappoMan
f720513aff
removed scanTreeWithOcclusion() experimental code
2013-07-10 17:30:40 -07:00
ZappoMan
1831cc0de3
removed level param from recursion
2013-07-10 17:06:22 -07:00
ZappoMan
6694ef3869
fixed some compiler warnings
2013-07-10 16:33:27 -07:00
Stephen Birarda
ca8f25955a
switch usec timestamps to uint64_t
2013-07-10 11:46:48 -07:00
ZappoMan
de7cb9227a
removed some dead code
2013-07-10 11:31:45 -07:00
ZappoMan
d89c3c8042
add version of recurse tree that uses pointer stack and allows timing breaks
2013-07-10 11:09:48 -07:00
ZappoMan
f076eed9d2
more hacking on occlusion culling
2013-07-09 13:17:38 -07:00
ZappoMan
1f0df9a945
added scanTreeWithOcclusion() for testing
2013-07-08 20:52:14 -07:00
Stephen Birarda
c8b0e4bfe7
use packet version helpers for PACKET_TYPE_ENVIRONMENT_DATA
2013-07-08 15:04:49 -07:00
Stephen Birarda
a287d6d940
use packet version helpers for PACKET_TYPE_VOXEL_DATA
2013-07-08 14:43:16 -07:00
Stephen Birarda
6deaa5fd51
apply refactoring changes to PACKET_TYPE_PING
2013-07-08 13:55:35 -07:00
Stephen Birarda
693463ae5b
voxel-server packet version handling
2013-07-08 11:54:00 -07:00
Stephen Birarda
5062ae8965
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
2013-07-08 11:37:39 -07:00
ZappoMan
c0d14d2bd4
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-03 15:36:41 -07:00
Stephen Birarda
0b4348812c
agentData to nodeData in voxel-server
2013-07-03 15:22:28 -07:00
Stephen Birarda
0be42698b5
resolve conflicts on merge with upstream master
2013-07-03 15:12:50 -07:00
ZappoMan
430c70875d
tweaks to debug messages
...
(cherry picked from commit 873144ded3
)
2013-07-03 14:44:33 -07:00
ZappoMan
2fffb15d94
CR feedback
2013-07-03 14:43:01 -07:00
ZappoMan
873144ded3
tweaks to debug messages
2013-07-03 14:40:59 -07:00
ZappoMan
dc4a5ea276
added some timing debugging, and bail early if voxel server is slow
...
(cherry picked from commit 485c603d4f
)
2013-07-03 12:53:14 -07:00
ZappoMan
485c603d4f
added some timing debugging, and bail early if voxel server is slow
2013-07-03 12:42:34 -07:00
Stephen Birarda
36c6912de8
your agents are now nodes
2013-07-03 10:35:09 -07:00
Mark Peng
c5fe8b078e
ping reporter added to interface
2013-06-28 11:07:01 -07:00
ZappoMan
58c4010185
added CoverageMap and occlusion culling to server
2013-06-18 09:36:43 -07:00
Andrzej Kapolka
dc3029b5a9
Merge pull request #540 from ZappoMan/encode_params
...
Change encodeTreeBitstream() to use params class
2013-06-14 17:25:57 -07:00
ZappoMan
08e8455c95
migrate encodeTreeBitstream() to use params class
2013-06-14 16:45:27 -07:00
Andrzej Kapolka
db729a04aa
Converted double timestamps to long long (64 bit integers), fixed bug with
...
updating agent timestamps.
2013-06-13 11:11:59 -07:00
Stephen Birarda
a8075e44ca
Merge remote-tracking branch 'upstream/master' into conditional-ds
2013-06-10 14:01:54 -07:00
Stephen Birarda
ae0ef412a3
hook up voxel-server to domain-server interest list
2013-06-10 13:54:18 -07:00
Philip Rosedale
769383582b
Adding density to nodes
2013-06-08 14:24:29 -07:00
ZappoMan
065e85e328
rename server's VoxelTree and make it a color reaveragging tree
2013-06-07 10:29:56 -07:00
ZappoMan
026fb5b344
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 09:34:37 -07:00
ZappoMan
4f3872c18f
CR feedback
2013-06-04 01:13:58 -07:00
ZappoMan
0a9b3bf5ce
changed file name and exention to Sparse Voxel Octree and svo
2013-06-04 01:07:18 -07:00
ZappoMan
d1d2e75143
first cut at export and import of voxels
2013-05-28 19:00:02 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -07:00
ZappoMan
1a2921e3e8
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-25 15:32:12 -07:00
ZappoMan
1f8842c6af
tweak recording of lastKnownViewFrustum as part of delta sending fix
2013-05-25 15:28:09 -07:00
Andrzej Kapolka
5ca01842be
Made the atmospheres twice as thick, made the large planet one's red.
2013-05-24 14:24:47 -07:00
Stephen Birarda
eb25fd3b46
pass the owning agent for VoxelAgentData constructor
2013-05-24 12:18:19 -07:00
Stephen Birarda
36892da488
keep a pointer to owning agent in AgentData
2013-05-24 12:17:34 -07:00
ZappoMan
c767babba5
lower voxel send rate
2013-05-24 10:47:57 -07:00
ZappoMan
473665fb4a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-23 12:16:29 -07:00
ZappoMan
29f84ebbb5
code cleanup
2013-05-23 12:11:38 -07:00