Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 13:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

853 commits

Author SHA1 Message Date
ZappoMan
cd1d3765a9 cleaned up const semantics and DRYed up appendBitMask 2013-11-23 16:28:21 -08:00
ZappoMan
0f66f4c1bd Revert "cleaned up some comments and code" 
This reverts commit 99c427c97d.
 2013-11-23 16:19:57 -08:00
ZappoMan
99c427c97d cleaned up some comments and code 2013-11-23 16:18:18 -08:00
ZappoMan
cb43b0dea1 cleaned up some comments and code 2013-11-23 15:10:03 -08:00
ZappoMan
b0cc6494da cleaned up some comments and code 2013-11-23 14:58:23 -08:00
ZappoMan
7ff7b13c6b cleaned up some comments 2013-11-23 14:52:34 -08:00
ZappoMan
0ed31b5b9f tweaks and cleanup 2013-11-23 14:14:00 -08:00
ZappoMan
ae5d5324c1 added some comments to VoxelPacket 2013-11-23 14:02:46 -08:00
ZappoMan
4c0569fc60 removing compression from VoxelNodeData to eventually move it into VoxelPacket where it belongs 2013-11-23 13:55:21 -08:00
ZappoMan
b1a0ed6480 remove old buffer style approach to encoding 2013-11-23 13:36:38 -08:00
ZappoMan
661152956a clean up comments 2013-11-23 13:23:03 -08:00
ZappoMan
00b3451729 properly handle update fails when encoding 2013-11-23 13:11:06 -08:00
ZappoMan
b1adf82d4b cleaned up const semantics in streaming voxel packets, fixed double reset bug 2013-11-23 13:05:37 -08:00
ZappoMan
1d88399476 cleaning up semantics of VoxelPacket 2013-11-22 20:39:11 -08:00
ZappoMan
0cd0012aab cleaning up semantics of VoxelPacket 2013-11-22 20:08:58 -08:00
ZappoMan
9d8f0b82df make append() private 2013-11-22 17:59:47 -08:00
ZappoMan
69eee541db removed some old debug, standardize callers of VoxelPacket to use semantic entry points instead of direct access to bytes 2013-11-22 17:53:25 -08:00
ZappoMan
01488ed332 don't send any voxel stats till we've succesfully encoded at least one voxel 2013-11-22 17:23:12 -08:00
ZappoMan
a426f97e52 removing some debug output 2013-11-22 10:04:59 -08:00
ZappoMan
48dad5ab86 fix bug in packet filling related to octcodes for new trees not fitting 2013-11-22 09:49:50 -08:00
ZappoMan
4fc9d5409c voxel sender now uses maximum bytes in packets with VoxelPacket class 2013-11-21 23:46:12 -08:00
ZappoMan
c25199c80a removed some debugging 2013-11-21 21:27:37 -08:00
ZappoMan
b9429eeb1e working version of writeToSVO that uses VoxelPacket and fills it to limit before writing 2013-11-21 21:18:31 -08:00
ZappoMan
5a9baf2779 moved some debug code 2013-11-21 20:36:09 -08:00
ZappoMan
e8c3670cdd added packet.reset() in writeToSVO() 2013-11-21 20:18:19 -08:00
ZappoMan
e0c55be4e2 more debug 2013-11-21 15:21:29 -08:00
ZappoMan
9784288b63 added some debugging 2013-11-21 13:51:40 -08:00
ZappoMan
e2e9c29824 implement old vs new side by side encoding to test for correctness 2013-11-21 13:26:28 -08:00
ZappoMan
6c640752cd make compression optional 2013-11-21 12:04:13 -08:00
ZappoMan
a590f384a6 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-21 11:33:08 -08:00
ZappoMan
e959be82f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-21 11:18:47 -08:00
ZappoMan
6881d9fb36 fix to crash in client side VoxelSceneStats crash 2013-11-19 22:57:42 -08:00
ZappoMan
8c90e96740 addeding VoxelPacket class for encoding bit streams 2013-11-19 15:36:21 -08:00
ZappoMan
4da70cf3c8 fix to crash on deleteNotify 2013-11-15 16:45:03 -08:00
ZappoMan
3c17c70541 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-13 17:15:41 -08:00
ZappoMan
496f3a1380 removed some noise, and made persist thread less sleepy 2013-11-13 16:37:08 -08:00
ZappoMan
e32bfc38f5 change voxelServersExist() to make sure that all existing voxel servers have a legitimate jurisdiction 2013-11-13 01:06:17 -08:00
ZappoMan
2b604864d6 fix bug where VoxelEditPacketSender oversends to unknown jurisdictions 2013-11-12 00:35:55 -08:00
ZappoMan
af8438b098 add stats to voxel server to show average voxel edit packet statistics 2013-11-11 16:31:36 -08:00
ZappoMan
977b730fc0 add support for tuning the size of packets used by VoxelEditPacketSender 2013-11-10 12:44:20 -08:00
ZappoMan
1a6efea5c0 improvements to PPS behavior of PacketSender 2013-11-10 10:39:56 -08:00
ZappoMan
a9c5c0707f added sentAt timestamps to voxel edit packets so we can measure transit time 2013-11-08 10:32:46 -08:00
ZappoMan
a75e577d0a voxel edit packet debugging support 2013-11-08 09:32:06 -08:00
ZappoMan
20c66386f8 fix comment 2013-11-08 02:24:46 -08:00
ZappoMan
8043970df7 bug fixes to JurisdictionListener, PacketSender, addition of packetsToSendCount() to Voxels JS 2013-11-08 02:22:10 -08:00
ZappoMan
cad51885e8 removed some hackery 2013-11-07 17:21:45 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
ZappoMan
b5f6a51728 fix thread contention issues and VS crash on domain server shutdown and restart 2013-11-07 13:03:04 -08:00
ZappoMan
76ad42015a added debugging to JurisdictionMap for server crashes 2013-11-06 16:41:08 -08:00
ZappoMan
f9291e6e5c implement ReadWriteLock for VoxelTree to fix crashes in VoxelServer 2013-11-06 15:22:17 -08:00
ZappoMan
987ce16b10 more potential fixes for voxel server crashes 2013-11-06 01:55:04 -08:00
ZappoMan
7cbebf3941 fixed warning and logic problem 2013-11-05 13:11:35 -08:00
ZappoMan
6dc7f68f0e Merge pull request #1185 from birarda/assignment 
add helper to ping if no active socket
 2013-11-05 12:55:06 -08:00
Stephen Birarda
eef6fd53eb cleanup node type check in JL 2013-11-05 12:37:38 -08:00
Stephen Birarda
771021995b add helper to ping with inactive socket 2013-11-05 12:34:56 -08:00
ZappoMan
e296be8c7a make numberOfThreeBitSectionsInCode() robust against overflowing buffers if length is known 2013-11-05 12:31:20 -08:00
ZappoMan
9060020279 style cleanup 2013-11-05 11:33:28 -08:00
ZappoMan
4cab991c02 style cleanup 2013-11-05 11:24:51 -08:00
ZappoMan
1c4163b010 add guards against buffer overflow in voxel server for edit/delete voxel packets 2013-11-05 11:12:14 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
ZappoMan
7daff4c279 coding standard cleanup 2013-11-04 15:36:46 -08:00
ZappoMan
9e88cfe953 initlaize sortedChildren[] array to help prevent possible crashes 2013-11-04 15:33:28 -08:00
Stephen Birarda
5c3075401a add a guard for JurisdictionListener kill for missing UUID 2013-11-04 12:03:04 -08:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
ZappoMan
ac236b9ed8 if LOD changes than don't consider WasInView on server 2013-10-30 16:26:42 -07:00
ZappoMan
3445a15d61 fix build buster 2013-10-30 12:35:42 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
Philip Rosedale
2931e2e41a Merge pull request #1138 from ZappoMan/bugfixes 
add mutex for _nodesRequestingJurisdictions to fix crash
 2013-10-29 09:49:15 -07:00
