From fff4e3e831ef29114a97b62a3c38c55e4e5b3001 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 6 Dec 2015 12:01:30 -0800 Subject: [PATCH] make SpatiallyNestable setters take values by reference --- interface/src/avatar/Avatar.cpp | 4 ++-- interface/src/avatar/Avatar.h | 4 ++-- libraries/avatars/src/AvatarData.cpp | 4 ++-- libraries/avatars/src/AvatarData.h | 4 ++-- libraries/shared/src/SpatiallyNestable.cpp | 18 +++++++++--------- libraries/shared/src/SpatiallyNestable.h | 18 +++++++++--------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 29423f4d79..62ec4de1b2 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -1157,12 +1157,12 @@ glm::quat Avatar::getRightPalmRotation() { return rightRotation; } -void Avatar::setPosition(const glm::vec3 position) { +void Avatar::setPosition(const glm::vec3& position) { AvatarData::setPosition(position); updateAttitude(); } -void Avatar::setOrientation(const glm::quat orientation) { +void Avatar::setOrientation(const glm::quat& orientation) { AvatarData::setOrientation(orientation); updateAttitude(); } diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index 3f8b955b6c..e2eeab2c3d 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -158,8 +158,8 @@ public: void setMotionState(AvatarMotionState* motionState) { _motionState = motionState; } AvatarMotionState* getMotionState() { return _motionState; } - virtual void setPosition(glm::vec3 position); - virtual void setOrientation(glm::quat orientation); + virtual void setPosition(const glm::vec3& position); + virtual void setOrientation(const glm::quat& orientation); public slots: diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 76575909aa..fe03fb09cd 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1626,10 +1626,10 @@ void AvatarData::setBodyRoll(float bodyRoll) { setOrientation(glm::quat(glm::radians(eulerAngles))); } -void AvatarData::setPosition(const glm::vec3 position) { +void AvatarData::setPosition(const glm::vec3& position) { SpatiallyNestable::setPosition(position); } -void AvatarData::setOrientation(const glm::quat orientation) { +void AvatarData::setOrientation(const glm::quat& orientation) { SpatiallyNestable::setOrientation(orientation); } diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 8419ce2154..0db259ceda 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -201,8 +201,8 @@ public: float getBodyRoll() const; void setBodyRoll(float bodyRoll); - virtual void setPosition(glm::vec3 position); - virtual void setOrientation(glm::quat orientation); + virtual void setPosition(const glm::vec3& position); + virtual void setOrientation(const glm::quat& orientation); void nextAttitude(glm::vec3 position, glm::quat orientation); // Can be safely called at any time. void startCapture(); // start/end of the period in which the latest values are about to be captured for camera, etc. diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp index 7d61442ad1..77b5f57bfb 100644 --- a/libraries/shared/src/SpatiallyNestable.cpp +++ b/libraries/shared/src/SpatiallyNestable.cpp @@ -91,7 +91,7 @@ void SpatiallyNestable::forgetChild(SpatiallyNestablePointer newChild) const { }); } -void SpatiallyNestable::setParentID(const QUuid parentID) { +void SpatiallyNestable::setParentID(const QUuid& parentID) { if (_parentID != parentID) { _parentID = parentID; _parentKnowsMe = false; @@ -188,7 +188,7 @@ glm::vec3 SpatiallyNestable::getPosition(int jointIndex) const { return getTransform(jointIndex).getTranslation(); } -void SpatiallyNestable::setPosition(glm::vec3 position) { +void SpatiallyNestable::setPosition(const glm::vec3& position) { Transform parentTransform = getParentTransform(); Transform myWorldTransform; _transformLock.withWriteLock([&] { @@ -207,7 +207,7 @@ glm::quat SpatiallyNestable::getOrientation(int jointIndex) const { return getTransform(jointIndex).getRotation(); } -void SpatiallyNestable::setOrientation(glm::quat orientation) { +void SpatiallyNestable::setOrientation(const glm::quat& orientation) { Transform parentTransform = getParentTransform(); Transform myWorldTransform; _transformLock.withWriteLock([&] { @@ -238,7 +238,7 @@ const Transform SpatiallyNestable::getTransform(int jointIndex) const { return jointInWorldFrame; } -void SpatiallyNestable::setTransform(const Transform transform) { +void SpatiallyNestable::setTransform(const Transform& transform) { Transform parentTransform = getParentTransform(); _transformLock.withWriteLock([&] { Transform::inverseMult(_transform, parentTransform, transform); @@ -259,7 +259,7 @@ glm::vec3 SpatiallyNestable::getScale(int jointIndex) const { return getScale(); } -void SpatiallyNestable::setScale(glm::vec3 scale) { +void SpatiallyNestable::setScale(const glm::vec3& scale) { _transformLock.withWriteLock([&] { _transform.setScale(scale); }); @@ -274,7 +274,7 @@ const Transform SpatiallyNestable::getLocalTransform() const { return result; } -void SpatiallyNestable::setLocalTransform(const Transform transform) { +void SpatiallyNestable::setLocalTransform(const Transform& transform) { _transformLock.withWriteLock([&] { _transform = transform; }); @@ -289,7 +289,7 @@ glm::vec3 SpatiallyNestable::getLocalPosition() const { return result; } -void SpatiallyNestable::setLocalPosition(glm::vec3 position) { +void SpatiallyNestable::setLocalPosition(const glm::vec3& position) { _transformLock.withWriteLock([&] { _transform.setTranslation(position); }); @@ -304,7 +304,7 @@ glm::quat SpatiallyNestable::getLocalOrientation() const { return result; } -void SpatiallyNestable::setLocalOrientation(glm::quat orientation) { +void SpatiallyNestable::setLocalOrientation(const glm::quat& orientation) { _transformLock.withWriteLock([&] { _transform.setRotation(orientation); }); @@ -319,7 +319,7 @@ glm::vec3 SpatiallyNestable::getLocalScale() const { return result; } -void SpatiallyNestable::setLocalScale(glm::vec3 scale) { +void SpatiallyNestable::setLocalScale(const glm::vec3& scale) { _transformLock.withWriteLock([&] { _transform.setScale(scale); }); diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h index 0d3b00e0eb..dc1be54219 100644 --- a/libraries/shared/src/SpatiallyNestable.h +++ b/libraries/shared/src/SpatiallyNestable.h @@ -42,7 +42,7 @@ public: virtual void setID(const QUuid& id) { _id = id; } virtual const QUuid getParentID() const { return _parentID; } - virtual void setParentID(const QUuid parentID); + virtual void setParentID(const QUuid& parentID); virtual quint16 getParentJointIndex() const { return _parentJointIndex; } virtual void setParentJointIndex(quint16 parentJointIndex) { _parentJointIndex = parentJointIndex; } @@ -55,19 +55,19 @@ public: // world frame virtual const Transform getTransform() const; - virtual void setTransform(const Transform transform); + virtual void setTransform(const Transform& transform); virtual Transform getParentTransform() const; virtual glm::vec3 getPosition() const; - virtual void setPosition(glm::vec3 position); + virtual void setPosition(const glm::vec3& position); virtual glm::quat getOrientation() const; virtual glm::quat getOrientation(int jointIndex) const; - virtual void setOrientation(glm::quat orientation); + virtual void setOrientation(const glm::quat& orientation); virtual glm::vec3 getScale() const; - virtual void setScale(glm::vec3 scale); + virtual void setScale(const glm::vec3& scale); // get world-frame values for a specific joint virtual const Transform getTransform(int jointIndex) const; @@ -76,16 +76,16 @@ public: // object's parent's frame virtual const Transform getLocalTransform() const; - virtual void setLocalTransform(const Transform transform); + virtual void setLocalTransform(const Transform& transform); virtual glm::vec3 getLocalPosition() const; - virtual void setLocalPosition(glm::vec3 position); + virtual void setLocalPosition(const glm::vec3& position); virtual glm::quat getLocalOrientation() const; - virtual void setLocalOrientation(glm::quat orientation); + virtual void setLocalOrientation(const glm::quat& orientation); virtual glm::vec3 getLocalScale() const; - virtual void setLocalScale(glm::vec3 scale); + virtual void setLocalScale(const glm::vec3& scale); QList getChildren() const; NestableTypes::NestableType getNestableType() const { return _nestableType; }