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

Merge branch 'GarageGames/master' into ueberengine-dev

Browse source 
Conflicts:
	Engine/source/T3D/fps/guiCrossHairHud.cpp
This commit is contained in:
Duion 2016-07-27 13:44:27 +02:00
commit 81750f3deb
2827 changed files with 315755 additions and 121398 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Engine/source/T3D/shapeBase.cpp
View file

@ -879,6 +879,7 @@ IMPLEMENT_CALLBACK( ShapeBase, validateCameraFov, F32, (F32 fov), (fov),
ShapeBase::ShapeBase()
: mDataBlock( NULL ),
mIsAiControlled( false ),
mAiPose( 0 ),
mControllingObject( NULL ),
mMoveMotion( false ),
mShapeBaseMount( NULL ),
@ -1324,6 +1325,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 +1389,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 )
@ -4922,17 +4935,18 @@ DefineEngineMethod( ShapeBase, getTargetCount, S32, (),,
"@see getTargetName()\n")
{
ShapeBase *obj = dynamic_cast< ShapeBase* > ( object );
if(obj)
{
// Try to use the client object (so we get the reskinned targets in the Material Editor)
if ((ShapeBase*)obj->getClientObject())
obj = (ShapeBase*)obj->getClientObject();
ShapeBase *obj = dynamic_cast< ShapeBase* > ( object );
if(obj)
{
// Try to use the client object (so we get the reskinned targets in the Material Editor)
if ((ShapeBase*)obj->getClientObject())
obj = (ShapeBase*)obj->getClientObject();
return obj->getShapeInstance()->getTargetCount();
if (obj->getShapeInstance() != NULL)
return obj->getShapeInstance()->getTargetCount();
}
return -1;
return -1;
}
DefineEngineMethod( ShapeBase, changeMaterial, void, ( const char* mapTo, Material* oldMat, Material* newMat ),,
@ -5021,4 +5035,4 @@ ConsoleMethod( ShapeBase, setManualImageState, void, 4, 4, "(int slot, string st
const char* state = argv[3];
if (imageSlot >= 0 && imageSlot < ShapeBase::MaxMountedImages)
object->setManualImageState(imageSlot, state);
}
}