From a423d3c38fdffd7a986e02e787b8d9bc7f725526 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 24 Apr 2013 13:49:24 -0700 Subject: [PATCH 1/3] more const repairs in AvatarData --- libraries/avatars/src/AvatarData.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 06d6f43287..4f08d12d41 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -39,9 +39,9 @@ public: void setHeadPitch(float p) {_headPitch = p; } void setHeadYaw(float y) {_headYaw = y; } void setHeadRoll(float r) {_headRoll = r; }; - const float getHeadPitch() const { return _headPitch; }; - const float getHeadYaw() const { return _headYaw; }; - const float getHeadRoll() const { return _headRoll; }; + float getHeadPitch() const { return _headPitch; }; + float getHeadYaw() const { return _headYaw; }; + float getHeadRoll() const { return _headRoll; }; void addHeadPitch(float p) {_headPitch -= p; } void addHeadYaw(float y){_headYaw -= y; } void addHeadRoll(float r){_headRoll += r; } @@ -55,14 +55,14 @@ public: float getLoudness() const {return _audioLoudness; }; // getters for camera details - const glm::vec3& getCameraPosition() const { return _cameraPosition; }; - const glm::vec3& getCameraDirection() const { return _cameraDirection; } - const glm::vec3& getCameraUp() const { return _cameraUp; } - const glm::vec3& getCameraRight() const { return _cameraRight; } - float getCameraFov() const { return _cameraFov; } - float getCameraAspectRatio() const { return _cameraAspectRatio; } - float getCameraNearClip() const { return _cameraNearClip; } - float getCameraFarClip() const { return _cameraFarClip; } + glm::vec3 getCameraPosition() const { return _cameraPosition; }; + glm::vec3 getCameraDirection() const { return _cameraDirection; } + glm::vec3 getCameraUp() const { return _cameraUp; } + glm::vec3 getCameraRight() const { return _cameraRight; } + float getCameraFov() const { return _cameraFov; } + float getCameraAspectRatio() const { return _cameraAspectRatio; } + float getCameraNearClip() const { return _cameraNearClip; } + float getCameraFarClip() const { return _cameraFarClip; } // setters for camera details void setCameraPosition(const glm::vec3& position) { _cameraPosition = position; }; From 461ca6ecb42c91e6756007a10e5362521ac07261 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 24 Apr 2013 13:51:27 -0700 Subject: [PATCH 2/3] revert some of the const changes that make sense --- libraries/avatars/src/AvatarData.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 4f08d12d41..05f40b825a 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -55,10 +55,10 @@ public: float getLoudness() const {return _audioLoudness; }; // getters for camera details - glm::vec3 getCameraPosition() const { return _cameraPosition; }; - glm::vec3 getCameraDirection() const { return _cameraDirection; } - glm::vec3 getCameraUp() const { return _cameraUp; } - glm::vec3 getCameraRight() const { return _cameraRight; } + const glm::vec3& getCameraPosition() const { return _cameraPosition; }; + const glm::vec3& getCameraDirection() const { return _cameraDirection; } + const glm::vec3& getCameraUp() const { return _cameraUp; } + const glm::vec3& getCameraRight() const { return _cameraRight; } float getCameraFov() const { return _cameraFov; } float getCameraAspectRatio() const { return _cameraAspectRatio; } float getCameraNearClip() const { return _cameraNearClip; } From 87386cb05a55217931cefb37ca9937bd6490a0d0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 24 Apr 2013 13:54:35 -0700 Subject: [PATCH 3/3] line the consts back up in AvatarData --- libraries/avatars/src/AvatarData.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 05f40b825a..cb2171cbe5 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -59,10 +59,10 @@ public: const glm::vec3& getCameraDirection() const { return _cameraDirection; } const glm::vec3& getCameraUp() const { return _cameraUp; } const glm::vec3& getCameraRight() const { return _cameraRight; } - float getCameraFov() const { return _cameraFov; } - float getCameraAspectRatio() const { return _cameraAspectRatio; } - float getCameraNearClip() const { return _cameraNearClip; } - float getCameraFarClip() const { return _cameraFarClip; } + float getCameraFov() const { return _cameraFov; } + float getCameraAspectRatio() const { return _cameraAspectRatio; } + float getCameraNearClip() const { return _cameraNearClip; } + float getCameraFarClip() const { return _cameraFarClip; } // setters for camera details void setCameraPosition(const glm::vec3& position) { _cameraPosition = position; };