Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 09:18:44 +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
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
ZappoMan
65f550e68e Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-18 11:30:39 -07:00
ZappoMan
c41f5e27ef fixed crash 2013-07-18 11:25:01 -07:00
ZappoMan
b90fc9cc0d more 2013-07-18 11:21:14 -07:00
ZappoMan
40f87817bf first cut at scene stats 2013-07-18 11:03:46 -07:00
ZappoMan
1e421d222d cleaned up some compiler warnings and constants 2013-07-18 10:20:01 -07:00
Mark Peng
6006b8e96b Merge remote-tracking branch 'upstream/master' 2013-07-17 17:28:12 -07:00
Mark Peng
125bcc46f4 Circle drawn with camera orientation as its normal for lookatIndicator. 2013-07-17 17:27:15 -07:00
ZappoMan
677e2580e1 make send only changed bits work better 2013-07-17 14:42:20 -07:00
ZappoMan
74eaf72d53 removed bogus code that related to server crash 2013-07-17 11:52:50 -07:00
ZappoMan
9e9b379d66 Fix crashing bug in voxel-server related to animation 
- added VoxelNodeDeleteHook mechanism that allows users of VoxelNode to register for delete
  notification call backs
- added call back to VoxelNodeBag to remove and nodes from bags when the nodes get deleted.
 2013-07-17 11:49:42 -07:00
ZappoMan
adc09cec68 some CR feedback 2013-07-16 17:21:28 -07:00
ZappoMan
bdb14fee33 cleanup 2013-07-16 16:53:15 -07:00
ZappoMan
5ee6910256 cleanup 2013-07-16 16:51:09 -07:00
ZappoMan
d54bae8e76 cleanup 2013-07-16 16:47:18 -07:00
ZappoMan
75d052b997 cleanup 2013-07-16 16:46:58 -07:00
ZappoMan
fbc59de081 latest cut at dirty bit sending 2013-07-16 15:08:09 -07:00
ZappoMan
70e54f0350 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 13:52:07 -07:00
Stephen Birarda
9d62e7f187 Merge remote-tracking branch 'upstream/master' into qdebug 2013-07-16 13:34:42 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
ZappoMan
8626c95a20 whitespace fix 2013-07-16 12:01:09 -07:00
ZappoMan
c12ab63dc2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 12:00:07 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
ZappoMan
d71400a42a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 09:36:39 -07:00
ZappoMan
1fb1622beb added sleep to sendVoxelOperation() to keep from overwhelming server 2013-07-15 16:27:23 -07:00
ZappoMan
8d4f7f8a2a CR feedback 2013-07-15 09:26:19 -07:00
ZappoMan
64681fa1e4 CR feedback 2013-07-15 09:21:47 -07:00
ZappoMan
133bbd81fe small spacing change 2013-07-15 01:42:21 -07:00
ZappoMan
f078d646d7 small spacing change 2013-07-15 01:41:28 -07:00
ZappoMan
f415f4081a Fixed a bug in LOD boundaries 
- changed the way we calculate whether or not to render a parent "average" voxel so
  that if any of it's most distant child would not be visible, then it's used instead
  of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
  to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
  sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
  center of the voxel, but the distance from the camera to the furthest corner relative
  to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
  tell you which vertex of the box is furthest from the camera
 2013-07-15 01:32:14 -07:00
