From d08f94a74d09368bb19a7b4f5fe56f88d74f5e98 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 8 Jan 2018 13:19:54 -0800 Subject: [PATCH] Code review feedback * Removed AnimPose::fuzzyEqual * Fixed DualQuaternion ctor --- libraries/animation/src/AnimPose.cpp | 21 --------------------- libraries/animation/src/AnimPose.h | 2 -- libraries/shared/src/DualQuaternion.cpp | 2 +- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/libraries/animation/src/AnimPose.cpp b/libraries/animation/src/AnimPose.cpp index 29c4c46d6e..a0b8fba1da 100644 --- a/libraries/animation/src/AnimPose.cpp +++ b/libraries/animation/src/AnimPose.cpp @@ -69,27 +69,6 @@ AnimPose AnimPose::mirror() const { return AnimPose(_scale, glm::quat(_rot.w, _rot.x, -_rot.y, -_rot.z), glm::vec3(-_trans.x, _trans.y, _trans.z)); } -bool AnimPose::fuzzyEqual(const AnimPose& rhs) const { - const float SCALE_EPSILON = 0.00001f; - const float ROT_EPSILON = 0.00001f; - const float TRANS_EPSILON = 0.001f; - if ((fabsf(rhs._scale.x - _scale.x) < SCALE_EPSILON) && - (fabsf(rhs._scale.y - _scale.y) < SCALE_EPSILON) && - (fabsf(rhs._scale.z - _scale.z) < SCALE_EPSILON)) { - if ((fabsf(rhs._rot.x - _rot.x) < ROT_EPSILON) && - (fabsf(rhs._rot.y - _rot.y) < ROT_EPSILON) && - (fabsf(rhs._rot.z - _rot.z) < ROT_EPSILON) && - (fabsf(rhs._rot.w - _rot.w) < ROT_EPSILON)) { - if ((fabsf(rhs._trans.x - _trans.x) < TRANS_EPSILON) && - (fabsf(rhs._trans.y - _trans.y) < TRANS_EPSILON) && - (fabsf(rhs._trans.z - _trans.z) < TRANS_EPSILON)) { - return true; - } - } - } - return false; -} - AnimPose::operator glm::mat4() const { glm::vec3 xAxis = _rot * glm::vec3(_scale.x, 0.0f, 0.0f); glm::vec3 yAxis = _rot * glm::vec3(0.0f, _scale.y, 0.0f); diff --git a/libraries/animation/src/AnimPose.h b/libraries/animation/src/AnimPose.h index 0f29bac7ce..2df3d1f2e4 100644 --- a/libraries/animation/src/AnimPose.h +++ b/libraries/animation/src/AnimPose.h @@ -46,8 +46,6 @@ public: const glm::vec3& trans() const { return _trans; } glm::vec3& trans() { return _trans; } - bool fuzzyEqual(const AnimPose& rhs) const; - private: friend QDebug operator<<(QDebug debug, const AnimPose& pose); glm::vec3 _scale { 1.0f }; diff --git a/libraries/shared/src/DualQuaternion.cpp b/libraries/shared/src/DualQuaternion.cpp index e2a9dc9bb2..03628f8aba 100644 --- a/libraries/shared/src/DualQuaternion.cpp +++ b/libraries/shared/src/DualQuaternion.cpp @@ -28,7 +28,7 @@ DualQuaternion::DualQuaternion(const glm::vec4& real, const glm::vec4& imag) : DualQuaternion::DualQuaternion(const glm::quat& rotation, const glm::vec3& translation) { _real = rotation; - _imag = glm::quat(0, 0.5f * translation.x, 0.5f * translation.y, 0.5f * translation.z) * rotation; + _imag = glm::quat(0.0f, 0.5f * translation.x, 0.5f * translation.y, 0.5f * translation.z) * rotation; } DualQuaternion DualQuaternion::operator*(const DualQuaternion& rhs) const {