History

Merge branch 'master' of https://github.com/worklist/hifi

Philip Rosedale committed 12 years ago

Commit a4f13e82 parents 7e1ea13 e538b4c216 files · +82 −89040Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 216 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+9−13
@@ -921,19 +921,15 @@ int VoxelSystem::newTreeToArrays(VoxelTreeElement* voxel) { · 920 unmodified lines
921 }921 }
922 }922 }
923 923
924 // for either voxels that should not render, or those that should render and are in view924 // update their geometry in the array. depending on our over all mode (fullVBO or not) we will reuse or not reuse the index
925 // update their geometry in the array.if the voxel "should render" but is not in view, then925 if (_writeRenderFullVBO) {
926 // it actually doesn't need to be rendered926 const bool DONT_REUSE_INDEX = false;
927 if (!shouldRender || voxel->isInView(*_viewFrustum)) {927 const bool FORCE_REDRAW = true;
928 if (_writeRenderFullVBO) {928 voxelsUpdated += updateNodeInArrays(voxel, DONT_REUSE_INDEX, FORCE_REDRAW);
929 const bool DONT_REUSE_INDEX = false;929 } else {
930 const bool FORCE_REDRAW = true;930 const bool REUSE_INDEX = true;
931 voxelsUpdated += updateNodeInArrays(voxel, DONT_REUSE_INDEX, FORCE_REDRAW);931 const bool DONT_FORCE_REDRAW = false;
932 } else {932 voxelsUpdated += updateNodeInArrays(voxel, REUSE_INDEX, DONT_FORCE_REDRAW);
933 const bool REUSE_INDEX = true;
934 const bool DONT_FORCE_REDRAW = false;
935 voxelsUpdated += updateNodeInArrays(voxel, REUSE_INDEX, DONT_FORCE_REDRAW);
936 }
937 }933 }
938 voxel->clearDirtyBit(); // clear the dirty bit, do this before we potentially delete things.934 voxel->clearDirtyBit(); // clear the dirty bit, do this before we potentially delete things.
939 935