ZappoMan
85b1ce3051 tweaks to low res moving, made monochrome off by default 2013-07-12 14:11:35 -07:00
ZappoMan
323644d877 CR feedback 2013-07-11 16:09:08 -07:00
ZappoMan
8774cb7ca0 fix hungergames circle bug, and improve performance of isLeafOrLOD logic 2013-07-11 15:48:17 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
ZappoMan
241bd7ce37 added support for lower LOD when moving with low res moving 2013-07-11 13:16:52 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
ZappoMan
d4ce00de77 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 10:24:53 -07:00
Stephen Birarda
4ed231670f put back the missing voxels 2013-07-11 10:04:27 -07:00
ZappoMan
5427b263f6 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 09:46:10 -07:00
Stephen Birarda
ca0f6a4d10 header re-arranging and changing 2013-07-11 09:30:45 -07:00
Stephen Birarda
211204e878 Merge remote-tracking branch 'upstream/master' into timestamps 2013-07-11 09:23:16 -07:00
ZappoMan
34cebc36c7 short circuit node recursion for delta sending 2013-07-11 09:11:09 -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
371bf7d181 removed dead code, fixed compiler warning 2013-07-10 17:22:30 -07:00
ZappoMan
2bb2fc736c remove dead code 2013-07-10 17:14:34 -07:00
ZappoMan
1831cc0de3 removed level param from recursion 2013-07-10 17:06:22 -07:00
ZappoMan
62c933140d implement max number of polygons in the coverage regions to keep them from getting slow 2013-07-10 16:57:42 -07:00
ZappoMan
6694ef3869 fixed some compiler warnings 2013-07-10 16:33:27 -07:00
ZappoMan
4afda27ee0 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 16:28:51 -07:00
ZappoMan
3c150c3ec6 only get boundary distance once, since its the same for all grandchildren 2013-07-10 16:12:13 -07:00
Atlante45
425ea0aa29 merge conflict 2013-07-10 14:22:03 -07:00
ZappoMan
02437c6f39 fix random big average voxels slightly in view bug 2013-07-10 13:29:12 -07:00
ZappoMan
8bccfff5b5 fix random big average voxels slightly in view bug 2013-07-10 13:14:23 -07:00
Atlante45
7d94f65448 Linked ZLIB to voxels library 2013-07-10 13:00:16 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
ZappoMan
845b8924a5 removed some dead code 2013-07-10 11:21:38 -07:00
ZappoMan
ed8c33ef4b removed some comments 2013-07-10 11:19:49 -07:00
ZappoMan
d8b72cb126 removed some comments 2013-07-10 11:17:23 -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
44357fcfb9 add 'level' param to tree recursion 2013-07-09 13:17:21 -07:00
ZappoMan
e85d5f3b14 make keyhole radius larger 2013-07-09 13:04:20 -07:00
atlante45
dbdbd7a8c4 Incorporating comments for code review (minecraft import) 2013-07-09 17:55:55 +02:00
atlante45
c9d707796e Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 14:29:19 +02:00
atlante45
4dda71e830 Final code for minecraft import to review 2013-07-09 12:41:44 +02: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
atlante45
4899f77a0c Complete color handling in minecraft import 2013-07-08 16:11:50 +02:00
atlante45
981e4c61b5 Tags files missing in last commit 2013-07-08 13:45:38 +02:00
atlante45
6c840a9ec3 Functionnal version of minecraft import 2013-07-08 13:37:47 +02:00
ZappoMan
e4579fe6c6 make regions and submaps configurable 2013-07-03 15:28:39 -07:00
ZappoMan
2d6e522c35 debug stats 2013-07-03 10:59:36 -07:00
ZappoMan
5ef2e2de5d debug statistics for intersect calls 2013-07-03 10:58:30 -07:00
ZappoMan
a05650e74a removed debug code 2013-07-03 10:56:08 -07:00
ZappoMan
1e19748a1a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-02 15:52:49 -07:00
ZappoMan
c7ff073686 more progress on merging 2013-07-02 15:50:40 -07:00
Tomáš Horáček
a9f8b586ee re #19385: CR changes 2013-07-02 23:04:06 +02:00
ZappoMan
be88f07678 more progress on merging 2013-07-02 11:47:30 -07:00
Tomáš Horáček
5f9f2fee71 re #19385: use righ axis name 2013-07-02 11:47:53 +02:00
ZappoMan
015ff85cea good progress on merging polygons 2013-07-01 21:39:56 -07:00
Tomáš Horáček
2eeb0d9bb9 re #19385: importing voxels should be destructive 2013-07-02 01:16:20 +02:00
Tomáš Horáček
71c54586ba re #19385: use right neighbour voxels 2013-07-02 01:16:20 +02:00
Tomáš Horáček
b5e5806988 re #19385: fill gaps between neighbourhood voxels 2013-07-02 01:16:20 +02:00
Tomáš Horáček
c4c2d46847 re #19385: first version of PNG import 
works for size <= 128px
 2013-07-02 01:16:20 +02:00