Philip Rosedale
6b3a1de22b Merge pull request #1139 from ZappoMan/voxelnode_memory_savings 
VoxelNode memory savings
 2013-10-29 09:48:53 -07:00
ZappoMan
4874eda317 add mutex for _nodesRequestingJurisdictions to fix crash 2013-10-28 22:16:36 -07:00
ZappoMan
905fd48e84 fix blinking 2013-10-28 16:03:29 -07:00
ZappoMan
97070607ea added SIMPLE_EXTERNAL_CHILDREN mode, which saves on most of our child VoxelNode children storage without being too complicated 2013-10-28 14:43:27 -07:00
ZappoMan
03b2ace488 moved blended _children union into BLENDED_UNION_CHILDREN 2013-10-28 12:54:37 -07:00
ZappoMan
87a44bafc9 added population data back for SIMPLE_CHILD_ARRAY implementation 2013-10-28 12:37:47 -07:00
ZappoMan
e3c64429b9 added SIMPLE_CHILD_ARRAY implementation to temporarily work around memory corruption 2013-10-28 12:10:30 -07:00
ZappoMan
b8a87294e6 added guard to protect against external child access 2013-10-25 14:22:56 -07:00
ZappoMan
dcccfb7ef0 temporarily force external child storage 2013-10-25 14:03:49 -07:00
ZappoMan
953196510f removed some dead code 2013-10-25 00:07:34 -07:00
ZappoMan
9492c3de18 various memory leaks and compiler warning fixes 2013-10-25 00:05:52 -07:00
ZappoMan
4a74499ea1 removed asserts and replaced with error messages 2013-10-24 17:43:38 -07:00
ZappoMan
0368e8c75e cleanup bit field positions 2013-10-24 14:27:47 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
ZappoMan
b4c88a85f8 improvements to subtle moves for view frustum and voxel serving 2013-10-23 17:49:58 -07:00
ZappoMan
aa5e2b6a19 memset to 0 in VoxelNode to address potential memory corruption 2013-10-23 10:54:02 -07:00
ZappoMan
303f4a8ce4 improved VoxelNode delete of children 2013-10-21 14:44:46 -07:00
ZappoMan
ca7225e525 fix reset of VoxelSystem on eraseAllVoxels() 2013-10-17 18:45:52 -07:00
ZappoMan
370defdc4a fixed comment 2013-10-17 16:16:20 -07:00
ZappoMan
9b0cc14552 fix voxel nodes to work with new UUID format 2013-10-17 16:14:06 -07:00
Stephen Birarda
42de553e32 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 14:51:20 -07:00
ZappoMan
a11b6858d3 fix small stats bug 2013-10-17 14:43:19 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Stephen Birarda
d7d8d76b07 fix ping of VS from agent 2013-10-17 13:58:00 -07:00
ZappoMan
8d7874b01b add guards to prevent runaway reaverageVoxels(), added stats to see if 4 children could be packed internally 2013-10-17 13:47:18 -07:00
Stephen Birarda
74e66dfd35 push various PACKET_TYPES, repairs to Agent for UUID setup 2013-10-17 13:35:53 -07:00
ZappoMan
6688b450c5 cleaned up some printf's to qDebug's 2013-10-17 12:31:18 -07:00
ZappoMan
8448e47df8 cleanup dead code 2013-10-17 12:27:23 -07:00
ZappoMan
095b716366 make population stats use public getters and private member variables 2013-10-17 12:16:03 -07:00
ZappoMan
c5deed36b0 added ifdefs for HAS_AUDIT_CHILDREN and added more memory tracking stats 2013-10-17 11:56:18 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
ZappoMan
296f18a844 make offset bounds match 20 bit storage 2013-10-17 09:58:28 -07:00
ZappoMan
d2bab77c88 implement support for three children encoding 2013-10-16 21:42:47 -07:00
ZappoMan
1e5ce8a7e5 first cut at really getting _children UNION to work 2013-10-16 12:54:37 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -07:00
ZappoMan
9800dc0fde removed dead code 2013-10-15 13:40:55 -07:00
ZappoMan
05c9d4febc added old style voxelnode for size comparison 2013-10-15 13:37:14 -07:00
ZappoMan
9d0ff1595a make voxelnode population statistics static members instead of per node 2013-10-15 13:33:38 -07:00
ZappoMan
86ba5e3064 some size comparison debugging 2013-10-15 12:11:49 -07:00
ZappoMan
9ba39c3a84 removed center from AABox to further save memory 2013-10-15 12:05:54 -07:00
ZappoMan
c9b0edf345 first cut at reducing memory footprint of AABox 2013-10-15 11:29:04 -07:00
ZappoMan
924053f2ec added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment 2013-10-14 15:10:56 -07:00
ZappoMan
3425685119 first cut at added voxel node memory usage debugging to client and server 2013-10-14 12:09:44 -07:00
ZappoMan
c86bad77c9 progress on keep local voxels 2013-10-10 15:23:22 -07:00
ZappoMan
d939d3aaae Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-09 14:02:40 -07:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
Andrzej Kapolka
aa353a57ad Fix for mouse ray with off axis projection. 2013-10-09 13:38:06 -07:00
Andrzej Kapolka
dfd5f7d53e Fix for screwy view when you lean too far forward. 2013-10-09 10:40:20 -07:00
ZappoMan
0c70a05732 make view frustum oversend and don't remove oversend in client 2013-10-04 21:36:21 -07:00
ZappoMan
84862310d1 fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threading/nonthreading behavior in PacketSender 2013-10-03 10:25:00 -07:00
ZappoMan
529bcc2b4a fix build buster 2013-10-02 20:46:49 -07:00
ZappoMan
9d231a50b6 implement support for process interval hints and handling sending only some packets per call to process in non-threaded mode 2013-10-02 20:39:58 -07:00
ZappoMan
4271fc5d41 removed debug 2013-10-02 17:01:07 -07:00
ZappoMan
90c64ab25c more work on handleing pending packets in VoxelEditPacketSender 2013-10-02 16:33:06 -07:00
ZappoMan
cc0009976b first cut and handling buffering of edit packets when voxel servers are unknown 2013-10-02 15:02:23 -07:00
ZappoMan
df4b64447b cleanup calls to markWithChangedTime() to happen after all changes made 2013-10-01 13:02:32 -07:00
ZappoMan
f1b28b929d fix a couple crashes disable emitting import progress in non-import case 2013-10-01 12:25:34 -07:00
ZappoMan
793a14e25a first cut at new faster voxel pipeline 2013-10-01 10:37:14 -07:00
ZappoMan
0f74d4bda9 change nodeDeleted() to voxelDeleted() to improve readability 2013-09-30 15:50:31 -07:00
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -07:00
ZappoMan
8cffa8d872 add support for global normals for voxels 2013-09-27 15:04:44 -07:00
ZappoMan
eb6af1afbf fix byte normals, fix crashes in switching between voxel shader and normal mode 2013-09-27 09:02:51 -07:00
ZappoMan
5695429a78 style fixes 2013-09-26 16:36:59 -07:00
ZappoMan
7845340279 menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader 2013-09-26 16:26:49 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
ZappoMan
4eedc6df29 make TREE_SCALE roughly 10 miles 2013-09-16 22:39:47 -07:00
LionTurtle
6f8ab7a6c6 Fix sign error in nudge code that made nudging in the negative Z 
direction buggy.
 2013-09-13 10:50:29 -07:00
