TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #501 from DavidWyand-GG/MaskNodeHandsOff

Browse source 
Changes for MaskNodeHandsOff
This commit is contained in:
David Wyand 2013-10-30 21:51:38 -07:00
commit 49b15cc055
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/ts/tsAnimate.cpp
View file

@ -293,6 +293,7 @@ void TSShapeInstance::updateTransitionNodeTransforms(TSIntegerSet& transitionNod
transitionNodes.overlap(mTransitionRotationNodes); transitionNodes.overlap(mTransitionRotationNodes);
transitionNodes.overlap(mTransitionTranslationNodes); transitionNodes.overlap(mTransitionTranslationNodes);
transitionNodes.overlap(mTransitionScaleNodes); transitionNodes.overlap(mTransitionScaleNodes);
transitionNodes.takeAway(mHandsOffNodes);
// Decompose transforms for nodes affected by the transition. Only need to do // Decompose transforms for nodes affected by the transition. Only need to do
// for blended or scale-animated nodes, as all others are already up to date // for blended or scale-animated nodes, as all others are already up to date
@ -578,6 +579,7 @@ void TSShapeInstance::handleBlendSequence(TSThread * thread, S32 a, S32 b)
TSIntegerSet nodeMatters = thread->getSequence()->translationMatters; TSIntegerSet nodeMatters = thread->getSequence()->translationMatters;
nodeMatters.overlap(thread->getSequence()->rotationMatters); nodeMatters.overlap(thread->getSequence()->rotationMatters);
nodeMatters.overlap(thread->getSequence()->scaleMatters); nodeMatters.overlap(thread->getSequence()->scaleMatters);
nodeMatters.takeAway(mHandsOffNodes);
S32 start = nodeMatters.start(); S32 start = nodeMatters.start();
S32 end = b; S32 end = b;
for (S32 nodeIndex=start; nodeIndex<end; nodeMatters.next(nodeIndex)) for (S32 nodeIndex=start; nodeIndex<end; nodeMatters.next(nodeIndex))