Merge pull request #572 from ignitionrobotics/merge_6_7_20220228

6 -> 7
gazebosim · Mar 2, 2022 · 11197df · 11197df
2 parents 5e67f41 + 4db7f61
commit 11197df
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -6,6 +6,20 @@
 
 ### Ignition Rendering 6.X
 
+### Ignition Rendering 6.2.1 (2022-02-24)
+
+1. Restore format conversion in Ogre2RenderTarget::Copy
+    * [Pull request #564](https://github.com/ignitionrobotics/ign-rendering/pull/564)
+
+1. Increase particle emitter quota
+    * [Pull request #562](https://github.com/ignitionrobotics/ign-rendering/pull/562)
+
+1.Make sure shader param exists before setting its value
+    * [Pull request #558](https://github.com/ignitionrobotics/ign-rendering/pull/558)
+
+1. Backport wave changes
+    * [Pull request #557](https://github.com/ignitionrobotics/ign-rendering/pull/557)
+
 ### Ignition Rendering 6.2.0 (2022-01-28)
 
 1. Fix missing terrain shadows casted on objects

diff --git a/ogre2/src/Ogre2DepthCamera.cc b/ogre2/src/Ogre2DepthCamera.cc
@@ -708,11 +708,18 @@ void Ogre2DepthCamera::CreateDepthTexture()
         passScene->mIncludeOverlays = false;
         passScene->mFirstRQ = 0u;
         passScene->mLastRQ = 2u;
-        if (!validBackground)
+        if (validBackground)
+        {
+          passScene->setAllLoadActions(Ogre::LoadAction::DontCare);
+          passScene->mLoadActionDepth = Ogre::LoadAction::Clear;
+          passScene->mLoadActionStencil = Ogre::LoadAction::Clear;
+        }
+        else
         {
           passScene->setAllLoadActions(Ogre::LoadAction::Clear);
-          passScene->setAllClearColours(Ogre::ColourValue(
-              Ogre2Conversions::Convert(this->Scene()->BackgroundColor())));
+          passScene->setAllClearColours(
+              Ogre2Conversions::Convert(this->Scene()->BackgroundColor()));
+
         }
       }
 
@@ -727,10 +734,6 @@ void Ogre2DepthCamera::CreateDepthTexture()
             + this->Name();
         passQuad->mFrustumCorners =
             Ogre::CompositorPassQuadDef::CAMERA_DIRECTION;
-
-        passQuad->setAllLoadActions(Ogre::LoadAction::Clear);
-        passQuad->setAllClearColours(Ogre::ColourValue(
-            Ogre2Conversions::Convert(this->Scene()->BackgroundColor())));
       }
 
       // scene pass - transparent stuff

diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc
@@ -398,6 +398,11 @@ void Ogre2RenderEngine::CreateLogger()
 void Ogre2RenderEngine::CreateContext()
 {
 #if not (__APPLE__ || _WIN32)
+  if (this->Headless())
+  {
+    // Nothing to do
+    return;
+  }
   // create X11 display
   this->dummyDisplay = XOpenDisplay(0);
   Display *x11Display = static_cast<Display*>(this->dummyDisplay);
@@ -406,7 +411,8 @@ void Ogre2RenderEngine::CreateContext()
   {
     // Not able to create a Xwindow, try to run in headless mode
     this->SetHeadless(true);
-    ignerr << "Unable to open display: " << XDisplayName(0) << std::endl;
+    ignwarn << "Unable to open display: " << XDisplayName(0)
+            << ". Trying to run in headless mode." << std::endl;
     return;
   }
 

diff --git a/ogre2/src/Ogre2RenderTarget.cc b/ogre2/src/Ogre2RenderTarget.cc
@@ -198,7 +198,13 @@ void Ogre2RenderTarget::BuildCompositor()
         passScene->mIncludeOverlays = false;
         passScene->mFirstRQ = 0u;
         passScene->mLastRQ = 2u;
-        if (!validBackground)
+        if (validBackground)
+        {
+          passScene->setAllLoadActions(Ogre::LoadAction::DontCare);
+          passScene->mLoadActionDepth = Ogre::LoadAction::Clear;
+          passScene->mLoadActionStencil = Ogre::LoadAction::Clear;
+        }
+        else
         {
           passScene->setAllLoadActions(Ogre::LoadAction::Clear);
           passScene->setAllClearColours(this->ogreBackgroundColor);
@@ -216,9 +222,6 @@ void Ogre2RenderTarget::BuildCompositor()
             + this->Name();
         passQuad->mFrustumCorners =
             Ogre::CompositorPassQuadDef::CAMERA_DIRECTION;
-
-        passQuad->setAllLoadActions(Ogre::LoadAction::Clear);
-        passQuad->setAllClearColours(this->ogreBackgroundColor);
       }
 
       // scene pass - transparent stuff