LionTurtle
99db8491ef Get rid of qDebug statements in VoxelTree.cpp. 2013-09-12 17:41:02 -07:00
LionTurtle
71d5f3d2d8 Fix for copy/cut/paste single voxel leaves. 2013-09-12 17:38:16 -07:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
LionTurtle
3b464094d9 Remove magic numbers, fix spacing, and other code clean up in nudge code. 2013-09-10 11:09:50 -07:00
LionTurtle
f41533fee6 Add nudgeVoxel shading in grid. Fix erase bug. 2013-09-09 18:23:37 -07:00
LionTurtle
b0803c1267 Merge remote-tracking branch 'upstream/master' 2013-09-09 16:54:34 -07:00
LionTurtle
ac878c9c63 UI for nudge completed! 2013-09-09 16:53:31 -07:00
Andrzej Kapolka
26411a42b1 More focal length bits. 2013-09-06 15:07:15 -07:00
LionTurtle
d965789812 Switching nudge to cut/paste implementation. Preliminary. 2013-09-06 11:40:35 -07:00
LionTurtle
59943dc2e8 Merge branch 'nudge' 
Conflicts:
	interface/src/Menu.cpp
	libraries/voxels/src/VoxelTree.h
 2013-09-05 17:58:39 -07:00
LionTurtle
868ef8bec6 Add VoxelNudgeMode and preliminary UI grid for nudging. 2013-09-05 17:42:25 -07:00
LionTurtle
647bd5b704 Got rid of delete in nudge. Create is already destructive. 2013-09-05 11:30:23 -07:00
LionTurtle
6e37bc3644 Nudge code working for nudge that is greater than or equal to leaf size. 2013-09-05 11:06:12 -07:00
atlante45
b8c18bee2d merge 2013-09-04 15:31:12 -07:00
atlante45
5da525fc3e memory wastes and code cleaning PR comments 2013-09-04 15:12:24 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
atlante45
15a3a8d252 Some more code reformatting. 2013-09-03 10:32:38 -07:00
atlante45
26691118de Some code reformatting. 2013-09-03 10:30:46 -07:00
atlante45
38133ac6f2 Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-09-03 10:16:44 -07:00
atlante45
0068b838b2 Fixed importer crashing on non ARGB32 png. 2013-08-30 15:56:28 -07:00
LionTurtle
62b29d26d2 Nudge function added. Testing nudge. 2013-08-29 18:17:06 -07:00
atlante45
1dc8d8dd0c Added LOD to preview + Shared voxelSystem for reduced memory consumption 2013-08-29 17:59:36 -07:00
ZappoMan
38f54a3130 Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 2013-08-21 17:03:34 -07:00
atlante45
12459079e9 Fixed magic number 2013-08-21 16:41:24 -07:00
atlante45
447d9a65ce Fixed only square png import + reduced amount of code 2013-08-21 16:36:50 -07:00
ZappoMan
25e21f862c flush delete queue after encode is complete 2013-08-21 16:23:55 -07:00
ZappoMan
e524ed889e Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 
Conflicts:
	libraries/voxels/src/VoxelTree.cpp
	libraries/voxels/src/VoxelTree.h
 2013-08-21 13:48:23 -07:00
