Mantain ABI compatibility #SetShadowsNodeDefDirtyABI

When merging to newer branches that can break the ABI, revert this commit Signed-off-by: Matias N. Goldberg <[email protected]>
darksylinc · Apr 17, 2021 · 0585a30 · 0585a30
1 parent 0e362d2
commit 0585a30
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/include/ignition/rendering/Camera.hh b/include/ignition/rendering/Camera.hh
@@ -282,12 +282,6 @@ namespace ignition
       /// \return Texture Id of type GLuint.
       public: virtual unsigned int RenderTextureGLId() const = 0;
 
-      /// \brief Notifies us that the shadow node definition is about to be
-      /// updated. This means our compositor workspace must be destroyed
-      /// because the shadow node definition it's using will become a
-      /// dangling pointer otherwise
-      public: virtual void SetShadowsNodeDefDirty() = 0;
-
       /// \brief Add a render pass to the camera
       /// \param[in] _pass New render pass to add
       public: virtual void AddRenderPass(const RenderPassPtr &_pass) = 0;

diff --git a/include/ignition/rendering/base/BaseCamera.hh b/include/ignition/rendering/base/BaseCamera.hh
@@ -164,9 +164,6 @@ namespace ignition
       // Documentation inherited.
       public: virtual unsigned int RenderTextureGLId() const override;
 
-      // Documentation inherited.
-      public: virtual void SetShadowsNodeDefDirty() override;
-
       // Documentation inherited.
       public: virtual void AddRenderPass(const RenderPassPtr &_pass) override;
 
@@ -711,12 +708,6 @@ namespace ignition
       return 0u;
     }
 
-    //////////////////////////////////////////////////
-    template <class T>
-    void BaseCamera<T>::SetShadowsNodeDefDirty()
-    {
-    }
-
     //////////////////////////////////////////////////
     template <class T>
     void BaseCamera<T>::AddRenderPass(const RenderPassPtr &_pass)

diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Camera.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Camera.hh
@@ -106,7 +106,11 @@ namespace ignition
       public: virtual unsigned int RenderTextureGLId() const override;
 
       // Documentation inherited.
-      public: virtual void SetShadowsNodeDefDirty() override;
+      // TODO(anyone): this function should be virtual, declared in 'Camera'
+      // and 'BaseCamera'. We didn't do it to preserve ABI.
+      // Looks in commit history for '#SetShadowsNodeDefDirtyABI' to
+      // see changes made and revert
+      public: void SetShadowsNodeDefDirty();
 
       // Documentation inherited.
       public: virtual void Destroy() override;

diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2DepthCamera.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2DepthCamera.hh
@@ -123,7 +123,11 @@ namespace ignition
       public: double FarClipPlane() const override;
 
       // Documentation inherited.
-      public: virtual void SetShadowsNodeDefDirty() override;
+      // TODO(anyone): this function should be virtual, declared in 'Camera'
+      // and 'BaseCamera'. We didn't do it to preserve ABI.
+      // Looks in commit history for '#SetShadowsNodeDefDirtyABI' to
+      // see changes made and revert
+      public: void SetShadowsNodeDefDirty();
 
       // TODO(anyone): This fixes the pass quad material leaving dangling
       // pointers when we remove the workspace, so we have to cleanup the

diff --git a/ogre2/src/Ogre2Scene.cc b/ogre2/src/Ogre2Scene.cc
@@ -143,7 +143,22 @@ void Ogre2Scene::PreRender()
           this->SensorByIndex(i));
       if (camera)
       {
-        camera->SetShadowsNodeDefDirty();
+        // TODO(anyone): this function should rely on virtual functions instead
+        // of dynamic casts
+        // Looks in commit history for '#SetShadowsNodeDefDirtyABI' to
+        // see changes made and revert
+        {
+          auto cameraDerived = std::dynamic_pointer_cast<Ogre2DepthCamera>(
+                                 this->SensorByIndex(i));
+          if (cameraDerived)
+            cameraDerived->SetShadowsNodeDefDirty();
+        }
+        {
+          auto cameraDerived = std::dynamic_pointer_cast<Ogre2Camera>(
+                                 this->SensorByIndex(i));
+          if (cameraDerived)
+            cameraDerived->SetShadowsNodeDefDirty();
+        }
       }
     }