ZappoMan
ef20b3e4b3
optimized performance of VoxelNode::isLeaf()
2013-05-10 14:32:44 -07:00
Andrzej Kapolka
501aac39da
Use isColored, not getShouldRender.
2013-05-10 10:46:04 -07:00
Andrzej Kapolka
e6e5b20dee
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-10 10:20:04 -07:00
ZappoMan
3af8a1b8f4
code review fixes
2013-05-10 10:03:28 -07:00
Andrzej Kapolka
beadb6a93d
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-05-10 10:03:05 -07:00
Andrzej Kapolka
f6fcdd78b2
Adding/removing voxels at different sizes.
2013-05-10 09:53:53 -07:00
ZappoMan
9dc09de75e
make VoxelSystem::deleteVoxelAt() work properly
2013-05-10 09:32:56 -07:00
Philip Rosedale
527b65f6a4
Log cleanup. removed star field meridians.
2013-05-09 22:06:32 -07:00
Philip Rosedale
cdab62c10c
Merge pull request #265 from ZappoMan/render_voxels_optimization
...
Optimized Voxel Rendering Performance by implementing blended VBO strategy
2013-05-09 17:21:05 -07:00
ZappoMan
33fc9f5389
fixed partial VBO updates
2013-05-09 17:01:20 -07:00
Philip Rosedale
c0a54eca14
Added head lean to broadcast data packets, lean now being set from invensense accelerometers.
2013-05-09 15:03:19 -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
Stephen Birarda
23f861f5e2
fixes per code review comments
2013-05-09 13:30:11 -07:00
Stephen Birarda
cd69297af2
some refactoring for member variables in AudioRingBuffer
2013-05-09 13:04:42 -07:00
Stephen Birarda
a8eb9187f1
underscore the sample length variables in AudioRingBuffer
2013-05-09 12:48:20 -07:00
ZappoMan
8ef78fde83
Merge pull request #259 from birarda/mixer-crash
...
fix the audio-mixer crash for uninitialized _shouldLoopbackForAgent variable
2013-05-09 11:49:42 -07:00
Stephen Birarda
a92571bdee
initialize the _shouldLoopbackForAgent variable
2013-05-09 11:45:59 -07:00
Stephen Birarda
d9a5bba1d1
remove the unhelpful stack trace setup, using gdb on server for now
2013-05-09 11:21:16 -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
a08d89a074
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 10:28:05 -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
Jeffrey Ventrella
bbd85664d6
Merge remote-tracking branch 'upstream/master'
2013-05-08 19:24:07 -07:00
Jeffrey Ventrella
7a24c50063
put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer
2013-05-08 19:22:21 -07:00
ZappoMan
244b4a17f7
lowered voxel count so Ryan can run, and handle too many voxels case slightly more gracefully than crashing
2013-05-08 18:06:13 -07:00
ZappoMan
5f55d511c5
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:01:50 -07:00
ZappoMan
ad67c363ec
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 14:27:37 -07:00
ZappoMan
66e416d4dd
added VoxelNode::inFrustum() which returns OUTSIDE, INTERSECT, INSIDE to allow more optimal frustum analysis
2013-05-08 14:23:36 -07:00
ZappoMan
24501e5c68
added contains() and remove() methods
2013-05-08 14:22:03 -07:00
Andrzej Kapolka
1c8b835bb8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 13:15:21 -07:00
ZappoMan
0b873dddc8
Merge pull request #244 from Ventrella/master
...
moved Orientation class to shared folder
2013-05-08 12:51:26 -07:00
ZappoMan
ed9a7ae900
Merge pull request #247 from ZappoMan/render_voxels_optimization
...
Use different voxel persist files for local or server mode
2013-05-08 12:22:03 -07:00
ZappoMan
2f3a7f8ea8
use different voxel persist files for local or server mode
2013-05-08 12:19:27 -07:00
Andrzej Kapolka
4ed7176ff6
Move the sun back up again to match the lighting.
2013-05-08 12:07:21 -07:00
ZappoMan
7a5ce57b4e
added alwaysDisplay mode to PerformanceWarnings class
2013-05-08 12:01:55 -07:00
Andrzej Kapolka
c34b6df2f4
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
voxel-server/src/main.cpp
2013-05-08 11:56:03 -07:00
Philip Rosedale
9dd2f2e589
Merge pull request #242 from ZappoMan/render_voxels_optimization
...
Fixed some bugs, and made better scenes
2013-05-08 10:34:54 -07:00
Andrzej Kapolka
310c0288c7
Changed atmosphere radius to 1000 meters.
2013-05-08 10:31:13 -07:00
ZappoMan
e508c9fedc
removed a redundant comment
2013-05-08 10:04:06 -07:00
ZappoMan
9a9656708c
CR cleanup
2013-05-08 10:03:05 -07:00
Andrzej Kapolka
8895cbeb6c
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 10:01:34 -07:00
Jeffrey Ventrella
9e60c8a36e
increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder
2013-05-08 08:59:29 -07:00
ZappoMan
bc55c09ed7
Added more SceneUtils support cleaned up voxel-edit to use scene utils
...
- Added addCornersAndAxisLines() scene
- Added addSurfaceScene() scene
- moved improved addSphereScene() from voxel-edit to SceneUtils.cpp
- added command line options to voxel-edit to create different scenes
2013-05-08 02:15:39 -07:00
ZappoMan
cdf72711b5
cleaned up compiler warning
2013-05-08 02:15:10 -07:00
ZappoMan
de969891d8
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 01:19:35 -07:00
ZappoMan
b459cbc8ea
Fixed a couple bugs in pointToVoxel()
...
- fixed a byte packing bug related to having exactly 7 bits of octal data
where we weren't correctly packing the last bit and moving the byte count
forward. This resulted in bogus colors being written
- fixed a bug for points that exactly match an octet boundary test creating
voxels that are one a unit smaller than they should be
2013-05-08 01:16:07 -07:00
ZappoMan
6f05403c0d
added SceneUtils.h/.cpp which moves addSphereScene() to a common location
2013-05-08 01:06: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
146334e4d7
dead code cleanup
2013-05-08 00:49:37 -07:00
ZappoMan
2cee643e7c
update TREE_SCALE to 128 so it's power of 2, and MAX_VOXELS_PER_SYSTEM to 500k
2013-05-08 00:47:42 -07:00
Jeffrey Ventrella
9d17df27bf
Merge remote-tracking branch 'upstream/master'
2013-05-07 18:33:21 -07:00