Mantain ABI compatibility #Ogre2IsRenderWindowABI

When merging to newer branches that can break the ABI, revert this commit Signed-off-by: Matias N. Goldberg <[email protected]>
gazebosim · May 15, 2021 · b52af92 · b52af92
1 parent a1c1968
commit b52af92
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh
@@ -116,7 +116,11 @@ namespace ignition
       public: void SetShadowsNodeDefDirty();
 
       /// \brief Returns true if this is a render window
-      public: virtual bool isRenderWindow() const;
+      /// TODO(anyone): this function should be virtual.
+      /// We didn't do it to preserve ABI.
+      /// Look in commit history for '#Ogre2IsRenderWindowABI' to
+      /// see changes made and revert
+      public: bool isRenderWindow() const;
 
       /// \brief Get a pointer to the ogre render target containing
       /// the results of the render
@@ -269,8 +273,11 @@ namespace ignition
       // Documentation inherited.
       public: virtual void Destroy() override;
 
-      // Documentation inherited.
-      public: virtual bool isRenderWindow() const override;
+      // TODO(anyone): this function should be virtual.
+      // We didn't do it to preserve ABI.
+      // Looks in commit history for '#Ogre2IsRenderWindowABI' to
+      // see changes made and revert
+      public: bool isRenderWindow() const;
 
       // Documentation inherited.
       public: virtual Ogre::RenderTarget *RenderTarget() const override;

diff --git a/ogre2/src/Ogre2RenderTarget.cc b/ogre2/src/Ogre2RenderTarget.cc
@@ -432,6 +432,11 @@ void Ogre2RenderTarget::Render()
 //////////////////////////////////////////////////
 bool Ogre2RenderTarget::isRenderWindow() const
 {
+  const Ogre2RenderWindow *asWindow =
+      dynamic_cast<const Ogre2RenderWindow*>(this);
+  if (asWindow)
+    return true;
+
   return false;
 }