From 633f358319f5cc0ec5c680ed9c5decfaed0c149d Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sun, 2 Mar 2014 17:03:57 -0800 Subject: [PATCH] removed some dead code --- interface/src/VoxelSystem.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index 09b0be6d43..512ff1c065 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -109,18 +109,24 @@ protected: void setupNewVoxelsForDrawing(); static const bool DONT_BAIL_EARLY; // by default we will bail early, if you want to force not bailing, then use this void setupNewVoxelsForDrawingSingleNode(bool allowBailEarly = true); + + /// called on the hide/show thread to hide any out of view voxels and show any newly in view voxels. void checkForCulling(); + + /// single pass to remove old VBO data and fill it with correct current view, used when switching LOD or needing to force + /// a full redraw of everything in view void recreateVoxelGeometryInView(); glm::vec3 computeVoxelVertex(const glm::vec3& startVertex, float voxelScale, int index) const; - virtual void updateArraysDetails(glBufferIndex nodeIndex, const glm::vec3& startVertex, float voxelScale, const nodeColor& color); virtual void copyWrittenDataSegmentToReadArrays(glBufferIndex segmentStart, glBufferIndex segmentEnd); virtual void updateVBOSegment(glBufferIndex segmentStart, glBufferIndex segmentEnd); - virtual void applyScaleAndBindProgram(bool texture); - virtual void removeScaleAndReleaseProgram(bool texture); + + + virtual void applyScaleAndBindProgram(bool texture); /// used in render() to apply shadows and textures + virtual void removeScaleAndReleaseProgram(bool texture); /// stop the shaders for shadows and textures private: // disallow copying of VoxelSystem objects