diff --git a/Engine/source/ts/tsShape.cpp b/Engine/source/ts/tsShape.cpp index 8b0146567..52a77cf9f 100644 --- a/Engine/source/ts/tsShape.cpp +++ b/Engine/source/ts/tsShape.cpp @@ -566,8 +566,8 @@ void TSShape::initObjects() if (accel != NULL) { delete[] accel->vertexList; delete[] accel->normalList; - for (S32 j = 0; j < accel->numVerts; j++) - delete[] accel->emitStrings[j]; + for (S32 vertID = 0; vertID < accel->numVerts; vertID++) + delete[] accel->emitStrings[vertID]; delete[] accel->emitStrings; delete accel; } @@ -683,9 +683,9 @@ void TSShape::initVertexBuffers() U32 vertsInBuffer = mShapeVertexData.size / mVertexSize; U32 indsInBuffer = ibIndices - indicesStart; - for (U32 i = 0; i < primStart; i++) + for (U32 primID = 0; primID < primStart; primID++) { - GFXPrimitive &prim = mShapeVertexIndices->mPrimitiveArray[i]; + GFXPrimitive &prim = mShapeVertexIndices->mPrimitiveArray[primID]; if (prim.type != GFXTriangleList && prim.type != GFXTriangleStrip) { @@ -1303,10 +1303,10 @@ void TSShape::assembleShape() S32 oldSz = groundTranslations.size(); groundTranslations.setSize(oldSz+seq.numGroundFrames); groundRotations.setSize(oldSz+seq.numGroundFrames); - for (S32 j=0;j 10000 ) || - ( details[i].maxError == 0 ) || ( details[i].maxError > 10000 ) ) + if ( ( details[erID].averageError == 0 ) || ( details[erID].averageError > 10000 ) || + ( details[erID].maxError == 0 ) || ( details[erID].maxError > 10000 ) ) { - details[i].averageError = details[i].maxError = -1.0f; + details[erID].averageError = details[erID].maxError = -1.0f; } } @@ -1740,8 +1740,8 @@ void TSShape::disassembleShape() { // Legacy details => no explicit autobillboard parameters U32 legacyDetailSize32 = 7; // only store the first 7 4-byte values of each detail - for ( S32 i = 0; i < details.size(); i++ ) - tsalloc.copyToBuffer32( (S32*)&details[i], legacyDetailSize32 ); + for ( S32 bbID = 0; bbID < details.size(); bbID++ ) + tsalloc.copyToBuffer32( (S32*)&details[bbID], legacyDetailSize32 ); } tsalloc.setGuard(); diff --git a/Engine/source/ts/tsShapeOldRead.cpp b/Engine/source/ts/tsShapeOldRead.cpp index d20175a2e..9b06aff75 100644 --- a/Engine/source/ts/tsShapeOldRead.cpp +++ b/Engine/source/ts/tsShapeOldRead.cpp @@ -647,27 +647,27 @@ bool TSShape::importSequences(Stream * s, const String& sequencePath) nodeUniformScales.increment(newScaleMembership.count() * seq.numKeyframes); // remap node transforms from temporary arrays - for (S32 j = 0; j < nodeMap.size(); j++) + for (S32 nodeID = 0; nodeID < nodeMap.size(); nodeID++) { - if (nodeMap[j] < 0) + if (nodeMap[nodeID] < 0) continue; - if (newTransMembership.test(nodeMap[j])) + if (newTransMembership.test(nodeMap[nodeID])) { - S32 src = seq.numKeyframes * seq.translationMatters.count(j); - S32 dest = seq.baseTranslation + seq.numKeyframes * newTransMembership.count(nodeMap[j]); + S32 src = seq.numKeyframes * seq.translationMatters.count(nodeID); + S32 dest = seq.baseTranslation + seq.numKeyframes * newTransMembership.count(nodeMap[nodeID]); dCopyArray(&nodeTranslations[dest], &seqTranslations[src], seq.numKeyframes); } - if (newRotMembership.test(nodeMap[j])) + if (newRotMembership.test(nodeMap[nodeID])) { - S32 src = seq.numKeyframes * seq.rotationMatters.count(j); - S32 dest = seq.baseRotation + seq.numKeyframes * newRotMembership.count(nodeMap[j]); + S32 src = seq.numKeyframes * seq.rotationMatters.count(nodeID); + S32 dest = seq.baseRotation + seq.numKeyframes * newRotMembership.count(nodeMap[nodeID]); dCopyArray(&nodeRotations[dest], &seqRotations[src], seq.numKeyframes); } - if (newScaleMembership.test(nodeMap[j])) + if (newScaleMembership.test(nodeMap[nodeID])) { - S32 src = seq.numKeyframes * seq.scaleMatters.count(j); - S32 dest = seq.baseScale + seq.numKeyframes * newScaleMembership.count(nodeMap[j]); + S32 src = seq.numKeyframes * seq.scaleMatters.count(nodeID); + S32 dest = seq.baseScale + seq.numKeyframes * newScaleMembership.count(nodeMap[nodeID]); if (seq.flags & TSShape::ArbitraryScale) { dCopyArray(&nodeArbitraryScaleRots[dest], &seqArbitraryScaleRots[src], seq.numKeyframes); @@ -713,10 +713,10 @@ bool TSShape::importSequences(Stream * s, const String& sequencePath) S32 oldSz = triggers.size(); s->read(&sz); triggers.setSize(oldSz+sz); - for (S32 i=0; iread(&triggers[i+oldSz].state); - s->read(&triggers[i+oldSz].pos); + s->read(&triggers[triggerID +oldSz].state); + s->read(&triggers[triggerID +oldSz].pos); } if (smInitOnRead)