4 ➡️ 5

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Jan 28, 2021 · 55498bf · 55498bf
2 parents 821dd9d + a5f00f9
commit 55498bf
Show file tree

Hide file tree

Showing 82 changed files with 670 additions and 255 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -9,7 +9,18 @@
 
 ### Ignition Rendering 4.X
 
-### Ignition Rendering 4.X.X (20XX-XX-XX)
+### Ignition Rendering 4.2.0 (2021-01-22)
+
+1. Remove some windows warnings.
+    * [Pull request #183](https://github.com/ignitionrobotics/ign-rendering/pull/183)
+
+1. Fix transparency issue for textures without alpha channel.
+    * [Pull request #186](https://github.com/ignitionrobotics/ign-rendering/pull/186)
+
+1. Call XCloseDisplay in screenScalingFactor.
+    * [Pull request #204](https://github.com/ignitionrobotics/ign-rendering/pull/204)
+
+1. All changes up to version 3.3.0.
 
 ### Ignition Rendering 4.1.0 (2020-11-04)
 
@@ -106,6 +117,23 @@
 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.3.0 (2021-01-22)
+
+1. Add Windows installation.
+    * [Pull request 196](https://github.com/ignitionrobotics/ign-rendering/pull/196)
+
+1. Make flaky VisualAt test more verbose.
+    * [Pull request 174](https://github.com/ignitionrobotics/ign-rendering/pull/174)
+
+1. Resolve updated codecheck issues.
+    * [Pull request 173](https://github.com/ignitionrobotics/ign-rendering/pull/173)
+
+1. Fix crash due to NaN pose values.
+    * [Pull request 169](https://github.com/ignitionrobotics/ign-rendering/pull/169)
+
+1. Improve fork experience.
+    * [Pull request 165](https://github.com/ignitionrobotics/ign-rendering/pull/165)
+
 ### Ignition Rendering 3.2.0 (2020-10-13)
 
 1. Add Custom Render Engine support

diff --git a/README.md b/README.md
@@ -30,10 +30,6 @@ of libraries designed to rapidly develop robot applications.
 
 [Usage](#usage)
 
-[Documentation](#documentation)
-
-[Testing](#testing)
-
 [Folder Structure](#folder-structure)
 
 [Code of Conduct](#code-of-conduct)
@@ -57,37 +53,11 @@ See the [installation tutorial](https://ignitionrobotics.org/api/rendering/4.0/i
 # Usage
 
 The Ign Rendering API can be found in the documentation. See the
-[Documentation](#documentation) section on how to build the
-documentation files using Doxygen.
+[installation tutorial](https://ignitionrobotics.org/api/rendering/4.0/installation.html)
+on how to build the documentation files using Doxygen.
 
 You can also take a look at the sample applications in the `examples` folder.
 
-# Documentation
-
-API documentation can be generated using Doxygen
-
-    sudo apt install -y doxygen
-
-Build documentation
-
-    cd build
-    make doc
-
-View documentation
-
-    firefox doxygen/html/index.html
-
-# Testing
-
-Tests can be run by building the `test` target:
-
-    cd build
-    make test
-
-To run tests specific to a render engine, set the `RENDER_ENGINE_VALUES` environment variable, e.g.
-
-    RENDER_ENGINE_VALUES=ogre2 make test
-
 # Folder Structure
 
 * `include/ignition/rendering`: Contains all the public header files which will be installed

diff --git a/examples/actor_animation/GlutWindow.cc b/examples/actor_animation/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/camera_tracking/GlutWindow.cc b/examples/camera_tracking/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/custom_scene_viewer/DemoWindow.cc b/examples/custom_scene_viewer/DemoWindow.cc
@@ -18,13 +18,13 @@
 #if defined(__APPLE__)
   #include <OpenGL/gl.h>
   #include <GLUT/glut.h>
-#elif not defined(_WIN32)
+#elif !defined(_WIN32)
   #include <GL/glew.h>
   #include <GL/gl.h>
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/gazebo_scene_viewer/CameraWindow.cc b/examples/gazebo_scene_viewer/CameraWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/mesh_viewer/GlutWindow.cc b/examples/mesh_viewer/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/mouse_picking/GlutWindow.cc b/examples/mouse_picking/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/ogre2_demo/GlutWindow.cc b/examples/ogre2_demo/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/render_pass/GlutWindow.cc b/examples/render_pass/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/simple_demo/GlutWindow.cc b/examples/simple_demo/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/text_geom/GlutWindow.cc b/examples/text_geom/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/thermal_camera/GlutWindow.cc b/examples/thermal_camera/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/transform_control/GlutWindow.cc b/examples/transform_control/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/examples/view_control/GlutWindow.cc b/examples/view_control/GlutWindow.cc
@@ -25,7 +25,7 @@
   #include <GL/glut.h>
 #endif
 
-#if not defined(__APPLE__) && not defined(_WIN32)
+#if !defined(__APPLE__) && !defined(_WIN32)
   #include <GL/glx.h>
 #endif
 

diff --git a/include/ignition/rendering/MeshDescriptor.hh b/include/ignition/rendering/MeshDescriptor.hh
@@ -63,7 +63,6 @@ namespace ignition
       IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief common::Mesh object
       public: const common::Mesh *mesh = nullptr;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
 
       IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Name of the registered Mesh

diff --git a/include/ignition/rendering/RayQuery.hh b/include/ignition/rendering/RayQuery.hh
@@ -17,6 +17,7 @@
 #ifndef IGNITION_RENDERING_RAYQUERY_HH_
 #define IGNITION_RENDERING_RAYQUERY_HH_
 
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/math/Vector3.hh>
 
 #include "ignition/rendering/config.hh"
@@ -37,7 +38,9 @@ namespace ignition
       public: double distance = -1;
 
       /// \brief Intersection point in 3d space
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       public: math::Vector3d point;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
 
       /// \brief Intersected object id
       public: unsigned int objectId = 0;

diff --git a/include/ignition/rendering/RenderEnginePlugin.hh b/include/ignition/rendering/RenderEnginePlugin.hh
@@ -21,6 +21,8 @@
 #include <memory>
 #include <string>
 
+#include <ignition/common/SuppressWarning.hh>
+
 #include "ignition/rendering/config.hh"
 #include "ignition/rendering/Export.hh"
 
@@ -52,7 +54,9 @@ namespace ignition
       public: virtual RenderEngine *Engine() const = 0;
 
       /// \brief Pointer to private data class
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       public: std::unique_ptr<RenderEnginePluginPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

diff --git a/include/ignition/rendering/RenderPassSystem.hh b/include/ignition/rendering/RenderPassSystem.hh
@@ -22,6 +22,8 @@
 #include <string>
 #include <typeinfo>
 
+#include <ignition/common/SuppressWarning.hh>
+
 #include "ignition/rendering/config.hh"
 #include "ignition/rendering/Export.hh"
 #include "ignition/rendering/RenderPass.hh"
@@ -78,11 +80,13 @@ namespace ignition
       private: RenderPassPtr CreateImpl(const std::string &_type);
 
       /// \brief A map of render pass type id name to its factory class
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       private: static std::map<std::string, RenderPassFactory *> renderPassMap;
 
       /// \internal
       /// \brief Pointer to private data class
       private: std::unique_ptr<RenderPassSystemPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
 
     /// \brief Render pass registration macro

diff --git a/include/ignition/rendering/ShaderParam.hh b/include/ignition/rendering/ShaderParam.hh
@@ -21,6 +21,8 @@
 #include <cstdint>
 #include <memory>
 
+#include <ignition/common/SuppressWarning.hh>
+
 #include "ignition/rendering/config.hh"
 #include "ignition/rendering/Export.hh"
 
@@ -86,7 +88,9 @@ namespace ignition
       public: bool Value(int *_value) const;
 
       /// \brief private implementation
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       private: std::unique_ptr<ShaderParamPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

diff --git a/include/ignition/rendering/TransformController.hh b/include/ignition/rendering/TransformController.hh
@@ -19,6 +19,8 @@
 
 #include <memory>
 
+#include <ignition/common/SuppressWarning.hh>
+
 #include <ignition/math/Quaternion.hh>
 #include <ignition/math/Plane.hh>
 #include <ignition/math/Vector3.hh>
@@ -210,7 +212,9 @@ namespace ignition
           const math::Planed &_plane, math::Vector3d &_result);
 
       /// \brief Private data pointer
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       public: std::unique_ptr<TransformControllerPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

diff --git a/include/ignition/rendering/base/BaseCamera.hh b/include/ignition/rendering/base/BaseCamera.hh
@@ -24,6 +24,7 @@
 
 #include <ignition/common/Event.hh>
 #include <ignition/common/Console.hh>
+#include <ignition/common/SuppressWarning.hh>
 
 #include "ignition/rendering/Camera.hh"
 #include "ignition/rendering/Image.hh"
@@ -185,6 +186,7 @@ namespace ignition
 
       protected: virtual RenderTargetPtr RenderTarget() const = 0;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       protected: common::EventT<void(const void *, unsigned int, unsigned int,
                      unsigned int, const std::string &)> newFrameEvent;
 
@@ -221,6 +223,7 @@ namespace ignition
 
       /// \brief Target node to follow
       protected: NodePtr followNode;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
 
       /// \brief Follow target in world frame.
       protected: bool followWorldFrame = false;

diff --git a/include/ignition/rendering/base/BaseDepthCamera.hh b/include/ignition/rendering/base/BaseDepthCamera.hh
@@ -30,7 +30,7 @@ namespace ignition
   {
     inline namespace IGNITION_RENDERING_VERSION_NAMESPACE {
     template <class T>
-    class IGNITION_RENDERING_VISIBLE BaseDepthCamera :
+    class BaseDepthCamera :
       public virtual DepthCamera,
       public virtual BaseCamera<T>,
       public virtual T