Commit graph

144 commits

Author SHA1 Message Date
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
2013-12-04 11:40:54 -08:00
ZappoMan
bc715085a9 Merge pull request #1304 from PhilipRosedale/master
Voxel drumming, search function to find leaf voxel containing a point
2013-12-04 11:28:39 -08:00
Stephen Birarda
eb316a450a Merge pull request #1298 from ZappoMan/move_hideshow_to_thread
Move Hide/Show local voxels to a dedicated thread
2013-12-04 11:27:14 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Philip Rosedale
8fdd78dc26 Added drum sounds and voxel collision detection 2013-12-03 16:25:23 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
ZappoMan
76b3bd4e6e Move Hide/Show local voxels to a dedicated thread so that it doesn't slow performance of voxel packet processing 2013-12-02 12:08:45 -08:00
Andrzej Kapolka
f0e5872b89 Lighten the shadows, remove some debug code. 2013-11-21 12:29:22 -08:00
ZappoMan
9bd27e2b2a fix stutter on rotating 2013-11-03 21:11:08 -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
606a6349c7 added abandoned voxels to stats, improved sizing behavior of voxel stats dialog 2013-10-30 15:28:44 -07:00
ZappoMan
dd7eb66cec adjustable LOD tweaks 2013-10-30 11:53:16 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
ZappoMan
5d18b68a2e added support for forceFullFrustum in hideOutOfView() this fixes inconcistancies with voxel hiding showing 2013-10-23 10:14:41 -07:00
ZappoMan
306b23d489 make Fast Voxel Pipeline the default behavior 2013-10-23 05:58:47 -07:00
ZappoMan
3c8e30c956 make HideOutOfView the default behavior 2013-10-23 05:38:33 -07:00
ZappoMan
2979a8e738 better working version of hideOutOfView voxel support 2013-10-21 15:30:14 -07:00
ZappoMan
9b0cc14552 fix voxel nodes to work with new UUID format 2013-10-17 16:14:06 -07:00
ZappoMan
4be07ececb fixed a couple crashes and cleaned up some code 2013-10-11 01:30:09 -07:00
ZappoMan
c86bad77c9 progress on keep local voxels 2013-10-10 15:23:22 -07:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
ZappoMan
f6981feacf added various render mode options, including voxels as points 2013-10-07 17:46:22 -07:00
ZappoMan
608c24e258 fix build buster 2013-10-03 15:58:15 -07:00
ZappoMan
1c664b311d fixed behavior of voxel delete and some cases of voxel add in fast pipeline mode 2013-10-03 14:15:13 -07:00
ZappoMan
8ceee2ec1e more cleanup of faster voxel pipeline 2013-10-01 11:51:25 -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
605c2f30cf add memory usage debugging 2013-09-27 10:17:10 -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
2487a55be9 add support for use of Byte normals 2013-09-26 19:04:19 -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
552d9fadd8 rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -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
688bc17954 Fixed avatar related files memory wastes 2013-09-03 13:37:25 -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
fc991bf1ac Some code reformating 2013-08-29 18:11:16 -07:00
atlante45
1dc8d8dd0c Added LOD to preview + Shared voxelSystem for reduced memory consumption 2013-08-29 17:59:36 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
atlante45
22a2603eaa Several VoxelSystems can have different view frustum 2013-08-20 15:28:08 -07:00
atlante45
24531fdd10 Dialogbox for import fully functionnal 2013-08-19 15:54:51 -07:00
atlante45
6b58e1bfec merge 2013-08-16 20:24:18 -07:00
atlante45
68a1c56ad6 More work on import interface 2013-08-15 17:21:23 -07:00
Stephen Birarda
e77aae157b fix in view and occluded false colorization 2013-08-15 15:15:19 -07:00
Stephen Birarda
c7be2e13cd repair false coloring by distance 2013-08-15 15:12:05 -07:00
Stephen Birarda
cf5c53281b repair first couple of false colorize methods 2013-08-15 15:07:49 -07:00
Stephen Birarda
f72f9d8735 fix hook to render pipeline warnings and kill local voxels 2013-08-15 14:57:40 -07:00