Merge branch 'main' into bump_edifice_ign-common

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Feb 19, 2021 · 85bd683 · 85bd683
2 parents 0615282 + 52c4ab0
commit 85bd683
Show file tree

Hide file tree

Showing 42 changed files with 1,243 additions and 168 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Report a bug
+labels: bug
+---
+
+<!-- If you're not sure whether your problem is a bug, please ask a question at
+http://answers.gazebosim.org instead.-->
+
+## Environment
+* OS Version: <!-- e.g, Ubuntu 20.04 -->
+* Source or binary build?
+  <!-- If binary, which version? -->
+  <!-- If source, which branch and what is the latest commit? -->
+
+## Description
+* Expected behavior: <!-- Tell us what you expected to happen -->
+* Actual behavior: <!-- What happened instead -->
+
+## Steps to reproduce
+<!-- Provide steps so we can try to reproduce this issue -->
+
+1.
+2.
+3.
+
+## Output
+<!-- Provide screenshots, console logs, backtraces, and/or anything that could
+be useful to us resolving this issue -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Request a new feature
+labels: enhancement
+---
+
+<!-- If you're not sure on the specifics of the feature or would like a broader
+discussion, please ask consider posting a proposal to
+http://community.gazebosim.org/ instead.-->
+
+## Desired behavior
+<!-- Describe the current problem and the feature you want implemented.-->
+
+## Alternatives considered
+<!-- Describe alternate solutions or features you've considered.-->
+
+## Implementation suggestion
+<!-- Provide a suggestion on how to implement this feature, which could help us
+expedite this implementation.-->
+
+## Additional context
+<!-- Provide any other additional context (e.g., screenshots) about your feature
+request.-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,52 @@
+<!-- Please remove the appropriate section.
+For example, if this is a new feature, remove the "Bug Report" section -->
+
+# Bug Report
+
+Fixes issue #<NUMBER>
+
+## Summary
+<!-- Describe your fix, including an explanation of how to reproduce the bug
+before and after the PR.-->
+
+## Checklist
+- [ ] Signed all commits for DCO
+- [ ] Added tests
+- [ ] Updated documentation (as needed)
+- [ ] Updated migration guide (as needed)
+- [ ] `codecheck` passed (See
+  [contributing](https://ignitionrobotics.org/docs/all/contributing#contributing-code))
+- [ ] All tests passed (See
+  [test coverage](https://ignitionrobotics.org/docs/all/contributing#test-coverage))
+- [ ] While waiting for a review on your PR, please help review
+[another open pull request](https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Aignitionrobotics+archived%3Afalse+)
+to support the maintainers
+
+**Note to maintainers**: Remember to use **Squash-Merge**
+
+---
+
+# New feature
+
+Closes #<NUMBER>
+
+## Summary
+<!--Explain changes made, the expected behavior, and provide any other additional
+context (e.g., screenshots, gifs) if appropriate.-->
+
+## Test it
+<!--Explain how reviewers can test this new feature manually.-->
+
+## Checklist
+- [ ] Signed all commits for DCO
+- [ ] Added tests
+- [ ] Added example world and/or tutorial
+- [ ] Updated documentation (as needed)
+- [ ] Updated migration guide (as needed)
+- [ ] `codecheck` passed (See [contributing](https://ignitionrobotics.org/docs/all/contributing#contributing-code))
+- [ ] All tests passed (See [test coverage](https://ignitionrobotics.org/docs/all/contributing#test-coverage))
+- [ ] While waiting for a review on your PR, please help review
+[another open pull request](https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Aignitionrobotics+archived%3Afalse+)
+to support the maintainers
+
+**Note to maintainers**: Remember to use **Squash-Merge**
diff --git a/.github/PULL_REQUEST_TEMPLATE/port.md b/.github/PULL_REQUEST_TEMPLATE/port.md
@@ -0,0 +1,6 @@
+Port <FROM_BRANCH> to <TO_BRANCH>
+
+Branch comparison: https://github.com/ignitionrobotics/ign-rendering/compare/<FROM_BRANCH>...<TO_BRANCH>
+
+**Note to maintainers**: Remember to **Merge** with commit (not squash-merge
+or rebase)
diff --git a/Changelog.md b/Changelog.md
@@ -12,6 +12,37 @@
 
 ### Ignition Rendering 4.X
 
+### Ignition Rendering 4.4.0 (2021-02-11)
+
+1. Add support for 8 bit thermal camera image format
+    * [Pull Request #235](https://github.com/ignitionrobotics/ign-rendering/pull/235)
+
+1. All changes up to version 3.4.0
+
+### Ignition Rendering 4.3.1 (2021-02-03)
+
+1. Fix converting Pbs to Unlit material conversion (#230)
+    * [Pull Request #230](https://github.com/ignitionrobotics/ign-rendering/pull/230)
+
+### Ignition Rendering 4.3.0 (2021-02-02)
+
+1. Tutorial: Transform FBX to Collada and change its origin
+    * [Pull request #195](https://github.com/ignitionrobotics/ign-rendering/pull/195)
+
+1. Remove Windows Warnings
+    * [Pull request #206](https://github.com/ignitionrobotics/ign-rendering/pull/206)
+    * [Pull request #213](https://github.com/ignitionrobotics/ign-rendering/pull/213)
+    * [Pull request #215](https://github.com/ignitionrobotics/ign-rendering/pull/215)
+
+1. Fix spelling Desconstructor -> Destructor
+    * [Pull request #220](https://github.com/ignitionrobotics/ign-rendering/pull/220)
+
+1. Thermal Camera: Visualize objects with a heat signature
+    * [Pull request #189](https://github.com/ignitionrobotics/ign-rendering/pull/189)
+
+1. Add laser retro support in Ogre2
+    * [Pull request #194](https://github.com/ignitionrobotics/ign-rendering/pull/194)
+
 ### Ignition Rendering 4.2.0 (2021-01-22)
 
 1. Remove some windows warnings.
@@ -120,6 +151,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/examples/gazebo_scene_viewer/SceneManager.hh b/examples/gazebo_scene_viewer/SceneManager.hh
@@ -45,7 +45,7 @@ namespace ignition
       /// \brief Constructor
       public: SceneManager();
 
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: ~SceneManager();
 
       /// \brief Load resources

diff --git a/examples/simple_demo/Main.cc b/examples/simple_demo/Main.cc
@@ -96,7 +96,7 @@ void buildScene(ScenePtr _scene)
   sphere->SetOrigin(0.0, -0.5, 0.0);
   sphere->SetLocalPosition(3, 0, 0);
   sphere->SetLocalRotation(0, 0, 0);
-  sphere->SetLocalScale(1, 2.5, 1);
+  sphere->SetLocalScale(1, 1, 1);
   sphere->SetMaterial(red);
   root->AddChild(sphere);
 
@@ -118,6 +118,15 @@ void buildScene(ScenePtr _scene)
   box->SetMaterial(blue);
   root->AddChild(box);
 
+  // create ellipsoid visual
+  VisualPtr ellipsoidVisual = _scene->CreateVisual();
+  auto ellipsoid = _scene->CreateSphere();
+  ellipsoidVisual->SetLocalScale(1.2, 0.7, 0.5);
+  ellipsoidVisual->AddGeometry(ellipsoid);
+  ellipsoidVisual->SetLocalPosition(3, -1, 0);
+  ellipsoidVisual->SetMaterial(green);
+  root->AddChild(ellipsoidVisual);
+
 //! [white material]
   // create white material
   MaterialPtr white = _scene->CreateMaterial();

diff --git a/include/ignition/rendering/ArrowVisual.hh b/include/ignition/rendering/ArrowVisual.hh
@@ -31,7 +31,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE ArrowVisual :
       public virtual CompositeVisual
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~ArrowVisual() { }
 
       /// \brief Get arrow-head visual

diff --git a/include/ignition/rendering/AxisVisual.hh b/include/ignition/rendering/AxisVisual.hh
@@ -31,7 +31,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE AxisVisual :
       public virtual CompositeVisual
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~AxisVisual() { }
 
       /// \brief set true to show the axis heads, false otherwise

diff --git a/include/ignition/rendering/Camera.hh b/include/ignition/rendering/Camera.hh
@@ -44,7 +44,7 @@ namespace ignition
       public: typedef std::function<void(const void*, unsigned int,
           unsigned int, unsigned int, const std::string&)> NewFrameListener;
 
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~Camera() { }
 
       /// \brief Get the image width in pixels

diff --git a/include/ignition/rendering/CompositeVisual.hh b/include/ignition/rendering/CompositeVisual.hh
@@ -32,7 +32,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE CompositeVisual :
       public virtual Visual
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~CompositeVisual() { }
     };
     }

diff --git a/include/ignition/rendering/Geometry.hh b/include/ignition/rendering/Geometry.hh
@@ -34,7 +34,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE Geometry :
       public virtual Object
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~Geometry() { }
 
       /// \brief Determine if this Geometry is attached to a Visual

diff --git a/include/ignition/rendering/Image.hh b/include/ignition/rendering/Image.hh
@@ -48,7 +48,7 @@ namespace ignition
       public: Image(unsigned int _width, unsigned int _height,
                   PixelFormat _format);
 
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: ~Image();
 
       /// \brief Get image width in pixels

diff --git a/include/ignition/rendering/Light.hh b/include/ignition/rendering/Light.hh
@@ -32,7 +32,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE Light :
       public virtual Node
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~Light() { }
 
       /// \brief Get the diffuse color
@@ -144,7 +144,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE PointLight :
       public virtual Light
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~PointLight() { }
     };
 
@@ -153,7 +153,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE SpotLight :
       public virtual Light
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~SpotLight() { }
 
       /// \brief Get direction of the light

diff --git a/include/ignition/rendering/Material.hh b/include/ignition/rendering/Material.hh
@@ -47,7 +47,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE Material :
       public virtual Object
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~Material() { }
 
       /// \brief Determine if lighting affects this material

diff --git a/include/ignition/rendering/Mesh.hh b/include/ignition/rendering/Mesh.hh
@@ -126,7 +126,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE SubMesh :
       public virtual Object
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~SubMesh() { }
 
       /// \brief Get the currently assigned material

diff --git a/include/ignition/rendering/Node.hh b/include/ignition/rendering/Node.hh
@@ -37,7 +37,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE Node :
       public virtual Object
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~Node() { }
 
       /// \brief Determine if this Node is attached to another Node.

diff --git a/include/ignition/rendering/OrbitViewController.hh b/include/ignition/rendering/OrbitViewController.hh
@@ -42,13 +42,13 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE OrbitViewController
         : public virtual ViewController
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: OrbitViewController();
 
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: explicit OrbitViewController(const CameraPtr &_camera);
 
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~OrbitViewController();
 
       /// \brief Set the camera that will be controlled by this view controller.

diff --git a/include/ignition/rendering/RenderEngine.hh b/include/ignition/rendering/RenderEngine.hh
@@ -35,7 +35,7 @@ namespace ignition
     /// creating, storing, and destroying scenes.
     class IGNITION_RENDERING_VISIBLE RenderEngine
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~RenderEngine() { }
 
       /// \brief Load any necessary resources to set up render-engine. This

diff --git a/include/ignition/rendering/RenderEngineManager.hh b/include/ignition/rendering/RenderEngineManager.hh
@@ -49,7 +49,7 @@ namespace ignition
       /// \brief Constructor
       public: RenderEngineManager();
 
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: ~RenderEngineManager();
 
       /// \brief Get the number of available render-engines

diff --git a/include/ignition/rendering/RenderTarget.hh b/include/ignition/rendering/RenderTarget.hh
@@ -103,7 +103,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE RenderTexture :
       public virtual RenderTarget
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~RenderTexture() { }
 
       /// \brief Returns the OpenGL texture Id. A valid Id is returned only
@@ -119,7 +119,7 @@ namespace ignition
     class IGNITION_RENDERING_VISIBLE RenderWindow :
       public virtual RenderTarget
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~RenderWindow() { }
 
       /// \brief Get the window handle that the render window is attached to.

diff --git a/include/ignition/rendering/Scene.hh b/include/ignition/rendering/Scene.hh
@@ -48,7 +48,7 @@ namespace ignition
     /// factory for all scene objects.
     class IGNITION_RENDERING_VISIBLE Scene
     {
-      /// \brief Deconstructor
+      /// \brief Destructor
       public: virtual ~Scene() { }
 
       /// \brief Load scene-specific resources
@@ -868,7 +868,9 @@ namespace ignition
       /// \return The created plane
       public: virtual GeometryPtr CreatePlane() = 0;
 
-      /// \brief Create new sphere geometry
+      /// \brief Create new sphere or ellipsoid geometry
+      /// This method allow to create ellipsoid too, because it can be scaled
+      /// in 3 dimensions.
       /// \return The created sphere
       public: virtual GeometryPtr CreateSphere() = 0;