Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code review

Browse source
This commit is contained in:
Seth Alves 2015-09-29 06:51:24 -07:00
parent 874bded236
commit ddeed8b4ee
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/avatars/src/Recording.cpp
View file

@ -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;

2
libraries/shared/src/GLMHelpers.cpp
View file

@ -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,

2
libraries/shared/src/GLMHelpers.h
View file

@ -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 {