From 7b90d71205c2da5582514115039dec0e50326779 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 28 Dec 2016 12:59:56 -0800 Subject: [PATCH] Fix build --- assignment-client/src/avatars/ScriptableAvatar.cpp | 6 +++--- libraries/animation/src/AnimPose.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp index 15877eed25..b4c9a8e89d 100644 --- a/assignment-client/src/avatars/ScriptableAvatar.cpp +++ b/assignment-client/src/avatars/ScriptableAvatar.cpp @@ -89,7 +89,7 @@ void ScriptableAvatar::update(float deltatime) { int mapping = _bind->getGeometry().getJointIndex(name); if (mapping != -1 && !_maskedJoints.contains(name)) { // Eventually, this should probably deal with post rotations and translations, too. - poses[mapping].rot = modelJoints[mapping].preRotation * + poses[mapping].rot() = modelJoints[mapping].preRotation * safeMix(floorFrame.rotations.at(i), ceilFrame.rotations.at(i), frameFraction);; } } @@ -97,8 +97,8 @@ void ScriptableAvatar::update(float deltatime) { for (int i = 0; i < nJoints; i++) { JointData& data = _jointData[i]; AnimPose& pose = poses[i]; - if (data.rotation != pose.rot) { - data.rotation = pose.rot; + if (data.rotation != pose.rot()) { + data.rotation = pose.rot(); data.rotationSet = true; } } diff --git a/libraries/animation/src/AnimPose.cpp b/libraries/animation/src/AnimPose.cpp index 26a16e2457..209a07f479 100644 --- a/libraries/animation/src/AnimPose.cpp +++ b/libraries/animation/src/AnimPose.cpp @@ -26,7 +26,7 @@ AnimPose::AnimPose(const glm::mat4& mat) : _dirty(false) { _rot = glm::quat_cast(tmp); float lengthSquared = glm::length2(_rot); if (glm::abs(lengthSquared - 1.0f) > EPSILON) { - float oneOverLength = 1.0f / sqrt(lengthSquared); + float oneOverLength = 1.0f / sqrtf(lengthSquared); _rot = glm::quat(_rot.w * oneOverLength, _rot.x * oneOverLength, _rot.y * oneOverLength, _rot.z * oneOverLength); } _trans = extractTranslation(mat);