From b5a957dfdc433aa795bc3337fd78c64d62d82389 Mon Sep 17 00:00:00 2001 From: OTHGMars Date: Mon, 16 Jun 2014 20:46:25 -0400 Subject: [PATCH] ShapeBase Mounting Added mount transforms to ShapeBase --- Engine/source/T3D/shapeBase.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp index 6f40cc134..4bca5f23b 100644 --- a/Engine/source/T3D/shapeBase.cpp +++ b/Engine/source/T3D/shapeBase.cpp @@ -1324,6 +1324,12 @@ void ShapeBase::processTick(const Move* move) if (mWhiteOut <= 0.0) mWhiteOut = 0.0; } + + if (isMounted()) { + MatrixF mat; + mMount.object->getMountTransform( mMount.node, mMount.xfm, &mat ); + Parent::setTransform(mat); + } } void ShapeBase::advanceTime(F32 dt) @@ -1382,6 +1388,12 @@ void ShapeBase::advanceTime(F32 dt) mFadeVal = 1 - mFadeVal; } } + + if (isMounted()) { + MatrixF mat; + mMount.object->getRenderMountTransform( 0.0f, mMount.node, mMount.xfm, &mat ); + Parent::setRenderTransform(mat); + } } void ShapeBase::setControllingClient( GameConnection* client )