From ddeed8b4eeb0e6acfcc4c12d12d4fbc53db7d887 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Sep 2015 06:51:24 -0700 Subject: [PATCH] code review --- libraries/avatars/src/Recording.cpp | 9 ++++----- libraries/shared/src/GLMHelpers.cpp | 2 +- libraries/shared/src/GLMHelpers.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libraries/avatars/src/Recording.cpp b/libraries/avatars/src/Recording.cpp index 2c87485d01..5514b97b6f 100644 --- a/libraries/avatars/src/Recording.cpp +++ b/libraries/avatars/src/Recording.cpp @@ -239,7 +239,7 @@ void writeRecordingToFile(RecordingPointer recording, const QString& filename) { if (i == 0 || frame._jointRotations[j] != previousFrame._jointRotations[j]) { writeQuat(stream, frame._jointRotations[j]); - // XXX handle translations + // TODO -- handle translations mask.setBit(maskIndex); } maskIndex++; @@ -563,8 +563,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString } } - // XXX handle translations - + // TODO -- handle translations if (!mask[maskIndex++] || !readVec3(stream, frame._translation)) { frame._translation = previousFrame._translation; @@ -675,7 +674,7 @@ RecordingPointer readRecordingFromRecFile(RecordingPointer recording, const QStr fileStream >> baseFrame._jointRotations[i].x >> baseFrame._jointRotations[i].y >> baseFrame._jointRotations[i].z >> baseFrame._jointRotations[i].w; } - // XXX handle translations + // TODO -- handle translations fileStream >> baseFrame._translation.x >> baseFrame._translation.y >> baseFrame._translation.z; fileStream >> baseFrame._rotation.x >> baseFrame._rotation.y >> baseFrame._rotation.z >> baseFrame._rotation.w; @@ -743,7 +742,7 @@ RecordingPointer readRecordingFromRecFile(RecordingPointer recording, const QStr } } - // XXX handle translations + // TODO -- handle translations if (mask[maskIndex++]) { stream >> frame._translation.x >> frame._translation.y >> frame._translation.z; diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp index 31a6096d13..dc7887c9f8 100644 --- a/libraries/shared/src/GLMHelpers.cpp +++ b/libraries/shared/src/GLMHelpers.cpp @@ -33,7 +33,7 @@ const vec3& Vectors::RIGHT = Vectors::UNIT_X; const vec3& Vectors::UP = Vectors::UNIT_Y; const vec3& Vectors::FRONT = Vectors::UNIT_NEG_Z; -const quat Quaternions::ZERO{ 1.0f, 0.0f, 0.0f, 0.0f }; +const quat Quaternions::IDENTITY{ 1.0f, 0.0f, 0.0f, 0.0f }; // Safe version of glm::mix; based on the code in Nick Bobick's article, // http://www.gamasutra.com/features/19980703/quaternions_01.htm (via Clyde, diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h index e2833b46e3..7bdd3bf2de 100644 --- a/libraries/shared/src/GLMHelpers.h +++ b/libraries/shared/src/GLMHelpers.h @@ -56,7 +56,7 @@ glm::quat safeMix(const glm::quat& q1, const glm::quat& q2, float alpha); class Quaternions { public: - static const quat ZERO; + static const quat IDENTITY; }; class Vectors {