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
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
ZappoMan
e8fd96018b
cleanup code
2013-05-21 11:52:57 -07:00
ZappoMan
b61d6cf4e8
cleanup code
2013-05-21 11:48:30 -07:00
ZappoMan
e47d9ea21f
cleanup code
2013-05-21 11:44:48 -07:00
ZappoMan
ef2d27aba6
getting closer to working delete
2013-05-21 10:43:31 -07:00
ZappoMan
a53f84fcb9
latest hacking
2013-05-20 15:51:47 -07:00
ZappoMan
321d1952d6
first cut at exists bits
2013-05-20 12:56:59 -07:00
Andrzej Kapolka
8e04c17cc2
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-05-14 14:44:22 -07:00
Andrzej Kapolka
ebc612f87a
Start out with gray, fix coloring smaller portions by (similar to deleting)
...
breaking up leaf nodes into their components.
2013-05-14 14:23:08 -07:00
ZappoMan
8dc61d89fc
Added support for "destructive" vs "non-destructive" voxel create
...
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
2013-05-14 14:19:31 -07:00
ZappoMan
4e92f5d3d8
tweaks to delta sending
2013-05-14 12:11:32 -07:00
ZappoMan
fa37b88fa8
first cut at delta view frustum encoding
2013-05-14 09:02:01 -07:00
ZappoMan
dd4303800d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-13 13:15:02 -07:00
ZappoMan
777dd6dc53
Added PointerStack class, and implemented support for monochrome in VoxelTree
2013-05-13 09:57:36 -07:00
Andrzej Kapolka
750843e867
More editing progress. Now there are threading issues. Joy!
2013-05-10 21:02:08 -07:00
Andrzej Kapolka
f0573e6ee5
When we add (or recolor) a voxel, make sure it has no children. When we
...
attempt to remove a voxel that would be a child of a larger solid one, carve
up the parent.
2013-05-10 17:31:55 -07:00
Andrzej Kapolka
501aac39da
Use isColored, not getShouldRender.
2013-05-10 10:46:04 -07:00
Andrzej Kapolka
f6fcdd78b2
Adding/removing voxels at different sizes.
2013-05-10 09:53:53 -07:00
Andrzej Kapolka
7ff8b84f4c
Return the box face, as well as the distance, from the ray intersection test.
...
Use it to determine which voxel neighbor we create when adding.
2013-05-09 10:46:52 -07:00
ZappoMan
2f3a7f8ea8
use different voxel persist files for local or server mode
2013-05-08 12:19:27 -07:00
ZappoMan
e508c9fedc
removed a redundant comment
2013-05-08 10:04:06 -07:00
ZappoMan
cdf72711b5
cleaned up compiler warning
2013-05-08 02:15:10 -07:00
ZappoMan
7d6b28dd4d
Tweaks to createSphere() plus some new helper functions
...
- changed createSphere() to support new NATURAL mode which uses perlin
noise to create natural color and shape
- added getVoxelCount()
- coding standard cleanup
2013-05-08 01:02:55 -07:00
ZappoMan
d11e490b62
cleaned up code in createSphere()
2013-05-06 21:07:42 -07:00
ZappoMan
bccad01e0e
fixed CR issue
2013-05-06 16:47:31 -07:00
ZappoMan
cfbcc4418f
some cleanup pre CR
2013-05-06 16:34:34 -07:00
ZappoMan
37b165c8e9
some cleanup pre CR
2013-05-06 16:30:34 -07:00
ZappoMan
89226b18a5
switched getAABox() interface
2013-05-06 15:50:42 -07:00
ZappoMan
043a284d4d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 13:36:31 -07:00
Andrzej Kapolka
4d33c462fe
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/voxels/src/VoxelTree.h
2013-05-06 09:45:57 -07:00
ZappoMan
2c8c6a2600
Coding standard cleanup and VoxelNode optimization
...
- make octalCode and children members private
- add public getters for accessing these private members
- change constructor to require an OctalCode for all non-roots
- default constructor constructs a rootNode
- make primary access for deleting, adding, and accessing children through public methods that do bookkeeping
- calculate AABox on voxel creation so that we don't need to do all the math when we deal with voxels
- added methods on VoxelNode for common items like getCorner(), getCenter(), getLevel(), etc
2013-05-05 10:17:02 -07:00
ZappoMan
34982227e4
removed color reaveraging from readNodeData() because server will already send averages
2013-05-04 21:58:16 -07:00
ZappoMan
6a32424fb2
make readFromFileV2() return bool for file exists
2013-05-04 09:41:10 -07:00
ZappoMan
c1847a7511
set dirty bit on tree in a couple new places
2013-05-04 09:19:46 -07:00
Andrzej Kapolka
34565a4956
Pointers to references for in/out parameters, renamed line parameter to more
...
descriptive "distance."
2013-05-04 07:56:30 -07:00
Andrzej Kapolka
ff4e21e504
Remaining pick bits.
2013-05-03 20:12:46 -07:00
ZappoMan
2c128fd813
added voxel-edit tool, as well as made voxel file read/write work, disabled voxel persist on server shutdown
2013-05-03 19:19:48 -07:00
Andrzej Kapolka
f8cbe34e07
Added basic ray intersection testing to VoxelTree.
2013-05-03 17:27:57 -07:00
ZappoMan
e3164b3976
added read/write voxel files
2013-05-03 17:09:43 -07:00
ZappoMan
f4099349e8
change to encodeTreeBitstreamRecursion() to allow calling without viewFrustum
2013-05-03 15:13:00 -07:00
ZappoMan
1366794bdc
added some tree methods for primitive voxel editing
2013-05-03 15:00:03 -07:00
ZappoMan
e9d556419f
got rid of some dead code
2013-05-03 14:39:00 -07:00
