Migrate sources in src, test, examples, and include (#221)

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · May 11, 2022 · c4ea4f6 · c4ea4f6
1 parent 9e1c5db
commit c4ea4f6
Show file tree

Hide file tree

Showing 53 changed files with 277 additions and 260 deletions.
diff --git a/examples/custom_sensor/Odometer.cc b/examples/custom_sensor/Odometer.cc
@@ -17,11 +17,11 @@
 
 #include <math.h>
 
-#include <ignition/msgs/double.pb.h>
+#include <gz/msgs/double.pb.h>
 
-#include <ignition/common/Console.hh>
-#include <ignition/sensors/Noise.hh>
-#include <ignition/sensors/Util.hh>
+#include <gz/common/Console.hh>
+#include <gz/sensors/Noise.hh>
+#include <gz/sensors/Util.hh>
 
 #include "Odometer.hh"
 

diff --git a/examples/custom_sensor/Odometer.hh b/examples/custom_sensor/Odometer.hh
@@ -17,9 +17,9 @@
 #ifndef ODOMETER_HH_
 #define ODOMETER_HH_
 
-#include <ignition/sensors/Sensor.hh>
-#include <ignition/sensors/SensorTypes.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/sensors/Sensor.hh>
+#include <gz/sensors/SensorTypes.hh>
+#include <gz/transport/Node.hh>
 
 namespace custom
 {

diff --git a/examples/imu_noise/main.cc b/examples/imu_noise/main.cc
@@ -20,9 +20,9 @@
 
 #include <sdf/sdf.hh>
 
-#include <ignition/sensors/Noise.hh>
-#include <ignition/sensors/GaussianNoiseModel.hh>
-#include <ignition/sensors/SensorFactory.hh>
+#include <gz/sensors/Noise.hh>
+#include <gz/sensors/GaussianNoiseModel.hh>
+#include <gz/sensors/SensorFactory.hh>
 
 static constexpr double kSampleFrequency = 100.0;
 // 16-bit ADC

diff --git a/examples/loop_sensor/main.cc b/examples/loop_sensor/main.cc
@@ -19,12 +19,12 @@
 
 #include <sdf/Sensor.hh>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/SignalHandler.hh>
-#include <ignition/sensors/Manager.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/SignalHandler.hh>
+#include <gz/sensors/Manager.hh>
 
 // Include all supported sensors
-#include <ignition/sensors/AltimeterSensor.hh>
+#include <gz/sensors/AltimeterSensor.hh>
 #include "../custom_sensor/Odometer.hh"
 
 using namespace std::literals::chrono_literals;

diff --git a/examples/save_image/main.cc b/examples/save_image/main.cc
@@ -21,26 +21,26 @@
 #include <sdf/Noise.hh>
 #include <sdf/Sensor.hh>
 
-#include <ignition/common/Image.hh>
-#include <ignition/common/Console.hh>
-#include <ignition/math/Helpers.hh>
+#include <gz/common/Image.hh>
+#include <gz/common/Console.hh>
+#include <gz/math/Helpers.hh>
 
 // TODO(louise) Remove these pragmas once ign-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)
 #pragma warning(disable: 4251)
 #endif
-#include <ignition/rendering/Material.hh>
-#include <ignition/rendering/RenderEngine.hh>
-#include <ignition/rendering/RenderingIface.hh>
-#include <ignition/rendering/Scene.hh>
-#include <ignition/rendering/Visual.hh>
+#include <gz/rendering/Material.hh>
+#include <gz/rendering/RenderEngine.hh>
+#include <gz/rendering/RenderingIface.hh>
+#include <gz/rendering/Scene.hh>
+#include <gz/rendering/Visual.hh>
 #ifdef _WIN32
 #pragma warning(pop)
 #endif
 
-#include <ignition/sensors.hh>
+#include <gz/sensors.hh>
 
 void OnImageFrame(const ignition::msgs::Image &_image)
 {

diff --git a/include/gz/sensors/AirPressureSensor.hh b/include/gz/sensors/AirPressureSensor.hh
@@ -14,19 +14,19 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_SENSORS_AIRPRESSURESENSOR_HH_
-#define IGNITION_SENSORS_AIRPRESSURESENSOR_HH_
+#ifndef GZ_SENSORS_AIRPRESSURESENSOR_HH_
+#define GZ_SENSORS_AIRPRESSURESENSOR_HH_
 
 #include <memory>
 
 #include <sdf/sdf.hh>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
-#include <ignition/sensors/config.hh>
-#include <ignition/sensors/air_pressure/Export.hh>
+#include <gz/sensors/config.hh>
+#include <gz/sensors/air_pressure/Export.hh>
 
-#include "ignition/sensors/Sensor.hh"
+#include "gz/sensors/Sensor.hh"
 
 namespace ignition
 {

diff --git a/include/gz/sensors/AltimeterSensor.hh b/include/gz/sensors/AltimeterSensor.hh
@@ -14,19 +14,19 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_SENSORS_ALTIMETERSENSOR_HH_
-#define IGNITION_SENSORS_ALTIMETERSENSOR_HH_
+#ifndef GZ_SENSORS_ALTIMETERSENSOR_HH_
+#define GZ_SENSORS_ALTIMETERSENSOR_HH_
 
 #include <memory>
 
 #include <sdf/sdf.hh>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
-#include <ignition/sensors/config.hh>
-#include <ignition/sensors/altimeter/Export.hh>
+#include <gz/sensors/config.hh>
+#include <gz/sensors/altimeter/Export.hh>
 
-#include "ignition/sensors/Sensor.hh"
+#include "gz/sensors/Sensor.hh"
 
 namespace ignition
 {

diff --git a/include/gz/sensors/BrownDistortionModel.hh b/include/gz/sensors/BrownDistortionModel.hh
@@ -15,15 +15,15 @@
  *
 */
 
-#ifndef IGNITION_SENSORS_BROWNDISTORTIONMODEL_HH_
-#define IGNITION_SENSORS_BROWNDISTORTIONMODEL_HH_
+#ifndef GZ_SENSORS_BROWNDISTORTIONMODEL_HH_
+#define GZ_SENSORS_BROWNDISTORTIONMODEL_HH_
 
 #include <sdf/sdf.hh>
 
-#include "ignition/sensors/Distortion.hh"
-#include "ignition/sensors/Export.hh"
-#include "ignition/sensors/config.hh"
-#include "ignition/utils/ImplPtr.hh"
+#include "gz/sensors/Distortion.hh"
+#include "gz/sensors/Export.hh"
+#include "gz/sensors/config.hh"
+#include "gz/utils/ImplPtr.hh"
 
 namespace ignition
 {
@@ -36,7 +36,7 @@ namespace ignition
     class BrownDistortionModelPrivate;
 
     /** \class BrownDistortionModel BrownDistortionModel.hh \
-    ignition/sensors/BrownDistortionModel.hh
+    gz/sensors/BrownDistortionModel.hh
     **/
     /// \brief Brown Distortion Model class
     class IGNITION_SENSORS_VISIBLE BrownDistortionModel : public Distortion

diff --git a/include/gz/sensors/CameraSensor.hh b/include/gz/sensors/CameraSensor.hh
@@ -14,23 +14,23 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_SENSORS_CAMERASENSOR_HH_
-#define IGNITION_SENSORS_CAMERASENSOR_HH_
+#ifndef GZ_SENSORS_CAMERASENSOR_HH_
+#define GZ_SENSORS_CAMERASENSOR_HH_
 
 #include <cstdint>
 #include <memory>
 #include <string>
 
 #include <sdf/sdf.hh>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
 #ifdef _WIN32
 #pragma warning(push)
 #pragma warning(disable: 4005)
 #pragma warning(disable: 4251)
 #endif
-#include <ignition/msgs.hh>
+#include <gz/msgs.hh>
 #ifdef _WIN32
 #pragma warning(pop)
 #endif
@@ -41,15 +41,15 @@
 #pragma warning(push)
 #pragma warning(disable: 4251)
 #endif
-#include <ignition/rendering/Camera.hh>
+#include <gz/rendering/Camera.hh>
 #ifdef _WIN32
 #pragma warning(pop)
 #endif
 
-#include "ignition/sensors/camera/Export.hh"
-#include "ignition/sensors/config.hh"
-#include "ignition/sensors/Export.hh"
-#include "ignition/sensors/RenderingSensor.hh"
+#include "gz/sensors/camera/Export.hh"
+#include "gz/sensors/config.hh"
+#include "gz/sensors/Export.hh"
+#include "gz/sensors/RenderingSensor.hh"
 
 namespace ignition
 {

diff --git a/include/gz/sensors/DepthCameraSensor.hh b/include/gz/sensors/DepthCameraSensor.hh
@@ -14,24 +14,24 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_SENSORS_DEPTHCAMERASENSOR_HH_
-#define IGNITION_SENSORS_DEPTHCAMERASENSOR_HH_
+#ifndef GZ_SENSORS_DEPTHCAMERASENSOR_HH_
+#define GZ_SENSORS_DEPTHCAMERASENSOR_HH_
 
 #include <memory>
 #include <cstdint>
 #include <string>
 
 #include <sdf/sdf.hh>
 
-#include <ignition/common/Event.hh>
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/common/Event.hh>
+#include <gz/utils/SuppressWarning.hh>
 
 #ifdef _WIN32
 #pragma warning(push)
 #pragma warning(disable: 4005)
 #pragma warning(disable: 4251)
 #endif
-#include <ignition/msgs.hh>
+#include <gz/msgs.hh>
 #ifdef _WIN32
 #pragma warning(pop)
 #endif
@@ -42,15 +42,15 @@
 #pragma warning(push)
 #pragma warning(disable: 4251)
 #endif
-#include <ignition/rendering/DepthCamera.hh>
+#include <gz/rendering/DepthCamera.hh>
 #ifdef _WIN32
 #pragma warning(pop)
 #endif
 
-#include "ignition/sensors/depth_camera/Export.hh"
-#include "ignition/sensors/CameraSensor.hh"
-#include "ignition/sensors/Export.hh"
-#include "ignition/sensors/Sensor.hh"
+#include "gz/sensors/depth_camera/Export.hh"
+#include "gz/sensors/CameraSensor.hh"
+#include "gz/sensors/Export.hh"
+#include "gz/sensors/Sensor.hh"
 
 namespace ignition
 {

diff --git a/include/gz/sensors/Distortion.hh b/include/gz/sensors/Distortion.hh
@@ -15,17 +15,17 @@
  *
 */
 
-#ifndef IGNITION_SENSORS_DISTORTION_HH_
-#define IGNITION_SENSORS_DISTORTION_HH_
+#ifndef GZ_SENSORS_DISTORTION_HH_
+#define GZ_SENSORS_DISTORTION_HH_
 
 #include <functional>
 #include <string>
 #include <vector>
 
-#include <ignition/sensors/Export.hh>
-#include <ignition/sensors/SensorTypes.hh>
-#include <ignition/sensors/config.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/sensors/Export.hh>
+#include <gz/sensors/SensorTypes.hh>
+#include <gz/sensors/config.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include <sdf/sdf.hh>
 
@@ -38,7 +38,7 @@ namespace ignition
     // Forward declarations
     class DistortionPrivate;
 
-    /// \class DistortionFactory Distortion.hh ignition/sensors/Distortion.hh
+    /// \class DistortionFactory Distortion.hh gz/sensors/Distortion.hh
     /// \brief Use this distortion manager for creating and loading distortion
     /// models.
     class IGNITION_SENSORS_VISIBLE DistortionFactory
@@ -73,7 +73,7 @@ namespace ignition
       BROWN = 2
     };
 
-    /// \class Distortion Distortion.hh ignition/sensors/Distortion.hh
+    /// \class Distortion Distortion.hh gz/sensors/Distortion.hh
     /// \brief Distortion models for sensor output signals.
     class IGNITION_SENSORS_VISIBLE Distortion
     {

diff --git a/include/gz/sensors/ForceTorqueSensor.hh b/include/gz/sensors/ForceTorqueSensor.hh
@@ -15,21 +15,21 @@
  *
 */
 
-#ifndef IGNITION_SENSORS_FORCETORQUESENSOR_HH_
-#define IGNITION_SENSORS_FORCETORQUESENSOR_HH_
+#ifndef GZ_SENSORS_FORCETORQUESENSOR_HH_
+#define GZ_SENSORS_FORCETORQUESENSOR_HH_
 
 #include <memory>
 
 #include <sdf/sdf.hh>
 
-#include <ignition/utils/SuppressWarning.hh>
+#include <gz/utils/SuppressWarning.hh>
 
-#include <ignition/math/Pose3.hh>
+#include <gz/math/Pose3.hh>
 
-#include <ignition/sensors/config.hh>
-#include <ignition/sensors/force_torque/Export.hh>
+#include <gz/sensors/config.hh>
+#include <gz/sensors/force_torque/Export.hh>
 
-#include "ignition/sensors/Sensor.hh"
+#include "gz/sensors/Sensor.hh"
 
 namespace ignition
 {

diff --git a/include/gz/sensors/GaussianNoiseModel.hh b/include/gz/sensors/GaussianNoiseModel.hh
@@ -15,14 +15,14 @@
  *
 */
 
-#ifndef IGNITION_SENSORS_GAUSSIANNOISEMODEL_HH_
-#define IGNITION_SENSORS_GAUSSIANNOISEMODEL_HH_
+#ifndef GZ_SENSORS_GAUSSIANNOISEMODEL_HH_
+#define GZ_SENSORS_GAUSSIANNOISEMODEL_HH_
 
 #include <sdf/sdf.hh>
 
-#include "ignition/sensors/config.hh"
-#include "ignition/sensors/Export.hh"
-#include "ignition/sensors/Noise.hh"
+#include "gz/sensors/config.hh"
+#include "gz/sensors/Export.hh"
+#include "gz/sensors/Noise.hh"
 
 namespace ignition
 {
@@ -35,7 +35,7 @@ namespace ignition
     class GaussianNoiseModelPrivate;
 
     /** \class GaussianNoiseModel GaussianNoiseModel.hh \
-    ignition/sensors/GaussianNoiseModel.hh
+    gz/sensors/GaussianNoiseModel.hh
     **/
     /// \brief Gaussian noise class
     class IGNITION_SENSORS_VISIBLE GaussianNoiseModel : public Noise