History

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

ZappoMan committed 13 years ago

Commit c0d14d22 parents e4579fe 1c143f449 files · +1825 −1667Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+1−1
@@ -48,7 +48,7 @@ GLubyte identityIndices[] = { 0,2,1, 0,3,2, // Z- · 47 unmodified lines
48 4,5,6, 4,6,7 }; // Z+48 4,5,6, 4,6,7 }; // Z+
49 49
50VoxelSystem::VoxelSystem(float treeScale, int maxVoxels) :50VoxelSystem::VoxelSystem(float treeScale, int maxVoxels) :
51 AgentData(NULL), _treeScale(treeScale), _maxVoxels(maxVoxels) {51 NodeData(NULL), _treeScale(treeScale), _maxVoxels(maxVoxels) {
52 _voxelsInReadArrays = _voxelsInWriteArrays = _voxelsUpdated = 0;52 _voxelsInReadArrays = _voxelsInWriteArrays = _voxelsUpdated = 0;
53 _writeRenderFullVBO = true;53 _writeRenderFullVBO = true;
54 _readRenderFullVBO = true;54 _readRenderFullVBO = true;