Merge main branch into Ogre 2.2 and fixes

Changelog.md

@@ -56,6 +56,48 @@
 
 ### Ignition Rendering 4.X
 
+### Ignition Rendering 4.8.0 (2021-06-18)
+
+1. relax gaussian test tolerance
+    * [Pull request #344](https://github.com/ignitionrobotics/ign-rendering/pull/344)
+
+1. recreate node only when needed
+    * [Pull request #342](https://github.com/ignitionrobotics/ign-rendering/pull/342)
+
+1. Backport memory fixes found by ASAN
+    * [Pull request #340](https://github.com/ignitionrobotics/ign-rendering/pull/340)
+
+1. Re-enable part of depth camera test on macOS
+    * [Pull request #335](https://github.com/ignitionrobotics/ign-rendering/pull/335)
+    * [Pull request #347](https://github.com/ignitionrobotics/ign-rendering/pull/347)
+
+1. Fix depth alpha
+    * [Pull request #316](https://github.com/ignitionrobotics/ign-rendering/pull/316)
+
+1. Fix floating point precision bug handling alpha channel (#332)
+    * [Pull request #333](https://github.com/ignitionrobotics/ign-rendering/pull/333)
+
+1. Include MoveTo Helper class to ign-rendering
+    * [Pull request #311](https://github.com/ignitionrobotics/ign-rendering/pull/311)
+
+1. Remove `tools/code_check` and update codecov
+    * [Pull request #321](https://github.com/ignitionrobotics/ign-rendering/pull/321)
+
+1. [OGRE 1.x] Uniform buffer shader support
+    * [Pull request #294](https://github.com/ignitionrobotics/ign-rendering/pull/294)
+
+1. Helper function to get a scene
+    * [Pull request #320](https://github.com/ignitionrobotics/ign-rendering/pull/320)
+
+1. Reduce lidar data discretization
+    * [Pull request #296](https://github.com/ignitionrobotics/ign-rendering/pull/296)
+
+1. Prevent console warnings when multiple texture coordinates are present
+    * [Pull request #301](https://github.com/ignitionrobotics/ign-rendering/pull/301)
+
+1. Added command line argument to pick version of Ogre
+    * [Pull request #277](https://github.com/ignitionrobotics/ign-rendering/pull/277)
+
 ### Ignition Rendering 4.7.0 (2021-03-17)
 
 1. Enable depth write in particles example

examples/custom_shaders_uniforms/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
 )
 
-find_package(ignition-rendering4)
+find_package(ignition-rendering6)
 
 set(TARGET_THIRD_PARTY_DEPENDS "")
 

ogre2/include/ignition/rendering/ogre2/Ogre2Includes.hh

@@ -92,7 +92,6 @@
 #include <Compositor/OgreCompositorShadowNode.h>
 #include <Compositor/OgreCompositorWorkspace.h>
 #include <Compositor/OgreCompositorWorkspaceListener.h>
-#include <Compositor/Pass/PassClear/OgreCompositorPassClearDef.h>
 #include <Compositor/Pass/PassQuad/OgreCompositorPassQuadDef.h>
 #include <Compositor/Pass/PassScene/OgreCompositorPassScene.h>
 #include <Compositor/Pass/PassScene/OgreCompositorPassSceneDef.h>

ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh

@@ -115,9 +115,36 @@ namespace ignition
       /// \see Camera::SetShadowsNodeDefDirty
       public: void SetShadowsNodeDefDirty();
 
-      /// \brief Get a pointer to the ogre render target
+      /// \brief Returns the FSAA to use based on supported specs by HW
+      /// and value specified in Ogre2RenderTarget::AntiAliasing
+      /// \return Value in range [1; 256). 1 means no antialiasing.
+      protected: uint8_t GetTargetFSAA() const;
+
+      /// \brief Get a pointer to the ogre render target containing
+      /// the results of the render (implemented separately
+      /// to avoid breaking ABI of the pure virtual function)
+      protected: Ogre::TextureGpu *RenderTargetImpl() const;
+
+      /// \brief Get a pointer to the ogre render target containing
+      /// the results of the render
       public: virtual Ogre::TextureGpu *RenderTarget() const = 0;
 
+      /// \brief Returns true if this is a render window
+      /// 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;
+
+      // Documentation inherited
+      public: unsigned int GLIdImpl() const;
+
+      /// \brief Destroy the render texture
+      protected: void DestroyTargetImpl();
+
+      /// \brief Build the render texture
+      protected: void BuildTargetImpl();
+
       /// \brief Get visibility mask for the viewport associated with this
       /// render target
       /// \return Visibility mask
@@ -128,12 +155,26 @@ namespace ignition
       /// \param[in] _mask Visibility mask
       public: virtual void SetVisibilityMask(uint32_t _mask);
 
+      /// \brief Deprecated. Use other overloads.
+      public: static IGN_DEPRECATED(6) void UpdateRenderPassChain(
+          Ogre::CompositorWorkspace *_workspace,
+          const std::string &_workspaceDefName,
+          const std::string &_baseNode, const std::string &_finalNode,
+          const std::vector<RenderPassPtr> &_renderPasses,
+          bool _recreateNodes,
+          Ogre::TextureGpu *(*_ogreTextures)[2],
+          bool _isRenderWindow);
+
       /// \brief Update the render pass chain
       public: static void UpdateRenderPassChain(
           Ogre::CompositorWorkspace *_workspace,
           const std::string &_workspaceDefName,
           const std::string &_baseNode, const std::string &_finalNode,
-          const std::vector<RenderPassPtr> &_renderPasses, bool _recreateNodes);
+          const std::vector<RenderPassPtr> &_renderPasses,
+          bool _recreateNodes,
+          Ogre::TextureGpu *(*_ogreTextures)[2],
+          bool _isRenderWindow,
+          bool _unloadTex0IfNoPost);
 
       /// \brief Update the background color
       protected: virtual void UpdateBackgroundColor();
@@ -144,9 +185,6 @@ namespace ignition
       /// \brief Update the render pass chain
       protected: virtual void UpdateRenderPassChain();
 
-      /// \brief Deprecated. Use Ogre2Scene:UpdateShadowNode instead
-      protected: void IGN_DEPRECATED(5) UpdateShadowNode();
-
       /// \brief Implementation of the Rebuild function
       protected: virtual void RebuildImpl() override;
 
@@ -229,7 +267,9 @@ namespace ignition
       // Documentation inherited
       public: virtual unsigned int GLId() const override;
 
-      // Documentation inherited.
+      // Documentation inherited
+      // TODO(anyone): this function should be removed.
+      // We didn't do it to preserve ABI.
       public: virtual Ogre::TextureGpu *RenderTarget() const override;
 
       // Documentation inherited.
@@ -241,9 +281,6 @@ namespace ignition
       /// \brief Build the render texture
       protected: virtual void BuildTarget();
 
-      /// \brief Pointer to the internal ogre render texture object
-      protected: Ogre::TextureGpu *ogreTexture = nullptr;
-
       /// \brief Make scene our friend so it can create a ogre2 render texture
       private: friend class Ogre2Scene;
     };
@@ -261,6 +298,12 @@ namespace ignition
       // Documentation inherited.
       public: virtual void Destroy() 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::TextureGpu *RenderTarget() const override;