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

Merge pull request #2001 from pacomont/Let's_appling_Camera_FX_when_mount_on_driver_position

Browse source 
Why not apply Camera FX on vehicle driver position?
This commit is contained in:
Areloch 2017-05-15 00:58:11 -05:00 • committed by GitHub
commit 726790bacf
1 changed files with 73 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/T3D/vehicles/vehicle.cpp
View file

@ -1016,11 +1016,12 @@ void Vehicle::getCameraTransform(F32* pos,MatrixF* mat)
if (isServerObject() && mShapeInstance) if (isServerObject() && mShapeInstance)
mShapeInstance->animateNodeSubtrees(true); mShapeInstance->animateNodeSubtrees(true);
if (*pos == 0) { if (*pos == 0)
{
getRenderEyeTransform(mat); getRenderEyeTransform(mat);
return;
} }
else
{
// Get the shape's camera parameters. // Get the shape's camera parameters.
F32 min, max; F32 min, max;
MatrixF rot; MatrixF rot;
@ -1095,6 +1096,7 @@ void Vehicle::getCameraTransform(F32* pos,MatrixF* mat)
if (isMounted()) if (isMounted())
getObjectMount()->enableCollision(); getObjectMount()->enableCollision();
enableCollision(); enableCollision();
}
// Apply Camera FX. // Apply Camera FX.
mat->mul( gCamFXMgr.getTrans() ); mat->mul( gCamFXMgr.getTrans() );