Merge branch 'main' into context_attribs

gazebosim · Mar 2, 2021 · 3d6f254 · 3d6f254
2 parents ba36185 + af7c67d
commit 3d6f254
Show file tree

Hide file tree

Showing 25 changed files with 1,175 additions and 182 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/port.md b/.github/PULL_REQUEST_TEMPLATE/port.md
diff --git a/.github/ci/after_make.sh b/.github/ci/after_make.sh
@@ -4,7 +4,7 @@ set -x
 
 make install
 
-Xvfb :1 -screen 0 1280x1024x24 &
+Xvfb :1 -ac -noreset -core -screen 0 1280x1024x24 &
 export DISPLAY=:1.0
 export RENDER_ENGINE_VALUES=ogre2
 export MESA_GL_VERSION_OVERRIDE=3.3
diff --git a/Changelog.md b/Changelog.md
@@ -12,6 +12,23 @@
 
 ### Ignition Rendering 4.X
 
+### Ignition Rendering 4.5.0 (2021-02-17)
+
+1. More verbose messages when failing to load render engines
+    * [Pull Request #236](https://github.com/ignitionrobotics/ign-rendering/pull/236)
+
+1. Fixed OBJ textures with the same name
+    * [Pull Request #239](https://github.com/ignitionrobotics/ign-rendering/pull/239)
+
+1. Fix setting particle size
+    * [Pull Request #241](https://github.com/ignitionrobotics/ign-rendering/pull/241)
+
+1. Make particle emitter invisible in thermal camera image
+    * [Pull Request #240](https://github.com/ignitionrobotics/ign-rendering/pull/240)
+
+1. Apply particle scattering effect to depth cameras
+    * [Pull Request #251](https://github.com/ignitionrobotics/ign-rendering/pull/251)
+
 ### Ignition Rendering 4.4.0 (2021-02-11)
 
 1. Add support for 8 bit thermal camera image format

diff --git a/examples/particles_demo/Main.cc b/examples/particles_demo/Main.cc
@@ -107,6 +107,7 @@ void buildScene(ScenePtr _scene)
 
   //! [create particle emitter]
   ParticleEmitterPtr emitter = _scene->CreateParticleEmitter();
+  emitter->SetType(EM_POINT);
   emitter->SetLocalPose({2, 1.10, 1.25, 1.5708, 0, 2.3});
   emitter->SetRate(10);
   emitter->SetParticleSize({1, 1, 1});
@@ -118,6 +119,21 @@ void buildScene(ScenePtr _scene)
   emitter->SetEmitting(true);
   root->AddChild(emitter);
   //! [create particle emitter]
+
+  // area emitter
+  ParticleEmitterPtr areaEmitter = _scene->CreateParticleEmitter();
+  areaEmitter->SetType(EM_BOX);
+  areaEmitter->SetEmitterSize({3.0, 3.0, 3.0});
+  areaEmitter->SetLocalPose({3, 0, 0, 0, -1.5707, 0});
+  areaEmitter->SetRate(10);
+  areaEmitter->SetParticleSize({0.01, 0.01, 0.01});
+  areaEmitter->SetLifetime(1);
+  areaEmitter->SetVelocityRange(0.5, 1);
+  areaEmitter->SetMaterial(particleMaterial);
+  areaEmitter->SetColorRangeImage(RESOURCE_PATH + "/smokecolors.png");
+  areaEmitter->SetScaleRate(1);
+  areaEmitter->SetEmitting(true);
+  root->AddChild(areaEmitter);
 }
 
 //////////////////////////////////////////////////

diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2Includes.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2Includes.hh
@@ -68,6 +68,8 @@
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreShadowCameraSetupPSSM.h>
 #include <OgreDepthBuffer.h>
+#include <OgreParticleAffector.h>
+#include <OgreParticleAffectorFactory.h>
 #include <OgreParticleEmitter.h>
 #include <OgreParticleSystem.h>
 

diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2ParticleEmitter.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2ParticleEmitter.hh
@@ -86,9 +86,19 @@ namespace ignition
       public: virtual void SetColorRangeImage(const std::string &_image)
           override;
 
+      /// \brief Particle system visibility flags
+      public: static const uint32_t kParticleVisibilityFlags;
+
       // Documentation inherited.
       protected: virtual void Init() override;
 
+      /// \brief Internal pre-render function added to avoid breaking ABI
+      /// compatibility
+      private: void PreRenderImpl();
+
+      /// \brief Create the particle system
+      private: void CreateParticleSystem();
+
       /// \brief Only the ogre scene can instanstiate this class
       private: friend class Ogre2Scene;