From 15a3a8d252e95499f8efe57b5d81c98fc90e818a Mon Sep 17 00:00:00 2001 From: atlante45 Date: Tue, 3 Sep 2013 10:32:38 -0700 Subject: [PATCH] Some more code reformatting. --- interface/src/VoxelSystem.h | 6 +++--- libraries/voxels/src/ViewFrustum.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index 48204295ef..189d19f866 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -34,13 +34,13 @@ public: VoxelSystem(float treeScale = TREE_SCALE, int maxVoxels = MAX_VOXELS_PER_SYSTEM); ~VoxelSystem(); - void setDataSourceID(int dataSourceID) { _dataSourceID = dataSourceID; }; - int getDataSourceID() const { return _dataSourceID; }; + void setDataSourceID(int dataSourceID) { _dataSourceID = dataSourceID; } + int getDataSourceID() const { return _dataSourceID; } int parseData(unsigned char* sourceBuffer, int numBytes); virtual void init(); - void simulate(float deltaTime) { }; + void simulate(float deltaTime) { } void render(bool texture); void changeTree(VoxelTree* newTree); diff --git a/libraries/voxels/src/ViewFrustum.h b/libraries/voxels/src/ViewFrustum.h index aea81f7b7a..22830cb48d 100644 --- a/libraries/voxels/src/ViewFrustum.h +++ b/libraries/voxels/src/ViewFrustum.h @@ -81,7 +81,7 @@ public: // some frustum comparisons bool matches(const ViewFrustum& compareTo, bool debug = false) const; - bool matches(const ViewFrustum* compareTo, bool debug = false) const { return matches(*compareTo, debug); }; + bool matches(const ViewFrustum* compareTo, bool debug = false) const { return matches(*compareTo, debug); } void computePickRay(float x, float y, glm::vec3& origin, glm::vec3& direction) const;