TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-24 17:13:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

many *many* generic is and js

Browse source
This commit is contained in:
Azaezel 2018-03-13 00:57:31 -05:00
parent f10e5d5933
commit f08339c534
2 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Engine/source/ts/tsShapeOldRead.cpp
View file

@ -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; i<sz;i++)
for (S32 triggerID=0; triggerID<sz; triggerID++)
{
s->read(&triggers[i+oldSz].state);
s->read(&triggers[i+oldSz].pos);
s->read(&triggers[triggerID +oldSz].state);
s->read(&triggers[triggerID +oldSz].pos);
}
if (smInitOnRead)