From f0e72d8d0cf16d56b22adda5b4032cdfedad55b1 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 7 Nov 2013 12:16:17 -0800 Subject: [PATCH] Removed unused variable, debugging code. --- interface/src/avatar/SkeletonModel.cpp | 2 +- interface/src/renderer/FBXReader.cpp | 9 --------- interface/src/renderer/Model.cpp | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp index 62dcbcac6a..46a2b6bda6 100644 --- a/interface/src/avatar/SkeletonModel.cpp +++ b/interface/src/avatar/SkeletonModel.cpp @@ -149,7 +149,7 @@ void SkeletonModel::applyPalmData(int jointIndex, const QVector& fingertipJ IndexValue indexValue = { i, palm.getFingers()[i].getTipRawPosition().x }; fingerIndices.append(indexValue); } - qSort(fingerIndices.begin(), fingerIndices.end()); + //qSort(fingerIndices.begin(), fingerIndices.end()); // likewise with the joint indices and relative x QVector jointIndices; diff --git a/interface/src/renderer/FBXReader.cpp b/interface/src/renderer/FBXReader.cpp index 5cf7a26ae9..dce41ba18f 100644 --- a/interface/src/renderer/FBXReader.cpp +++ b/interface/src/renderer/FBXReader.cpp @@ -1113,14 +1113,9 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) QVariantHash springs = mapping.value("spring").toHash(); QVariant defaultSpring = springs.value("default"); - int vertices = 0; - int quads = 0; - int tris = 0; for (QHash::iterator it = meshes.begin(); it != meshes.end(); it++) { ExtractedMesh& extracted = it.value(); - vertices += extracted.mesh.vertices.size(); - // accumulate local transforms QString modelID = models.contains(it.key()) ? it.key() : parentMap.value(it.key()); extracted.mesh.springiness = springs.value(models.value(modelID).name, defaultSpring).toFloat(); @@ -1134,8 +1129,6 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) break; } FBXMeshPart& part = extracted.mesh.parts[partIndex]; - quads += part.quadIndices.size() / 4; - tris += part.triangleIndices.size() / 3; if (textureFilenames.contains(childID)) { part.diffuseFilename = textureFilenames.value(childID); continue; @@ -1296,8 +1289,6 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) geometry.meshes.append(extracted.mesh); } - qDebug("%d %d %d\n", vertices, quads, tris); - // process attachments QVariantHash attachments = mapping.value("attach").toHash(); for (QVariantHash::const_iterator it = attachments.constBegin(); it != attachments.constEnd(); it++) { diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index 304819f65b..8c0bd69632 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -633,7 +633,6 @@ bool Model::setJointPosition(int jointIndex, const glm::vec3& position, int last for (int j = 1; freeLineage.at(j - 1) != lastFreeIndex; j++) { int sourceIndex = freeLineage.at(j); int destIndex = freeLineage.at(j - 1); - bool last = (sourceIndex == lastFreeIndex); JointState& sourceState = _jointStates[sourceIndex]; JointState& destState = _jointStates[destIndex]; glm::vec3 sourceTranslation = extractTranslation(sourceState.transform);