Stephen Birarda
b705ec560f
cleanup resources directory references by copying beside the executable
2014-03-06 11:46:49 -08:00
Stephen Birarda
403f91c988
update resource references to use Qt resource system
2014-03-06 10:41:11 -08:00
Atlante45
f1ce034c35
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
2014-03-03 16:47:42 -08:00
ZappoMan
d8d61c7361
move hydra finger painting from c++ to js
2014-03-03 01:06:48 -08:00
ZappoMan
f245aa6ac5
remove more cruft from VoxelSystem, move getElementEnclosingPoint() to Octree class where it belongs
2014-03-02 20:12:52 -08:00
ZappoMan
d9dcc886ce
removed some dead code
2014-03-02 16:57:19 -08:00
ZappoMan
176270f639
more VoxelSystem vs VoxelTree cleanup
2014-03-02 16:51:40 -08:00
ZappoMan
63bebc9afc
removed dead code
2014-03-02 16:44:25 -08:00
ZappoMan
5f6a60e786
removed more VoxelSystem wrappers, call VoxelTree directly
2014-03-02 16:40:27 -08:00
ZappoMan
f0e73d2f98
removed VoxelSystem::findRayIntersection() use tree directly
2014-03-02 15:46:33 -08:00
ZappoMan
9bd29bdd92
removed findSpherePenetration() and findCapsulePenetration() from VoxelSystem, use VoxelTree
2014-03-02 15:34:36 -08:00
ZappoMan
ded7328959
clean up application access to deleteVoxelAt()/createVoxel()/getVoxelAt() to access VoxelTree directly
2014-03-02 15:17:49 -08:00
ZappoMan
5b72f01b99
more cruft removal getting rid of false color in VoxelTreeElement
2014-03-02 12:33:52 -08:00
ZappoMan
b66c346f20
more cruft removal
2014-03-02 12:19:50 -08:00
ZappoMan
c5197b390e
removed a bunch of cruft from VoxelSystem
2014-03-02 12:13:00 -08:00
Atlante45
ea0f414c23
Added possibility to create a VoxelSystem from an already existing VoxelTree
2014-02-28 15:11:38 -08:00
ZappoMan
b7f62eabf0
clean up more menu items
2014-02-27 15:25:39 -08:00
matsukaze
e800c80d61
Merge remote-tracking branch 'upstream/master'
2014-02-20 23:32:06 -05:00
matsukaze
b813438307
Consolidate primitive index with buffer index.
...
Removed the extra space associated with primitive index and use buffer
index for both the VBO and primitive renderers since they are exclusive.
2014-02-20 08:48:40 -05:00
matsukaze
75ecdbd1f0
Merged clearAllOcclusions into inspectOcclusions
2014-02-19 06:56:12 -05:00
matsukaze
8aa645b6de
Merge and resolve conflicts of remote-tracking branch 'upstream/master'
2014-02-18 22:45:25 -05:00
matsukaze
b838833c21
Swizzle bit pairs in the occlusion bit mask
2014-02-18 08:00:30 -05:00
ZappoMan
ab3e1af64d
fix the sometime voxels don't show when you move bug
2014-02-17 12:02:11 -08:00
matsukaze
32f0a81708
Backed out last change to recursion.
2014-02-17 00:27:24 -05:00
matsukaze
04b1c3e935
Fix occlusions between cousins. Recurse only to shouldRender or isLeaf voxel when inspecting for occlusions
2014-02-16 23:38:10 -05:00
ZappoMan
601c155303
correctly lock arrays on init
2014-02-13 14:46:59 -08:00
ZappoMan
ed7fa6e311
added back setupNewVoxelsForDrawing() on changeTree()
2014-02-13 14:39:10 -08:00
ZappoMan
4fb5e68425
removed some debug
2014-02-13 14:33:23 -08:00
ZappoMan
3aba29b015
first working cut at recreateVoxelGeometryInView()
2014-02-13 13:26:31 -08:00
ZappoMan
cac67d7baa
add proper readWriteLocks around the VBO arrays to preven random triangles
2014-02-13 13:06:45 -08:00
matsukaze
11a399ec82
Fix crash bug
...
Doh!! Renderer used before initialized.
2014-02-13 11:19:14 -05:00
ZappoMan
20a6f4eea9
first cut at auto-LOD adjustment
2014-02-12 21:22:21 -08:00
matsukaze
9e5c8b1634
Merging upstream master
2014-02-12 12:32:53 -05:00
matsukaze
a3ce69bcbb
Removed duplicate pathway to updateNodeInArrays from showAllSubTreeOperation
2014-02-10 01:44:27 -05:00
matsukaze
18e219b5c0
Fixes for style conformance: tabs to spaces
2014-02-08 09:06:14 -05:00
matsukaze
984110790c
Added new display mode to show culled faces. More statistics.
2014-02-07 22:15:25 -05:00
Brad Hefta-Gaub
a16b3a34e4
fix stutter while spinning
2014-02-06 02:18:28 -08:00
ZappoMan
b0c41b086d
fix voxel packet corruption
2014-02-04 22:54:55 -08:00
matsukaze
ef3d795938
Fixes for style conformance
2014-02-04 21:58:14 -05:00
matsukaze
259b285841
Merging upstream
2014-02-03 10:25:32 -05:00
matsukaze
bbf4f889d8
Completed worklist job #19486
...
Job #19486 Don't render the duplicate triangles between adjacent
voxels.
Added checkable item to "developer" menu to activate/deactivate cull
shared faces.
Cull all shared voxel faces regardless of distribution in the octree.
Includes leaf to leaf, leaf to non-leaf, and non-leaf to non-leaf
comparison of contiguous faces.
Added new GL primitive renderer to manage the transfer of cube faces
from the voxel system to GL.
Added some useful classes for queue and lock management.
Modified statistics collection to report number of completely culled
nodes. Extra debugging info also includes the interior occlusions bit
mask of leaf voxels.
2014-02-03 09:45:12 -05:00
Stephen Birarda
4de270b832
cleanup Node types, closes #1726
2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3
replace uint64_t with quint64 for Qt friendlyness
2014-01-28 12:35:42 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
Stephen Birarda
8d2e9823de
remove notion of owning node from NodeData
2014-01-23 17:06:03 -08:00
Philip Rosedale
a4f13e8bdd
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-16 15:01:57 -08:00
Brad Hefta-Gaub
a76f5a088c
fixed comment
2014-01-16 13:19:21 -08:00
Brad Hefta-Gaub
a960330f34
fix voxel randomly disappearing bug
2014-01-16 13:17:41 -08:00
Philip Rosedale
46bd677a4a
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-16 11:51:54 -08:00
Philip Rosedale
aa2ee2526e
name file correctly
2014-01-16 11:51:46 -08:00