Replace ign common plugin loader with ign-plugin

include/ignition/sensors/AirPressureSensor.hh

@@ -21,6 +21,7 @@
 
 #include <sdf/sdf.hh>
 
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 
 #include <ignition/sensors/config.hh>
@@ -84,9 +85,11 @@ namespace ignition
       /// \return Verical reference position in meters
       public: double ReferenceAltitude() const;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<AirPressureSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/AltimeterSensor.hh

@@ -21,6 +21,7 @@
 
 #include <sdf/sdf.hh>
 
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 
 #include <ignition/sensors/config.hh>
@@ -101,9 +102,11 @@ namespace ignition
       /// \return Vertical velocity in meters per second
       public: double VerticalVelocity() const;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<AltimeterSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/CameraSensor.hh

@@ -23,10 +23,18 @@
 
 #include <sdf/sdf.hh>
 
-#include <ignition/common/PluginMacros.hh>
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4005)
+#endif
 #include <ignition/msgs.hh>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include <ignition/rendering/Camera.hh>
 
 #include "ignition/sensors/camera/Export.hh"
@@ -162,9 +170,11 @@ namespace ignition
       /// \param[in] _scene Pointer to the new scene.
       private: void OnSceneChange(ignition::rendering::ScenePtr /*_scene*/);
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<CameraSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/DepthCameraSensor.hh

@@ -24,11 +24,17 @@
 #include <sdf/sdf.hh>
 
 #include <ignition/common/Event.hh>
-
-#include <ignition/common/PluginMacros.hh>
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4005)
+#endif
 #include <ignition/msgs.hh>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #include <ignition/rendering/DepthCamera.hh>
 
@@ -158,9 +164,12 @@ namespace ignition
       private: void OnSceneChange(ignition::rendering::ScenePtr /*_scene*/)
               { }
 
+
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<DepthCameraSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/GpuLidarSensor.hh

@@ -22,6 +22,8 @@
 
 #include <sdf/sdf.hh>
 
+#include <ignition/common/SuppressWarning.hh>
+
 #include <ignition/rendering/GpuRays.hh>
 
 #include "ignition/sensors/gpu_lidar/Export.hh"
@@ -123,9 +125,11 @@ namespace ignition
                   unsigned int _heighti, unsigned int _channels,
                   const std::string &/*_format*/)> _subscriber) override;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<GpuLidarSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/ImuSensor.hh

@@ -21,6 +21,7 @@
 
 #include <sdf/sdf.hh>
 
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 #include <ignition/math/Pose3.hh>
 
@@ -128,9 +129,11 @@ namespace ignition
       /// \return Gravity vectory in meters per second squared.
       public: math::Vector3d Gravity() const;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<ImuSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/Lidar.hh

@@ -21,6 +21,7 @@
 #include <string>
 #include <vector>
 
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Event.hh>
 
 #include "ignition/sensors/lidar/Export.hh"
@@ -242,8 +243,10 @@ namespace ignition
       // Documentation inherited
       public: virtual bool IsActive() const;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Just a mutex for thread safety
       public: mutable std::mutex lidarMutex;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
 
       /// \brief Raw buffer of laser data.
       public: float *laserBuffer = nullptr;
@@ -263,9 +266,11 @@ namespace ignition
                   unsigned int _heighti, unsigned int _channels,
                   const std::string &/*_format*/)> _subscriber);
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<LidarPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/LogicalCameraSensor.hh

@@ -23,12 +23,20 @@
 
 #include <sdf/sdf.hh>
 
-#include <ignition/common/PluginMacros.hh>
+#include <ignition/plugin/RegisterMore.hh>
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 
 #include <ignition/math/Angle.hh>
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4005)
+#endif
 #include <ignition/msgs.hh>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #include "ignition/sensors/config.hh"
 #include "ignition/sensors/Export.hh"
@@ -110,9 +118,11 @@ namespace ignition
       /// \return List of detected models.
       public: msgs::LogicalCameraImage Image() const;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<LogicalCameraSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/MagnetometerSensor.hh

@@ -21,6 +21,7 @@
 
 #include <sdf/sdf.hh>
 
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 #include <ignition/math/Pose3.hh>
 
