Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 02:16:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3473 from AndrewMeadows/ragdoll

Browse source 
remove build warnings
This commit is contained in:
Clément Brisset 2014-09-23 11:07:23 -07:00
commit c535d0170d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,7 +228,7 @@ void writeRecordingToFile(RecordingPointer recording, const QString& filename) {
stream << numBlendshapes; stream << numBlendshapes;
mask.resize(mask.size() + numBlendshapes); mask.resize(mask.size() + numBlendshapes);
} }
for (int j = 0; j < numBlendshapes; ++j) { for (quint32 j = 0; j < numBlendshapes; ++j) {
if (i == 0 || if (i == 0 ||
frame._blendshapeCoefficients[j] != previousFrame._blendshapeCoefficients[j]) { frame._blendshapeCoefficients[j] != previousFrame._blendshapeCoefficients[j]) {
writeFloat(stream, frame.getBlendshapeCoefficients()[j], BLENDSHAPE_RADIX); writeFloat(stream, frame.getBlendshapeCoefficients()[j], BLENDSHAPE_RADIX);
@ -243,7 +243,7 @@ void writeRecordingToFile(RecordingPointer recording, const QString& filename) {
stream << numJoints; stream << numJoints;
mask.resize(mask.size() + numJoints); mask.resize(mask.size() + numJoints);
} }
for (int j = 0; j < numJoints; ++j) { for (quint32 j = 0; j < numJoints; ++j) {
if (i == 0 || if (i == 0 ||
frame._jointRotations[j] != previousFrame._jointRotations[j]) { frame._jointRotations[j] != previousFrame._jointRotations[j]) {
writeQuat(stream, frame._jointRotations[j]); writeQuat(stream, frame._jointRotations[j]);
@ -547,7 +547,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString
stream >> numBlendshapes; stream >> numBlendshapes;
} }
frame._blendshapeCoefficients.resize(numBlendshapes); frame._blendshapeCoefficients.resize(numBlendshapes);
for (int j = 0; j < numBlendshapes; ++j) { for (quint32 j = 0; j < numBlendshapes; ++j) {
if (!mask[maskIndex++] || !readFloat(stream, frame._blendshapeCoefficients[j], BLENDSHAPE_RADIX)) { if (!mask[maskIndex++] || !readFloat(stream, frame._blendshapeCoefficients[j], BLENDSHAPE_RADIX)) {
frame._blendshapeCoefficients[j] = previousFrame._blendshapeCoefficients[j]; frame._blendshapeCoefficients[j] = previousFrame._blendshapeCoefficients[j];
} }
@ -557,7 +557,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString
stream >> numJoints; stream >> numJoints;
} }
frame._jointRotations.resize(numJoints); frame._jointRotations.resize(numJoints);
for (int j = 0; j < numJoints; ++j) { for (quint32 j = 0; j < numJoints; ++j) {
if (!mask[maskIndex++] || !readQuat(stream, frame._jointRotations[j])) { if (!mask[maskIndex++] || !readQuat(stream, frame._jointRotations[j])) {
frame._jointRotations[j] = previousFrame._jointRotations[j]; frame._jointRotations[j] = previousFrame._jointRotations[j];
} }

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

@ -56,7 +56,7 @@ public:
void setShapes(QVector<ListShapeEntry>& shapes); void setShapes(QVector<ListShapeEntry>& shapes);
// TODO: either implement this or remove ListShape altogether // TODO: either implement this or remove ListShape altogether
bool findRayIntersection(const glm::vec3& rayStart, const glm::vec3& rayDirection, float& distance) const { return false; } bool findRayIntersection(RayIntersectionInfo& intersection) const { return false; }
protected: protected:
void clear(); void clear();