ZappoMan
4fd23a0cd9 CR feedback 2013-08-21 13:09:51 -07:00
ZappoMan
4bdaf7589f Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-21 12:16:09 -07:00
ZappoMan
2c362e6288 adding support for better multithreading in VoxelTree 2013-08-21 12:09:00 -07:00
atlante45
867303e673 Code cleanup 2013-08-21 11:33:10 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
ZappoMan
db6e327741 fixed build buster 2013-08-20 12:00:07 -07:00
ZappoMan
50532bc67d added NodeListHook to JurisdictionListener to properly remove nodes that are killed 2013-08-20 11:42:30 -07:00
ZappoMan
b0664163a7 removed debug 2013-08-20 11:27:31 -07:00
ZappoMan
da6bd2e3b0 cleanup, handle no JurisdictionMap case in JurisidictionSender 2013-08-20 11:22:51 -07:00
ZappoMan
0f7ea55e82 make animation-server work with jurisdictions 2013-08-20 11:08:20 -07:00
ZappoMan
5e7e6fc9d7 First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST 2013-08-19 20:15:46 -07:00
atlante45
24531fdd10 Dialogbox for import fully functionnal 2013-08-19 15:54:51 -07:00
ZappoMan
e64664c0d1 first cut at JurisdictionSender and related changes 2013-08-19 11:05:29 -07:00
ZappoMan
5a96f51602 first cut at JurisdictionSender and related changes 2013-08-19 10:30:22 -07:00
ZappoMan
68845da901 added doxygen comments and cleanup for VoxelSceneStats class 2013-08-16 10:10:17 -07:00
atlante45
68a1c56ad6 More work on import interface 2013-08-15 17:21:23 -07:00
ZappoMan
7045dff7d3 moved VoxelEditPacketSender to libraries 2013-08-15 14:26:31 -07:00
ZappoMan
04440d30d8 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	libraries/voxels/src/JurisdictionMap.h
 2013-08-15 12:27:00 -07:00
