Merge pull request #1382 from Azaezel/alpha41/lightMounts

handle mounted lights ghosting in and out
TorqueGameEngines · Feb 8, 2025 · 0b477b5 · 0b477b5
2 parents e77c4b3 + 4d66ae3
commit 0b477b5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Engine/source/T3D/lightBase.cpp b/Engine/source/T3D/lightBase.cpp
@@ -147,7 +147,7 @@ bool LightBase::onAdd()
    // Update the light parameters.
    _conformLights();
 	addToScene();
-
+   setProcessTick(true);
    return true;
 }
 
@@ -256,10 +256,22 @@ void LightBase::_onUnselected()
 
 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()
 {
+   if (isMounted()) {
+      MatrixF mat;
+      mMount.object->getMountTransform(mMount.node, mMount.xfm, &mat);
+      mLight->setTransform(mat);
+      setTransform(mat);
+   }
 }
 
 void LightBase::advanceTime( F32 timeDelta )

diff --git a/Engine/source/scene/sceneObject.cpp b/Engine/source/scene/sceneObject.cpp
@@ -1236,10 +1236,10 @@ bool SceneObject::_setMountPID( void* object, const char* index, const char* dat
 
 void SceneObject::resolveMountPID()
 {
-   if ( mMountPID && !mMount.object )
+   if ( mMountPID  )
    {
       SceneObject *obj = dynamic_cast< SceneObject* >( mMountPID->getObject() );
-      if ( obj )
+      if ( obj != mMount.object)
          obj->mountObject( this, mMount.node, mMount.xfm );
    }
 }