Andrzej Kapolka
63aeb4df75
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-08-06 16:28:14 -07:00
Andrzej Kapolka
720ae561df
Working on support for a textured face mode that doesn't rely on the video
...
stream.
2013-08-06 13:27:54 -07:00
ZappoMan
14b7f58fef
Kills local voxels if voxel server is removed from NodeList
...
- added notification hooks to NodeList
- implemented hooks in VoxelSystem to kill local voxels when
voxel server is killed
2013-08-05 13:47:18 -07:00
ZappoMan
edfd5cd543
fixed disappearing voxel bug
2013-08-05 09:45:00 -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
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
97aaa738c3
fixed typo
2013-07-29 13:07:12 -07:00
ZappoMan
4cca7e2572
Fixed issue with freeing up abandoned VBO slots when not moving with animation
2013-07-26 11:44:19 -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
Stephen Birarda
4ed231670f
put back the missing voxels
2013-07-11 10:04:27 -07:00
ZappoMan
1831cc0de3
removed level param from recursion
2013-07-10 17:06:22 -07:00
ZappoMan
44357fcfb9
add 'level' param to tree recursion
2013-07-09 13:17:21 -07:00
ZappoMan
c0d14d2bd4
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-03 15:36:41 -07:00
Stephen Birarda
36c6912de8
your agents are now nodes
2013-07-03 10:35:09 -07:00
ZappoMan
73ad854235
latest version of quadtree coverage map
2013-06-28 22:05:32 -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
e2d22a8e21
latest cut at occlusion culling
2013-06-12 01:16:46 -07:00
ZappoMan
ac7fbc6320
added occlusion tests to debug menu
2013-06-11 13:29:01 -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
Andrzej Kapolka
bc8eadd526
More work on voxeltars; separated default pose from bind pose.
2013-06-04 10:22:58 -07:00
ZappoMan
4f3872c18f
CR feedback
2013-06-04 01:13:58 -07:00
Andrzej Kapolka
8d757e148f
More work on voxeltars; basic skinning works.
2013-06-02 19:55:51 -07:00
Andrzej Kapolka
6c975f9c6f
More work on avatar voxels.
2013-06-01 15:06:29 -07:00
Andrzej Kapolka
7425b39237
Working on avatar voxel system.
2013-05-31 17:55:30 -07:00
Andrzej Kapolka
e4bc7af6b4
Working on avatar voxels.
2013-05-31 14:52:29 -07:00
ZappoMan
46c6f2f9b5
latest copy paste
2013-05-29 15:02:28 -07:00
ZappoMan
d1d2e75143
first cut at export and import of voxels
2013-05-28 19:00:02 -07:00
ZappoMan
f6863081f9
Fix Delta Sending mode by not culling out of view voxels until we STOP moving
...
- added isViewChanging() which determines if the view is currently changing
- made hasViewChanged() report false UNTIL we've stopped moving
- changed setupNewVoxelsForDrawing() to only call removeOutOfView() if we're not moving
2013-05-25 15:29:23 -07:00
ZappoMan
0bcd629c8a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-21 13:46:04 -07:00
Andrzej Kapolka
597769a861
Added basic capsule/sphere collisions between avatar and voxels.
2013-05-21 12:58:02 -07:00
ZappoMan
4f9c7fed59
removed UI for want exists bits, defaults to true
2013-05-21 11:25:50 -07:00
ZappoMan
e1c89aac87
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-20 15:52:04 -07:00
Andrzej Kapolka
06c78c2f12
Tweak: let the reader know when it needs to load the full VBO.
2013-05-20 15:41:19 -07:00
Andrzej Kapolka
8d522cd3ed
I believe the problem with voxel rendering is caused by the update thread's
...
writing the data while the render thread is attempting to read it. This
should fix the issue.
2013-05-20 15:15:44 -07:00
ZappoMan
321d1952d6
first cut at exists bits
2013-05-20 12:56:59 -07:00
Andrzej Kapolka
3f0fd2f976
Added toggle for voxel textures; they may be slowing some machines down.
2013-05-20 12:13:23 -07:00
Stephen Birarda
fc0448a148
disallow copying of VoxelSystem objects
2013-05-17 12:32:42 -07:00
Andrzej Kapolka
86ddcea87f
Better names for the shaders.
2013-05-16 13:08:21 -07:00
Andrzej Kapolka
0a6b4702c6
Experimenting with simple Perlin noise shader for voxels.
2013-05-15 22:18:56 -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
Andrzej Kapolka
9802403749
Let's do some locking to prevent simultaneous access from different threads.
2013-05-11 15:38:49 -07:00
ZappoMan
322cb2ff23
implemented partial VBOs support in copyWrittenDataToReadArrays()
2013-05-10 13:18:51 -07:00
ZappoMan
bd3ea6ef65
create and delete voxels locally
2013-05-09 22:20:13 -07:00
ZappoMan
2128cb8bff
get rid of dead code
2013-05-09 17:10:25 -07:00
ZappoMan
33fc9f5389
fixed partial VBO updates
2013-05-09 17:01:20 -07:00
ZappoMan
c73d4ddfa4
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 14:06:42 -07:00
ZappoMan
f490f3ed53
More work on partial VBO updates still not working 100% correctly
2013-05-09 14:04:08 -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
655f14121d
Voxel Render Optimization - using blended VBO update strategy
...
- Fixed a bug in updateNodeInArraysAsFullVBO() that caused blended strategy
to not work properly.
- Implement strategy to usually update only the portion of the VBOs that
have changed, unless nodes have been removed, and then update the full
VBO. This siginificantly improves treeToArrays() performance
- Still to do implement partial strategy for copy buffers and update GPU
2013-05-09 10:25:12 -07:00
Andrzej Kapolka
0cff127082
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 09:56:58 -07:00