ZappoMan
4f16157e51 CR feedback 2013-08-15 11:39:00 -07:00
ZappoMan
90fcfca561 style fix 2013-08-15 10:45:53 -07:00
ZappoMan
c157aad775 starting to add PACKET_TYPE_VOXEL_JURISDICTION 2013-08-15 10:44:43 -07:00
ZappoMan
18e5d49d75 move move constructors and assignments into IFDEFS for now to fix build buster 2013-08-14 14:46:40 -07:00
ZappoMan
4305ad552d fix issue with JurisdictionMap being passed across wire 2013-08-14 14:19:06 -07:00
ZappoMan
02f2de6101 properly send full jurisdiction details in scene stats 2013-08-13 13:43:46 -07:00
ZappoMan
27d001a84d copy the jurisdication end nodes into voxel scene stats 2013-08-13 13:29:55 -07:00
ZappoMan
d3ce3e4e60 some cleanup and fixing of memory issue 2013-08-13 11:37:57 -07:00
ZappoMan
60dedee739 make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes 2013-08-13 11:08:43 -07:00
ZappoMan
bac2362706 Merge branch 'master' of https://github.com/worklist/hifi into split_tool 2013-08-08 14:51:42 -07:00
ZappoMan
1bb7d75794 added tool for splitting SVOs on jurisdiction boundaries 2013-08-08 14:36:42 -07:00
Stephen Birarda
955b7f0d24 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-07 10:26:26 -07:00
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -07:00
ZappoMan
73510ec975 added notifications with jurisdiction details for when voxel servers come and go 2013-08-06 10:33:09 -07:00
Stephen Birarda
d3b2ba1070 fix QtCore includes in voxels library 2013-08-05 17:40:01 -07:00
ZappoMan
acd3acb81e correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats 2013-08-05 16:51:01 -07:00
ZappoMan
01ba5ee81a adding jurisdiction to scene stats to implement add/drop effect, added command line to voxel server to not send environments 2013-08-05 16:30:08 -07:00
ZappoMan
06e249b872 added command line options for jurisdiction settings 2013-08-02 15:38:43 -07:00
ZappoMan
db55160f9a Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 14:40:39 -07:00
atlante45
1cae9fc6c7 merge 2013-08-02 14:14:21 -07:00
ZappoMan
558fca7936 latest jurisdiction work 2013-08-02 11:12:33 -07:00
ZappoMan
f57d86ddb2 writing jurisdiction map configs 2013-08-02 08:56:55 -07:00
ZappoMan
81a363f053 added reading/writing to jurisdiction files 2013-08-01 22:05:13 -07:00
ZappoMan
983db5f70d Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-01 20:50:24 -07:00
ZappoMan
0a4fcdccb5 Merge branch 'master' of https://github.com/worklist/hifi into tile_import 
Conflicts:
	interface/src/Application.cpp
 2013-08-01 15:44:28 -07:00
ZappoMan
a0ba788679 implement grid landscape import 2013-08-01 15:40:39 -07:00
atlante45
b6049c9a10 Merge branch 'master' of https://github.com/worklist/hifi into pie_menu 2013-08-01 15:28:35 -07:00
Stephen Birarda
269e040263 Qt5 find package cleanup 2013-08-01 15:27:55 -07:00
ZappoMan
75fe53263c first cut at jurisdiction maps, not working yet 2013-08-01 12:40:40 -07:00
ZappoMan
c7e3fe5ef6 Added false colorization by voxel server source 
- switched readBitstreamToTree() to take params struct for future expansion
- switched readNodeData() to take params for future expansion
- added sourceID to VoxelNode
- fixed false colorize routines to correctly redraw by marking tree as dirty
 2013-07-30 11:08:48 -07:00
