3 ➡️ 4 (#213)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Jan 28, 2021 · a5f00f9 · a5f00f9
2 parents 27f9977 + 530014b
commit a5f00f9
Show file tree

Hide file tree

Showing 73 changed files with 406 additions and 141 deletions.
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

diff --git a/include/ignition/rendering/base/BaseGizmoVisual.hh b/include/ignition/rendering/base/BaseGizmoVisual.hh
@@ -21,6 +21,7 @@
 #include <map>
 #include <string>
 #include <ignition/common/MeshManager.hh>
+#include <ignition/common/SuppressWarning.hh>
 
 #include "ignition/rendering/base/BaseScene.hh"
 #include "ignition/rendering/base/BaseNode.hh"
@@ -92,6 +93,7 @@ namespace ignition
       /// \brief Current gizmo mode
       protected: TransformMode mode = TransformMode::TM_NONE;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief A map of gizmo axis and their visuals
       protected: std::map<unsigned int, VisualPtr> visuals;
 
@@ -109,6 +111,7 @@ namespace ignition
 
       /// \brief A map of axis enums to materials
       protected: std::map<unsigned int, MaterialPtr> materials;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
 
       /// \brief Material used by axes
       protected: enum AxisMaterial
@@ -531,15 +534,21 @@ namespace ignition
       common::MeshManager *meshMgr = common::MeshManager::Instance();
       std::string rotMeshName = "gizmo_rotate";
       if (!meshMgr->HasMesh(rotMeshName))
-        meshMgr->CreateTube(rotMeshName, 1.0, 1.02, 0.02, 1, 64, IGN_PI);
+        meshMgr->CreateTube(rotMeshName, 1.0f, 1.02f, 0.02f, 1, 64, IGN_PI);
 
       std::string rotFullMeshName = "gizmo_rotate_full";
       if (!meshMgr->HasMesh(rotFullMeshName))
-        meshMgr->CreateTube(rotFullMeshName, 1.0, 1.02, 0.02, 1, 64, 2*IGN_PI);
+      {
+        meshMgr->CreateTube(rotFullMeshName, 1.0f, 1.02f, 0.02f, 1, 64,
+            2 * IGN_PI);
+      }
 
       std::string rotHandleMeshName = "gizmo_rotate_handle";
       if (!meshMgr->HasMesh(rotHandleMeshName))
-        meshMgr->CreateTube(rotHandleMeshName, 0.95, 1.07, 0.1, 1, 64, IGN_PI);
+      {
+        meshMgr->CreateTube(rotHandleMeshName, 0.95f, 1.07f, 0.1f, 1, 64,
+            IGN_PI);
+      }
 
       VisualPtr rotVis = this->Scene()->CreateVisual();
 

diff --git a/include/ignition/rendering/base/BaseLidarVisual.hh b/include/ignition/rendering/base/BaseLidarVisual.hh
@@ -462,7 +462,7 @@ namespace ignition
         mtl->SetCastShadows(false);
         mtl->SetReceiveShadows(false);
         mtl->SetLightingEnabled(false);
-        mtl->SetMetalness(0.0);
+        mtl->SetMetalness(0.0f);
         mtl->SetReflectivity(0.0);
       }
 
@@ -476,7 +476,7 @@ namespace ignition
         mtl->SetCastShadows(false);
         mtl->SetReceiveShadows(false);
         mtl->SetLightingEnabled(false);
-        mtl->SetMetalness(0.0);
+        mtl->SetMetalness(0.0f);
         mtl->SetReflectivity(0.0);
       }
 
@@ -490,7 +490,7 @@ namespace ignition
         mtl->SetCastShadows(false);
         mtl->SetReceiveShadows(false);
         mtl->SetLightingEnabled(false);
-        mtl->SetMetalness(0.5);
+        mtl->SetMetalness(0.5f);
         mtl->SetReflectivity(0.2);
       }
 
@@ -505,7 +505,7 @@ namespace ignition
         mtl->SetCastShadows(false);
         mtl->SetReceiveShadows(false);
         mtl->SetLightingEnabled(false);
-        mtl->SetMetalness(0.1);
+        mtl->SetMetalness(0.1f);
         mtl->SetReflectivity(0.2);
       }
       return;

diff --git a/include/ignition/rendering/base/BaseMarker.hh b/include/ignition/rendering/base/BaseMarker.hh
@@ -17,6 +17,8 @@
 #ifndef IGNITION_RENDERING_BASEMARKER_HH_
 #define IGNITION_RENDERING_BASEMARKER_HH_
 
+#include <ignition/common/SuppressWarning.hh>
+
 #include "ignition/rendering/Marker.hh"
 #include "ignition/rendering/base/BaseObject.hh"
 #include "ignition/rendering/base/BaseRenderTypes.hh"
@@ -81,8 +83,10 @@ namespace ignition
                   const ignition::math::Vector3d &_value) override;
 
       /// \brief Life time of a marker
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       protected: std::chrono::steady_clock::duration lifetime =
           std::chrono::steady_clock::duration::zero();
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
 
       /// \brief Layer at which the marker will reside
       protected: int32_t layer = 0;

diff --git a/include/ignition/rendering/base/BaseObject.hh b/include/ignition/rendering/base/BaseObject.hh
@@ -19,6 +19,7 @@
 
 #include <map>
 #include <string>
+#include <ignition/common/SuppressWarning.hh>
 #include "ignition/rendering/Object.hh"
 
 namespace ignition
@@ -28,7 +29,9 @@ namespace ignition
     inline namespace IGNITION_RENDERING_VERSION_NAMESPACE {
     //
     class IGNITION_RENDERING_VISIBLE BaseObject :
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       public virtual std::enable_shared_from_this<BaseObject>,
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
       public virtual Object
     {
       protected: BaseObject();
@@ -56,7 +59,9 @@ namespace ignition
 
       protected: unsigned int id;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       protected: std::string name;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }