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

Merge pull request #1382 from Azaezel/alpha41/lightMounts

Browse source 
handle mounted lights ghosting in and out
This commit is contained in:
Brian Roberts 2025-02-08 14:34:13 -06:00 • committed by GitHub
commit 0b477b573c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/T3D/lightBase.cpp
View file

@ -147,7 +147,7 @@ bool LightBase::onAdd()
// Update the light parameters. // Update the light parameters.
_conformLights(); _conformLights();
addToScene(); addToScene();
setProcessTick(true);
return true; return true;
} }
@ -256,10 +256,22 @@ void LightBase::_onUnselected()
void LightBase::interpolateTick( F32 delta ) void LightBase::interpolateTick( F32 delta )
{ {
if (isMounted()) {
MatrixF mat;
mMount.object->getRenderMountTransform(delta, mMount.node, mMount.xfm, &mat);
mLight->setTransform(mat);
Parent::setTransform(mat);
}
} }
void LightBase::processTick() void LightBase::processTick()
{ {
if (isMounted()) {
MatrixF mat;
mMount.object->getMountTransform(mMount.node, mMount.xfm, &mat);
mLight->setTransform(mat);
setTransform(mat);
}
} }
void LightBase::advanceTime( F32 timeDelta ) void LightBase::advanceTime( F32 timeDelta )

4
Engine/source/scene/sceneObject.cpp
View file

@ -1236,10 +1236,10 @@ bool SceneObject::_setMountPID( void* object, const char* index, const char* dat
void SceneObject::resolveMountPID() void SceneObject::resolveMountPID()
{ {
if ( mMountPID && !mMount.object ) if ( mMountPID )
{ {
SceneObject *obj = dynamic_cast< SceneObject* >( mMountPID->getObject() ); SceneObject *obj = dynamic_cast< SceneObject* >( mMountPID->getObject() );
if ( obj ) if ( obj != mMount.object)
obj->mountObject( this, mMount.node, mMount.xfm ); obj->mountObject( this, mMount.node, mMount.xfm );
} }
} }