ZappoMan
620fe12358 support for multiple voxel servers in ping stats 2013-07-29 16:31:14 -07:00
ZappoMan
95e6fb16d0 cleanup 2013-07-29 16:17:57 -07:00
ZappoMan
c5ab321bd9 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 15:54:52 -07:00
ZappoMan
1a73485e36 Improved VoxelNode delete callback based on CR feedback 
- changed hooks to use a virtual base class approach
- switched account of hooks to use a vector instead of home grown solution
- added support for VoxelNode to know what VoxelSystem it belongs to
 2013-07-29 15:30:30 -07:00
ZappoMan
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -07:00
ZappoMan
e20f163e0a changed some defines to consts 2013-07-29 13:34:58 -07:00
ZappoMan
d6428a8145 removed unneeded cast 2013-07-29 13:03:42 -07:00
ZappoMan
6a2bab2a2c Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-29 13:02:14 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
ZappoMan
0c95dc4adf Fixed voxel trails from animations 
- removed stageForDeletion behavior of VoxelNode
- replaced with VoxelNodeDeletionHook strategy
- VoxelSystem now cleans up previously used VBO index slots via hook
 2013-07-26 11:12:48 -07:00
ZappoMan
79648ce656 fix bug with dragonfly leaving trailing bits 2013-07-25 15:22:23 -07:00
ZappoMan
919f2a4a93 fix voxel-server crash 2013-07-25 12:56:00 -07:00
atlante45
fec25d374f merge 2013-07-24 10:35:57 -07:00
ZappoMan
d5e62b0f5a CR feedback 2013-07-22 14:18:16 -07:00
ZappoMan
f4749aa916 CR feedback 2013-07-22 14:17:18 -07:00
ZappoMan
60750d1d80 CR feedback 2013-07-22 14:13:10 -07:00
ZappoMan
8186145d35 CR feedback 2013-07-22 14:09:29 -07:00
ZappoMan
70516c8cb4 CR feedback 2013-07-22 14:08:48 -07:00
ZappoMan
d3c46cce8f CR feedback 2013-07-22 14:01:47 -07:00
atlante45
13952a6f24 Merge with pie_menu 2013-07-21 15:22:43 -07:00
ZappoMan
70c6ed040c added averages for bits per voxel and elapsed time 2013-07-21 07:21:23 -07:00
ZappoMan
de7cd4db03 added total voxel count to stats 2013-07-20 15:49:04 -07:00
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d additional stats items 2013-07-20 11:28:12 -07:00
ZappoMan
4e8ce1b193 tweaks to stats dialog 2013-07-19 18:15:06 -07:00
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
atlante45
fc3aa2da9b Fixed typo in Tags.cpp top comments 2013-07-19 17:02:45 -07:00
ZappoMan
2cc42f6773 support piggybacking voxel and voxel stats messages into single packet 2013-07-19 15:59:47 -07:00
ZappoMan
d9c8a59929 send voxel scene stats from server to client 2013-07-19 15:09:38 -07:00
ZappoMan
787c448856 include elapsed encoding time in voxel stats, fixed issue with subtree removal stats 2013-07-19 12:29:54 -07:00
ZappoMan
92f7f06af9 more stats 2013-07-19 12:00:51 -07:00
ZappoMan
c2ab5c4d98 more work on voxel stats 2013-07-19 11:42:37 -07:00
Mark Peng
a14768bb29 Remove more unnecessary additions. 2013-07-19 01:00:55 -07:00
ZappoMan
11eabf3c51 more stats 2013-07-18 15:14:11 -07:00
Mark Peng
fe01067473 Merge remote-tracking branch 'upstream/master' 2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e Render circle in 3D space for lookatIndicator. Still not normal to the screen. 2013-07-18 14:34:51 -07:00
ZappoMan
3aa6af21b1 more voxel scene stats 2013-07-18 14:13:45 -07:00