Fix missing terrain shadows casted on objects (#547)

Issue was incorrect listener setup due to bad merge. ign-rendering7 has a more robust system to handle all listeners. For Fortress this fix will do. Signed-off-by: Matias N. Goldberg <[email protected]> Co-authored-by: Ian Chen <[email protected]>
gazebosim · Jan 25, 2022 · fae20cd · fae20cd
1 parent f305d78
commit fae20cd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc
@@ -35,6 +35,7 @@
 
 #include "Ogre2IgnHlmsCustomizations.hh"
 #include "Ogre2ParticleNoiseListener.hh"
+#include "Terra/Hlms/PbsListener/OgreHlmsPbsTerraShadows.h"
 
 #ifdef _MSC_VER
   #pragma warning(push, 0)
@@ -1248,12 +1249,28 @@ void Ogre2GpuRays::Render()
   Ogre2IgnHlmsCustomizations &hlmsCustomizations =
       engine->HlmsCustomizations();
 
+#if IGNITION_RENDERING_MAJOR_VERSION < 7
+    // TODO(anyone): Remove this block of code when porting to ign-rendering7
+    //
+    // Set Ogre2IgnHlmsCustomizations, as we don't need terrain shadows
+    auto ogreRoot = engine->OgreRoot();
+    Ogre::Hlms *hlmsPbs = ogreRoot->getHlmsManager()->getHlms(Ogre::HLMS_PBS);
+    hlmsPbs->setListener(&hlmsCustomizations);
+#endif
+
   hlmsCustomizations.minDistanceClip =
       static_cast<float>(this->NearClipPlane());
   this->UpdateRenderTarget1stPass();
   this->UpdateRenderTarget2ndPass();
   hlmsCustomizations.minDistanceClip = -1;
 
+#if IGNITION_RENDERING_MAJOR_VERSION < 7
+  // TODO(anyone): Remove this block of code when porting to ign-rendering7
+  //
+  // Restore the terrain shadows listener
+  hlmsPbs->setListener(engine->HlmsPbsTerraShadows());
+#endif
+
   this->scene->FlushGpuCommandsAndStartNewFrame(6u, false);
 }
 

diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc
@@ -788,7 +788,15 @@ void Ogre2RenderEngine::RegisterHlms()
 
     // disable writting debug output to disk
     hlmsPbs->setDebugOutputPath(false, false);
-    hlmsPbs->setListener(&this->dataPtr->hlmsCustomizations);
+
+#if IGNITION_RENDERING_MAJOR_VERSION >= 7
+    IGN_ASSERT(
+      hlmsPbs->getListener() != &this->dataPtr->hlmsCustomizations &&
+        hlmsPbs->getListener() != this->dataPtr->hlmsPbsTerraShadows.get(),
+      "Bad merge! In ign-rendering7 there's a new listener that will "
+      "coordinate all other listeners. Watch out all 3 Hlms (Unlit, Pbs, "
+      "Terra)");
+#endif
   }
 
   {