ZappoMan
f764a8d609 DRY up code in polygon 2013-06-29 00:25:04 -07:00
ZappoMan
c7e691a010 cleaned up CoverageMapV2 recursion code, fixes crazy false occlusion 2013-06-29 00:15:57 -07:00
ZappoMan
2b8b7589be latest version of quadtree coverage map 2013-06-28 22:05:46 -07:00
ZappoMan
73ad854235 latest version of quadtree coverage map 2013-06-28 22:05:32 -07:00
ZappoMan
850cfb920f added sorting polygons by size 2013-06-24 22:11:33 -07:00
ZappoMan
f918d757ca added comment 2013-06-24 10:12:14 -07:00
ZappoMan
4590bdc69d added support for clipping polygons to screen bounds, not yet enabled since it doesn't help performance, will use in future 2013-06-21 16:42:55 -07:00
ZappoMan
758fadd6a9 optimized CoverageRegion to track _currentCoveredBounds and not test polygons in the tested ocludee is not in those covered bounds 2013-06-19 23:34:45 -07:00
ZappoMan
cadd596508 implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares 2013-06-19 17:52:01 -07:00
ZappoMan
91f6d0fde5 added copyright message 2013-06-19 15:29:50 -07:00
ZappoMan
1284f9d09a naming cleanup and some optimizations 2013-06-19 13:45:13 -07:00
ZappoMan
6755dfd8e4 Occlusion culling optimizations, added minimum polygon area, and only calculate projection matrix once 2013-06-19 11:46:22 -07:00
ZappoMan
9466e81590 fixed crash 2013-06-18 12:25:16 -07:00
ZappoMan
8c44ad19a1 fixed build buster 2013-06-18 12:10:59 -07:00
ZappoMan
7922c3b625 fixed typo 2013-06-18 12:02:17 -07:00
ZappoMan
8b18ee6844 renamed VoxelProjectedShadow class 2013-06-18 12:01:01 -07:00
ZappoMan
9a22db28a3 code cleanup 2013-06-18 10:35:32 -07:00
ZappoMan
00438f9d99 code cleanup 2013-06-18 10:28:14 -07:00
ZappoMan
a6b4bdba53 code cleanup 2013-06-18 10:25:58 -07:00
ZappoMan
58c4010185 added CoverageMap and occlusion culling to server 2013-06-18 09:36:43 -07:00
ZappoMan
c8d4b2ebed added erase() and some other tweaks to CoverageMap 2013-06-18 09:35:13 -07:00
ZappoMan
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -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
e083c0c561 spacing 2013-06-14 16:48:36 -07:00
ZappoMan
08e8455c95 migrate encodeTreeBitstream() to use params class 2013-06-14 16:45:27 -07:00
ZappoMan
620a4a8ad6 latest occlusion culling with support for checking map without adding to coverage map for checking parent nodes 2013-06-13 16:37:14 -07:00
ZappoMan
7fb4ed276f removed some debugging code 2013-06-13 14:10:53 -07:00
ZappoMan
8320925add Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 13:30:18 -07:00
ZappoMan
abb08e2482 handle out of view points 2013-06-13 13:30:04 -07:00
Andrzej Kapolka
78072fbde0 Merge pull request #523 from PhilipRosedale/master 
Better physics, first person to third person transition
 2013-06-13 12:07:06 -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
