Merge ign-rendering3 forward

Signed-off-by: Nate Koenig <nate@openrobotics.org>
gazebosim · Feb 10, 2021 · 77a8f82 · 77a8f82
2 parents 978a91f + 36bc282
commit 77a8f82
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -141,6 +141,20 @@
 1. Add support for transparency based on textures alpha channel for ogre1 and ogre2
     * [BitBucket pull request 229](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-rendering/pull-requests/229)
 
+### Ignition Rendering 3.X.X (2021-XX-XX)
+
+
+
+### Ignition Rendering 3.4.0 (2021-02-09)
+
+1. Clear all Windows warnings
+    * [Pull request 206](https://github.com/ignitionrobotics/ign-rendering/pull/206)
+    * [Pull request 215](https://github.com/ignitionrobotics/ign-rendering/pull/215)
+    * [Pull request 225](https://github.com/ignitionrobotics/ign-rendering/pull/225)
+
+1. Add laser_retro support
+    * [Pull request 194](https://github.com/ignitionrobotics/ign-rendering/pull/194)
+
 ### Ignition Rendering 3.3.0 (2021-01-22)
 
 1. Add Windows installation.

diff --git a/ogre/include/ignition/rendering/ogre/OgreMaterialSwitcher.hh b/ogre/include/ignition/rendering/ogre/OgreMaterialSwitcher.hh
@@ -42,12 +42,12 @@ namespace ignition
 // Ogre::MaterialManager::Listener isn't a dll-interface class, this may cause
 // issues
 #ifdef _MSC_VER
- #pragma warning(push)
- #pragma warning(disable:4275)
+  #pragma warning(push)
+  #pragma warning(disable:4275)
 #endif
       public Ogre::MaterialManager::Listener,
 #ifdef _MSC_VER
- #pragma warning(pop)
+  #pragma warning(pop)
 #endif
       Ogre::RenderTargetListener
     {

diff --git a/ogre/include/ignition/rendering/ogre/OgreRenderTargetMaterial.hh b/ogre/include/ignition/rendering/ogre/OgreRenderTargetMaterial.hh
@@ -27,8 +27,8 @@
 // Ogre::MaterialManager::Listener isn't a dll-interface class, this may cause
 // issues
 #ifdef _MSC_VER
- #pragma warning(push)
- #pragma warning(disable:4275)
+  #pragma warning(push)
+  #pragma warning(disable:4275)
 #endif
 
 namespace ignition
@@ -107,7 +107,7 @@ namespace ignition
 }
 
 #ifdef _MSC_VER
- #pragma warning(pop)
+  #pragma warning(pop)
 #endif
 
 #endif
diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc
@@ -253,7 +253,8 @@ void Ogre2LaserRetroMaterialSwitcher::preRenderTargetUpdate(
             if (!subItem->hasCustomParameter(this->customParamIdx))
             {
               // limit laser retro value to 2000 (as in gazebo)
-              if (retroValue > 2000.0){
+              if (retroValue > 2000.0)
+              {
                 retroValue = 2000.0;
               }
               float color = retroValue / 2000.0;
@@ -696,7 +697,7 @@ void Ogre2GpuRays::Setup1stPass()
     colorTexDef->preferDepthTexture = true;
     colorTexDef->fsaaExplicitResolve = false;
 
-   nodeDef->setNumTargetPass(2);
+    nodeDef->setNumTargetPass(2);
 
     Ogre::CompositorTargetDef *colorTargetDef =
         nodeDef->addTargetPass("colorTexture");
@@ -813,7 +814,6 @@ void Ogre2GpuRays::Setup1stPass()
         break;
       }
     }
-
   }
 }