@@ -97,9 +98,11 @@ namespace ignition
       /// \return Magnetic field vector in body frame
       public: math::Vector3d MagneticField() const;
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<MagnetometerSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/Manager.hh

@@ -22,6 +22,7 @@
 #include <type_traits>
 #include <vector>
 #include <sdf/sdf.hh>
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 #include <ignition/common/Console.hh>
 #include <ignition/sensors/config.hh>
@@ -153,6 +154,14 @@ namespace ignition
       /// is returned on erro.
       public: ignition::sensors::SensorId CreateSensor(sdf::ElementPtr _sdf);
 
+      /// \brief Add a sensor from a sensor instance.
+      /// \sa Sensor()
+      /// \param[in] _sensor pointer to the sensor
+      /// \return A sensor id that refers to the created sensor. NO_SENSOR
+      /// is returned on error.
+      public: ignition::sensors::SensorId AddSensor(
+        std::unique_ptr<sensors::Sensor> _sensor);
+
       /// \brief Create a sensor from SDF without a known sensor type.
       ///
       ///   This creates sensors by looking at the given sdf element.
@@ -207,8 +216,10 @@ namespace ignition
       private: ignition::sensors::SensorId LoadSensorPlugin(
                    const std::string &_filename, sdf::ElementPtr _sdf);
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief private data pointer
       private: std::unique_ptr<ManagerPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/RenderingEvents.hh

@@ -19,6 +19,7 @@
 #define IGNITION_SENSORS_RENDERINGEVENTS_HH_
 
 #include <ignition/common/Event.hh>
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/rendering/Scene.hh>
 #include <ignition/sensors/config.hh>
 #include <ignition/sensors/rendering/Export.hh>
@@ -43,10 +44,12 @@ namespace ignition
                   std::function<void(const ignition::rendering::ScenePtr &)>
                   _callback);
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Event that is used to trigger callbacks when the scene
       /// is changed
       public: static ignition::common::EventT<
               void(const ignition::rendering::ScenePtr &)> sceneEvent;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/RenderingSensor.hh

@@ -19,6 +19,8 @@
 
 #include <memory>
 
+#include <ignition/common/SuppressWarning.hh>
+
 #include <ignition/rendering/Scene.hh>
 #include <ignition/rendering/Sensor.hh>
 
@@ -76,9 +78,11 @@ namespace ignition
       /// \param[in] _sensor Sensor to add.
       protected: void AddSensor(rendering::SensorPtr _sensor);
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \internal
       /// \brief Data pointer for private data
       private: std::unique_ptr<RenderingSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/RgbdCameraSensor.hh

@@ -21,6 +21,7 @@
 
 #include <sdf/sdf.hh>
 
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 
 #include "ignition/sensors/CameraSensor.hh"
@@ -62,6 +63,11 @@ namespace ignition
       /// \return true if loading was successful
       public: virtual bool Load(const sdf::Sensor &_sdf) override;
 
+      /// \brief Load the sensor with SDF parameters.
+      /// \param[in] _sdf SDF Sensor parameters.
+      /// \return true if loading was successful
+      public: virtual bool Load(sdf::ElementPtr _sdf) override;
+
       /// \brief Initialize values in the sensor
       /// \return True on success
       public: virtual bool Init() override;
@@ -95,9 +101,11 @@ namespace ignition
       /// \return True on success.
       private: bool CreateCameras();
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Data pointer for private data
       /// \internal
       private: std::unique_ptr<RgbdCameraSensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }

include/ignition/sensors/Sensor.hh

@@ -17,11 +17,19 @@
 #ifndef IGNITION_SENSORS_SENSOR_HH_
 #define IGNITION_SENSORS_SENSOR_HH_
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4005)
+#endif
 #include <ignition/msgs/header.pb.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #include <memory>
 #include <string>
 
+#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/Time.hh>
 #include <ignition/math/Pose3.hh>
 #include <ignition/sensors/config.hh>
@@ -210,9 +218,11 @@ namespace ignition
       public: void AddSequence(ignition::msgs::Header *_msg,
                   const std::string &_seqKey = "default");
 
+      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \internal
       /// \brief Data pointer for private data
       private: std::unique_ptr<SensorPrivate> dataPtr;
+      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
     };
     }
   }