From 42fe3ce07774e203c983f5272ebae04c6d6caac8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 15 Mar 2013 12:27:00 -0700 Subject: [PATCH] remove unused methods from VoxelSystem --- interface/src/VoxelSystem.cpp | 2 +- interface/src/VoxelSystem.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 42a01e62f0..1bb02b3ce8 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -8,7 +8,7 @@ #include "VoxelSystem.h" #include -#include g +#include const int MAX_VOXELS_PER_SYSTEM = 500000; diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index f18a104e99..ed6359f1bc 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -19,11 +19,6 @@ const int NUM_CHILDREN = 8; -struct Voxel { - glm::vec3 color; - Voxel * children[NUM_CHILDREN]; -}; - class VoxelSystem : public AgentData { public: VoxelSystem(); @@ -34,12 +29,9 @@ public: void init(); void simulate(float deltaTime); - int render(Voxel * voxel, float scale, glm::vec3 * distance); void render(); - int initVoxels(Voxel * root, float scale, glm::vec3 * position); void setVoxelsRendered(int v) {voxelsRendered = v;}; int getVoxelsRendered() {return voxelsRendered;}; - Voxel * root; private: int voxelsRendered; GLfloat *verticesArray;