Merge pull request #923 from gazebosim/merge_7_8_20230926

Merge: 7 -> 8
gazebosim · Sep 27, 2023 · 9e6d8ac · 9e6d8ac
2 parents 4190ff6 + 62e45a2
commit 9e6d8ac
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 7 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -6,6 +6,21 @@
 
 ### Gazebo Rendering 7.X
 
+### Gazebo Rendering 7.4.2 (2023-09-26)
+
+1. ogre2: use CMAKE_INSTALL_RPATH
+    * [Pull request #909](https://github.com/gazebosim/gz-rendering/pull/909)
+
+1. Disable setting color range in particle emitter
+    * [Pull request #903](https://github.com/gazebosim/gz-rendering/pull/903)
+
+1. Documentation updates
+    * [Pull request #892](https://github.com/gazebosim/gz-rendering/pull/892)
+    * [Pull request #896](https://github.com/gazebosim/gz-rendering/pull/896)
+
+1. Revert mesh viewer background color back to gray
+    * [Pull request #894](https://github.com/gazebosim/gz-rendering/pull/894)
+
 ### Gazebo Rendering 7.4.1 (2023-08-17)
 
 1. Infrastructure
@@ -369,6 +384,29 @@
 
 ### Gazebo Rendering 6.X
 
+### Gazebo Rendering 6.6.1 (2023-09-01)
+
+1. Fixed light visual in OGRE
+    * [Pull request #864](https://github.com/gazebosim/gz-rendering/pull/864)
+
+1. Lower severity level for ogre2 visibility mask msgs and unavailable render passes
+    * [Pull request #830](https://github.com/gazebosim/gz-rendering/pull/830)
+
+1. Infrastructure
+    * [Pull request #834](https://github.com/gazebosim/gz-rendering/pull/834)
+
+1. Rename COPYING to LICENSE
+    * [Pull request #833](https://github.com/gazebosim/gz-rendering/pull/833)
+
+1. Add message to see troubleshooting page when render engine fails to create dummy window
+    * [Pull request #829](https://github.com/gazebosim/gz-rendering/pull/829)
+
+1. Tweak max camera position limit
+    * [Pull request #827](https://github.com/gazebosim/gz-rendering/pull/827)
+
+1. Limit max camera position vector length
+    * [Pull request #824](https://github.com/gazebosim/gz-rendering/pull/824)
+
 ### Gazebo Rendering 6.6.0 (2023-02-02)
 
 1. Backport Composite BaseVisual destroy fix to 6

diff --git a/examples/hello_world_plugin/README.md b/examples/hello_world_plugin/README.md
@@ -36,8 +36,9 @@ Now you can run `gz sim` with the name of the resultant library file (without th
 or the file extension, i.e., libHelloWorldPlugin.so -> HelloWorldPlugin):
 
 ~~~
-gz sim --render-engine HelloWorldPlugin
+gz sim --render-engine HelloWorldPlugin empty.sdf
 ~~~
 
 You should see a blank screen within the Gazebo GUI, as this mocked plugin provides no implementation
-for the scene.
+for the scene. The Gazebo Component Inspector should show that the Render Engine Gui Plugin and
+the Render Engine Server Plugin are now set to use the `HelloWorldPlugin`.
diff --git a/examples/mesh_viewer/Main.cc b/examples/mesh_viewer/Main.cc
@@ -45,7 +45,7 @@ void buildScene(ScenePtr _scene)
 {
   // initialize _scene
   _scene->SetAmbientLight(0.3, 0.3, 0.3);
-  _scene->SetBackgroundColor(0.0, 0.0, 0.3);
+  _scene->SetBackgroundColor(0.3, 0.3, 0.3);
   VisualPtr root = _scene->RootVisual();
 
   // create directional light

diff --git a/ogre2/src/Ogre2ParticleEmitter.cc b/ogre2/src/Ogre2ParticleEmitter.cc
@@ -290,6 +290,10 @@ void Ogre2ParticleEmitter::SetColorRange(
     const gz::math::Color &_colorStart,
     const gz::math::Color &_colorEnd)
 {
+  // see https://github.com/gazebosim/gz-rendering/issues/902
+  gzwarn << "ParticleEmitter SetColorRange is currently disabled." << std::endl;
+  return;
+
   // Color interpolator affector.
   if (!this->dataPtr->colorInterpolatorAffector)
   {

diff --git a/test/common_test/ParticleEmitter_TEST.cc b/test/common_test/ParticleEmitter_TEST.cc
@@ -29,7 +29,7 @@ using namespace gz;
 using namespace rendering;
 
 /// \brief The test fixture.
-class ParticleEmitterTest : public CommonRenderingTest 
+class ParticleEmitterTest : public CommonRenderingTest
 {
   /// \brief A directory under test/ with some textures.
   protected: const std::string TEST_MEDIA_PATH =
@@ -124,8 +124,10 @@ TEST_F(ParticleEmitterTest, ParticleEmitter)
   EXPECT_EQ(expectedMaterial,         particleEmitter->Material());
   EXPECT_DOUBLE_EQ(expectedMinVel,    particleEmitter->MinVelocity());
   EXPECT_DOUBLE_EQ(expectedMaxVel,    particleEmitter->MaxVelocity());
-  EXPECT_EQ(expectedColorStart,       particleEmitter->ColorStart());
-  EXPECT_EQ(expectedColorEnd,         particleEmitter->ColorEnd());
+  // ColorRange test is currently disabled, see
+  // https://github.com/gazebosim/gz-rendering/issues/902
+  // EXPECT_EQ(expectedColorStart,       particleEmitter->ColorStart());
+  // EXPECT_EQ(expectedColorEnd,         particleEmitter->ColorEnd());
   EXPECT_DOUBLE_EQ(expectedScaleRate, particleEmitter->ScaleRate());
   EXPECT_EQ(expectedColorRangeImage,  particleEmitter->ColorRangeImage());
   EXPECT_FLOAT_EQ(expectedScatterRatio,

diff --git a/tutorials/24_boundingbox_camera_tutorial.md b/tutorials/24_boundingbox_camera_tutorial.md
@@ -40,7 +40,7 @@ There are 2 other types of boxes:
 * 2D visible: box around the visible parts of an object.
 * 2D full: box around the object, including parts that aren't visible to the camera.
 
-Compare the two 2D box types as followS:
+Compare the two 2D box types as follows:
 
 ```{.sh}
 ./boundingbox_camera 2D_visible