From 26691118de431585757f1e295c093f40d2131df4 Mon Sep 17 00:00:00 2001 From: atlante45 Date: Tue, 3 Sep 2013 10:30:46 -0700 Subject: [PATCH] Some code reformatting. --- interface/src/ImportDialog.cpp | 2 +- interface/src/VoxelSystem.h | 10 ++--- libraries/voxels/src/ViewFrustum.h | 66 +++++++++++++++--------------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/interface/src/ImportDialog.cpp b/interface/src/ImportDialog.cpp index beda8977cd..eea090dfbd 100644 --- a/interface/src/ImportDialog.cpp +++ b/interface/src/ImportDialog.cpp @@ -195,7 +195,7 @@ ImportDialog::~ImportDialog() { void ImportDialog::init() { VoxelSystem* voxelSystem = Application::getInstance()->getSharedVoxelSystem(); - connect(voxelSystem, SIGNAL(importSize(float,float,float)), SLOT(setGLCamera(float, float, float))); + connect(voxelSystem, SIGNAL(importSize(float,float,float)), SLOT(setGLCamera(float,float,float))); connect(voxelSystem, SIGNAL(importProgress(int)), &_previewBar, SLOT(setValue(int))); } diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index ed635dae3f..48204295ef 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -44,11 +44,11 @@ public: void render(bool texture); void changeTree(VoxelTree* newTree); - VoxelTree* getTree() const {return _tree;} - ViewFrustum* getViewFrustum() const {return _viewFrustum;} - void setViewFrustum(ViewFrustum* viewFrustum) {_viewFrustum = viewFrustum;} - unsigned long getVoxelsUpdated() const {return _voxelsUpdated;}; - unsigned long getVoxelsRendered() const {return _voxelsInReadArrays;}; + VoxelTree* getTree() const { return _tree; } + ViewFrustum* getViewFrustum() const { return _viewFrustum; } + void setViewFrustum(ViewFrustum* viewFrustum) { _viewFrustum = viewFrustum; } + unsigned long getVoxelsUpdated() const { return _voxelsUpdated; } + unsigned long getVoxelsRendered() const { return _voxelsInReadArrays; } void loadVoxelsFile(const char* fileName,bool wantColorRandomizer); void writeToSVOFile(const char* filename, VoxelNode* node) const; diff --git a/libraries/voxels/src/ViewFrustum.h b/libraries/voxels/src/ViewFrustum.h index 188b85c0de..aea81f7b7a 100644 --- a/libraries/voxels/src/ViewFrustum.h +++ b/libraries/voxels/src/ViewFrustum.h @@ -24,50 +24,50 @@ const float DEFAULT_KEYHOLE_RADIUS = 3.0f; class ViewFrustum { public: // setters for camera attributes - void setPosition (const glm::vec3& p) { _position = p; }; - void setOrientation (const glm::quat& orientationAsQuaternion); + void setPosition(const glm::vec3& p) { _position = p; } + void setOrientation(const glm::quat& orientationAsQuaternion); // getters for camera attributes - const glm::vec3& getPosition() const { return _position; }; - const glm::quat& getOrientation() const { return _orientation; }; - const glm::vec3& getDirection() const { return _direction; }; - const glm::vec3& getUp() const { return _up; }; - const glm::vec3& getRight() const { return _right; }; + const glm::vec3& getPosition() const { return _position; } + const glm::quat& getOrientation() const { return _orientation; } + const glm::vec3& getDirection() const { return _direction; } + const glm::vec3& getUp() const { return _up; } + const glm::vec3& getRight() const { return _right; } // setters for lens attributes - void setFieldOfView ( float f ) { _fieldOfView = f; }; - void setAspectRatio ( float a ) { _aspectRatio = a; }; - void setNearClip ( float n ) { _nearClip = n; }; - void setFarClip ( float f ) { _farClip = f; }; - void setEyeOffsetPosition (const glm::vec3& p) { _eyeOffsetPosition = p; }; - void setEyeOffsetOrientation (const glm::quat& o) { _eyeOffsetOrientation = o; }; + void setFieldOfView(float f) { _fieldOfView = f; } + void setAspectRatio(float a) { _aspectRatio = a; } + void setNearClip(float n) { _nearClip = n; } + void setFarClip(float f) { _farClip = f; } + void setEyeOffsetPosition(const glm::vec3& p) { _eyeOffsetPosition = p; } + void setEyeOffsetOrientation(const glm::quat& o) { _eyeOffsetOrientation = o; } // getters for lens attributes - float getFieldOfView() const { return _fieldOfView; }; - float getAspectRatio() const { return _aspectRatio; }; - float getNearClip() const { return _nearClip; }; - float getFarClip() const { return _farClip; }; - const glm::vec3& getEyeOffsetPosition() const { return _eyeOffsetPosition; }; - const glm::quat& getEyeOffsetOrientation() const { return _eyeOffsetOrientation;}; + float getFieldOfView() const { return _fieldOfView; } + float getAspectRatio() const { return _aspectRatio; } + float getNearClip() const { return _nearClip; } + float getFarClip() const { return _farClip; } + const glm::vec3& getEyeOffsetPosition() const { return _eyeOffsetPosition; } + const glm::quat& getEyeOffsetOrientation() const { return _eyeOffsetOrientation; } - const glm::vec3& getOffsetPosition() const { return _offsetPosition; }; - const glm::vec3& getOffsetDirection() const { return _offsetDirection;}; - const glm::vec3& getOffsetUp() const { return _offsetUp; }; - const glm::vec3& getOffsetRight() const { return _offsetRight; }; + const glm::vec3& getOffsetPosition() const { return _offsetPosition; } + const glm::vec3& getOffsetDirection() const { return _offsetDirection; } + const glm::vec3& getOffsetUp() const { return _offsetUp; } + const glm::vec3& getOffsetRight() const { return _offsetRight; } - const glm::vec3& getFarTopLeft() const { return _farTopLeft; }; - const glm::vec3& getFarTopRight() const { return _farTopRight; }; - const glm::vec3& getFarBottomLeft() const { return _farBottomLeft; }; - const glm::vec3& getFarBottomRight() const { return _farBottomRight; }; + const glm::vec3& getFarTopLeft() const { return _farTopLeft; } + const glm::vec3& getFarTopRight() const { return _farTopRight; } + const glm::vec3& getFarBottomLeft() const { return _farBottomLeft; } + const glm::vec3& getFarBottomRight() const { return _farBottomRight; } - const glm::vec3& getNearTopLeft() const { return _nearTopLeft; }; - const glm::vec3& getNearTopRight() const { return _nearTopRight; }; - const glm::vec3& getNearBottomLeft() const { return _nearBottomLeft; }; - const glm::vec3& getNearBottomRight() const { return _nearBottomRight;}; + const glm::vec3& getNearTopLeft() const { return _nearTopLeft; } + const glm::vec3& getNearTopRight() const { return _nearTopRight; } + const glm::vec3& getNearBottomLeft() const { return _nearBottomLeft; } + const glm::vec3& getNearBottomRight() const { return _nearBottomRight; } // get/set for keyhole attribute - void setKeyholeRadius(float keyholdRadius) { _keyholeRadius = keyholdRadius; }; - float getKeyholeRadius() const { return _keyholeRadius; }; + void setKeyholeRadius(float keyholdRadius) { _keyholeRadius = keyholdRadius; } + float getKeyholeRadius() const { return _keyholeRadius; } void calculate();