ZappoMan
3a33d871e8 some debug code 2013-06-12 21:46:22 -07:00
ZappoMan
91aea82418 latest work on occlusion culling 2013-06-12 12:37:21 -07:00
ZappoMan
e2d22a8e21 latest cut at occlusion culling 2013-06-12 01:16:46 -07:00
ZappoMan
b3ef9868e3 fixed line spacing and added BoundingBox support 2013-06-11 18:37:31 -07:00
ZappoMan
6d3ec662a1 CoverageMap class, implments a quad tree that handles coverage map for 2d polygon projections of voxels 2013-06-11 18:36:25 -07:00
ZappoMan
77dc8d9900 moved line intersection to GeometryUtil 2013-06-11 14:06:17 -07:00
ZappoMan
56753fc21d added getProjectedShadow() and projectPoint() to ViewFrustum to implement support for projecting Axis Aligned Boxes to 2D 2013-06-11 12:33:18 -07:00
ZappoMan
6d8826de43 cleaned up line spacing and tabs, added getVertex() 2013-06-11 12:30:52 -07:00
ZappoMan
658c5adfbf first cut at VoxelProjectedShadow class, which implements a 2D polygon that matches a voxels projected outline 2013-06-11 12:30:18 -07:00
ZappoMan
a9c18c2af0 cleaned up line spacing and tabs, added getVertex() 2013-06-11 12:28:09 -07:00
Philip Rosedale
297a78188a removed const values per code review 2013-06-10 08:10:51 -07:00
Philip Rosedale
3ec16695f4 Finished adding concept of density to the voxel server, objects now appear more visible at a distance in an appealing way. 2013-06-09 12:48:22 -07:00
ZappoMan
ced36de64a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-08 21:18:20 -07:00
Philip Rosedale
b7c680e3e7 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-08 15:15:27 -07:00
Philip Rosedale
769383582b Adding density to nodes 2013-06-08 14:24:29 -07:00
ZappoMan
a175ad8fda fix spacing 2013-06-07 17:25:05 -07:00
ZappoMan
46c66c39e5 implement keyhole frustum 2013-06-07 17:23:23 -07:00
ZappoMan
e65c0a25fa Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-07 11:31:32 -07:00
ZappoMan
ba7863605c fix several delete/delete[] mismatches 2013-06-07 10:49:43 -07:00
ZappoMan
e57db88c07 remove redundant calls to reaverageVoxelColors() now only use recursion unwinding 2013-06-07 10:28:25 -07:00
ZappoMan
736e38ceb0 fix merge issue 2013-06-07 10:04:30 -07:00
ZappoMan
8220c62f3f Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-07 09:13:53 -07:00
ZappoMan
ae3db89f63 added method for general subtree change bookkeeping 2013-06-06 10:55:11 -07:00
ZappoMan
66ebb7d01c Made readCodeColorBufferToTree() use self contained recursion so we can 
implement color averaging properly
 2013-06-06 01:39:40 -07:00
ZappoMan
57aff0af64 fixed bug in recursive delete that caused animation ghosts 2013-06-06 01:00:12 -07:00
ZappoMan
4f1131fc97 add markWithChangedTime() method as public method 
Conflicts:
	libraries/voxels/src/VoxelNode.cpp
	libraries/voxels/src/VoxelNode.h
 2013-06-05 16:05:32 -07:00
ZappoMan
873ae85d4e changed deleteVoxelCodeFromTree() to use recursion to allow for proper unwinding, updating of parent path 2013-06-05 16:01:37 -07:00
ZappoMan
00c29e5eda changed deleteVoxelCodeFromTree() to use recursion to allow for proper unwinding, updating of parent path 2013-06-05 10:32:36 -07:00
ZappoMan
93e5991c68 add markWithChangedTime() method as public method 2013-06-05 10:31:24 -07:00
ZappoMan
15587f8b23 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-04 18:01:58 -07:00
ZappoMan
4f2af717f2 Fixed merge issue with new orientation vectors, migrated to common identity names 2013-06-04 17:27:40 -07:00
ZappoMan
6e70f3b187 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 16:21:20 -07:00
Andrzej Kapolka
d09700adde Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/Skeleton.h
	interface/src/VoxelSystem.h
 2013-06-04 11:00:59 -07:00
ZappoMan
8f58f9f424 merge cleanup 2013-06-04 10:48:45 -07:00
ZappoMan
0b8537775e Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-04 10:40:09 -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
37cc436b2b CR feedback 2013-06-04 01:08:18 -07:00
ZappoMan
1f3de3e12b CR feedback 2013-06-04 01:03:26 -07:00
ZappoMan
510dfc7353 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-03 21:43:38 -07:00
ZappoMan
4c597a2736 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-03 21:35:39 -07:00
ZappoMan
03f79f5cab fixed delete voxel 2013-06-03 21:04:42 -07:00
ZappoMan
cf3ff53e2c copy and paste working 2013-06-03 18:08:11 -07:00
ZappoMan
ea965f2290 fixed issue with sendVoxelsOperataion, some other cleanup 2013-06-03 13:46:21 -07:00
ZappoMan
78fe89172a eyedropper mode, and import work 2013-06-03 12:23:16 -07:00
Andrzej Kapolka
a6daa296ff Slight fix to capsule/box penetration test: we should use the smaller distance 
to the diagonal, not the first one we find.
 2013-06-03 10:08:42 -07:00
ZappoMan
e5e200345b more work on copy and paste 2013-05-31 11:52:18 -07:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
ZappoMan
6b1d37599c Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-29 08:12:07 -07:00
ZappoMan
d1d2e75143 first cut at export and import of voxels 2013-05-28 19:00:02 -07:00
Jeffrey Ventrella
82683dbabc merge 2013-05-28 17:58:02 -07:00
Stephen Birarda
65f10cb99a fix the enum in AABox, fix a warning in Head 2013-05-28 16:26:18 -07:00
Andrzej Kapolka
1df7806464 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09 Fix for NaN. 2013-05-27 14:37:07 -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
Andrzej Kapolka
cfb66bee95 Capsule/box collisions. 2013-05-27 14:05:44 -07:00
ZappoMan
12dc11fbfa 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 09:56:35 -07:00
ZappoMan
538fc89739 first cut at dirty bit sending support 2013-05-26 13:11:54 -07:00
Andrzej Kapolka
70b25fd6c4 Sphere/box collisions for voxels, various utility functions. 2013-05-25 19:59:07 -07:00
ZappoMan
48ca562b10 tweak ViewFrustum::matches() to use EPSILON compare 2013-05-25 15:28:56 -07:00
Andrzej Kapolka
95f1a9adaa Removed unused nearCenter/farCenter from ViewFrustum. 2013-05-23 16:34:11 -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
25700ae490 fixes to coloring bugs, coding standard cleanup 2013-05-23 12:08:51 -07:00
ZappoMan
2130572034 fixed color initialization on VoxelNode construction 2013-05-23 12:07:56 -07:00
Andrzej Kapolka
34b526f15c Restore the original floor behavior. 2013-05-23 10:32:12 -07:00
Andrzej Kapolka
629c7b0146 Send all environment data in the same packet and only send it about once a 
second.
 2013-05-22 17:09:35 -07:00
birarda
9ec04855f8 Merge pull request #386 from ZappoMan/voxel_animation 
Fix some crashing issues on delete
 2013-05-22 14:27:29 -07:00
ZappoMan
47c4ff887e CR feedback 2013-05-22 14:13:38 -07:00
ZappoMan
06f2528d6a fix crashing on deleting voxels in server and client 2013-05-22 13:23:01 -07:00
Andrzej Kapolka
8b1362636e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master 
refactors logging, adds comments, and revises names & formatting in all submitted code
 2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00
ZappoMan
09711d86ed fix compiler warning 2013-05-21 18:03:14 -07:00
ZappoMan
c316899f27 CR feedback 2013-05-21 17:42:55 -07:00
ZappoMan
166ad4f73d CR feedback 2013-05-21 17:37:21 -07:00
tosh
ba4f4b9809 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 13:46:04 -07:00
ZappoMan
869a100486 cleanup 2013-05-21 13:37:58 -07:00
Andrzej Kapolka
0377ca1adb Compute nodes' enclosing radius in the same place. 2013-05-21 13:32:41 -07:00
Andrzej Kapolka
597769a861 Added basic capsule/sphere collisions between avatar and voxels. 2013-05-21 12:58:02 -07:00
ZappoMan
d6d9b053f5 removed extra color exists bitmask since we weren't using it and it was redundant 2013-05-21 12:45:40 -07:00
ZappoMan
edcc92cfb6 cleanup code 2013-05-21 11:58:48 -07:00