Merge branch 'main' into embeddedsdf_refactoring

gazebosim · May 4, 2022 · 55a990a · 55a990a
2 parents 2fad929 + 7baa3ee
commit 55a990a
Show file tree

Hide file tree

Showing 62 changed files with 506 additions and 98 deletions.
diff --git a/include/sdf/Actor.hh b/include/sdf/Actor.hh
@@ -20,8 +20,8 @@
 #include <memory>
 #include <string>
 
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/Element.hh"
 #include "sdf/Types.hh"

diff --git a/include/sdf/AirPressure.hh b/include/sdf/AirPressure.hh
@@ -17,7 +17,7 @@
 #ifndef SDF_AIRPRESSURE_HH_
 #define SDF_AIRPRESSURE_HH_
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>

diff --git a/include/sdf/Altimeter.hh b/include/sdf/Altimeter.hh
@@ -17,7 +17,7 @@
 #ifndef SDF_ALTIMETER_HH_
 #define SDF_ALTIMETER_HH_
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>

diff --git a/include/sdf/Atmosphere.hh b/include/sdf/Atmosphere.hh
@@ -17,8 +17,8 @@
 #ifndef SDF_ATMOSPHERE_HH_
 #define SDF_ATMOSPHERE_HH_
 
-#include <ignition/math/Temperature.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Temperature.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/Element.hh"
 #include "sdf/Types.hh"

diff --git a/include/sdf/Box.hh b/include/sdf/Box.hh
@@ -17,9 +17,9 @@
 #ifndef SDF_BOX_HH_
 #define SDF_BOX_HH_
 
-#include <ignition/math/Box.hh>
-#include <ignition/math/Vector3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Box.hh>
+#include <gz/math/Vector3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/sdf_config.h>

diff --git a/include/sdf/Camera.hh b/include/sdf/Camera.hh
@@ -18,8 +18,8 @@
 #define SDF_CAMERA_HH_
 
 #include <string>
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>

diff --git a/include/sdf/Capsule.hh b/include/sdf/Capsule.hh
@@ -17,8 +17,8 @@
 #ifndef SDF_CAPSULE_HH_
 #define SDF_CAPSULE_HH_
 
-#include <ignition/math/Capsule.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Capsule.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/sdf_config.h>

diff --git a/include/sdf/Collision.hh b/include/sdf/Collision.hh
@@ -19,8 +19,8 @@
 
 #include <memory>
 #include <string>
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "sdf/Element.hh"
 #include "sdf/SemanticPose.hh"
 #include "sdf/Types.hh"

diff --git a/include/sdf/Cylinder.hh b/include/sdf/Cylinder.hh
@@ -17,8 +17,8 @@
 #ifndef SDF_CYLINDER_HH_
 #define SDF_CYLINDER_HH_
 
-#include <ignition/math/Cylinder.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Cylinder.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/sdf_config.h>

diff --git a/include/sdf/Ellipsoid.hh b/include/sdf/Ellipsoid.hh
@@ -17,8 +17,8 @@
 #ifndef SDF_ELLIPSOID_HH_
 #define SDF_ELLIPSOID_HH_
 
-#include <ignition/math/Ellipsoid.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Ellipsoid.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/sdf_config.h>

diff --git a/include/sdf/Error.hh b/include/sdf/Error.hh
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <string>
 #include <optional>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/sdf_config.h>
 #include "sdf/system_util.hh"
 

diff --git a/include/sdf/Exception.hh b/include/sdf/Exception.hh
@@ -24,7 +24,7 @@
 #include <sstream>
 #include <string>
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/sdf_config.h>
 #include "sdf/system_util.hh"
 

diff --git a/include/sdf/Filesystem.hh b/include/sdf/Filesystem.hh
@@ -21,7 +21,7 @@
 #include <memory>
 #include <string>
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/sdf_config.h>
 #include "sdf/system_util.hh"
 

diff --git a/include/sdf/ForceTorque.hh b/include/sdf/ForceTorque.hh
@@ -18,7 +18,7 @@
 #define SDF_FORCE_TORQUE_HH_
 
 #include <string>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/Noise.hh>

diff --git a/include/sdf/Frame.hh b/include/sdf/Frame.hh
@@ -19,8 +19,8 @@
 
 #include <memory>
 #include <string>
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "sdf/Element.hh"
 #include "sdf/SemanticPose.hh"
 #include "sdf/Types.hh"

diff --git a/include/sdf/Geometry.hh b/include/sdf/Geometry.hh
@@ -17,7 +17,7 @@
 #ifndef SDF_GEOMETRY_HH_
 #define SDF_GEOMETRY_HH_
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/sdf_config.h>

diff --git a/include/sdf/Gui.hh b/include/sdf/Gui.hh
@@ -17,7 +17,7 @@
 #ifndef SDF_GUI_HH_
 #define SDF_GUI_HH_
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "sdf/Element.hh"
 #include "sdf/Plugin.hh"
 #include "sdf/Types.hh"

diff --git a/include/sdf/Heightmap.hh b/include/sdf/Heightmap.hh
@@ -18,8 +18,8 @@
 #define SDF_HEIGHTMAP_HH_
 
 #include <string>
-#include <ignition/math/Vector3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Vector3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Element.hh>
 #include <sdf/Error.hh>
 #include <sdf/sdf_config.h>

diff --git a/include/sdf/Imu.hh b/include/sdf/Imu.hh
@@ -18,7 +18,7 @@
 #define SDF_IMU_HH_
 
 #include <string>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/Noise.hh>

diff --git a/include/sdf/InterfaceElements.hh b/include/sdf/InterfaceElements.hh
@@ -20,8 +20,8 @@
 #include <string>
 #include <memory>
 
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/Element.hh"
 #include "sdf/InterfaceModel.hh"

diff --git a/include/sdf/InterfaceFrame.hh b/include/sdf/InterfaceFrame.hh
@@ -20,8 +20,8 @@
 
 #include <string>
 
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/sdf_config.h"
 #include "sdf/system_util.hh"

diff --git a/include/sdf/InterfaceJoint.hh b/include/sdf/InterfaceJoint.hh
@@ -20,8 +20,8 @@
 
 #include <string>
 
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/sdf_config.h"
 #include "sdf/system_util.hh"

diff --git a/include/sdf/InterfaceLink.hh b/include/sdf/InterfaceLink.hh
@@ -20,8 +20,8 @@
 
 #include <string>
 
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/sdf_config.h"
 #include "sdf/system_util.hh"

diff --git a/include/sdf/InterfaceModel.hh b/include/sdf/InterfaceModel.hh
@@ -23,8 +23,8 @@
 #include <memory>
 #include <vector>
 
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/InterfaceFrame.hh"
 #include "sdf/InterfaceJoint.hh"

diff --git a/include/sdf/InterfaceModelPoseGraph.hh b/include/sdf/InterfaceModelPoseGraph.hh
@@ -22,8 +22,8 @@
 #include <memory>
 #include <vector>
 
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/Types.hh"
 

diff --git a/include/sdf/Joint.hh b/include/sdf/Joint.hh
@@ -19,8 +19,8 @@
 
 #include <memory>
 #include <string>
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "sdf/Element.hh"
 #include "sdf/SemanticPose.hh"
 #include "sdf/Types.hh"

diff --git a/include/sdf/JointAxis.hh b/include/sdf/JointAxis.hh
@@ -19,8 +19,8 @@
 
 #include <memory>
 #include <string>
-#include <ignition/math/Vector3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Vector3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "sdf/Element.hh"
 #include "sdf/Exception.hh"
 #include "sdf/Types.hh"

diff --git a/include/sdf/Lidar.hh b/include/sdf/Lidar.hh
@@ -17,8 +17,8 @@
 #ifndef SDF_LIDAR_HH_
 #define SDF_LIDAR_HH_
 
-#include <ignition/math/Angle.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Angle.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>

diff --git a/include/sdf/Light.hh b/include/sdf/Light.hh
@@ -19,9 +19,9 @@
 
 #include <memory>
 #include <string>
-#include <ignition/math/Pose3.hh>
-#include <ignition/math/Angle.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/math/Angle.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/Element.hh"
 #include "sdf/SemanticPose.hh"

diff --git a/include/sdf/Link.hh b/include/sdf/Link.hh
@@ -19,8 +19,8 @@
 
 #include <memory>
 #include <string>
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "sdf/Element.hh"
 #include "sdf/SemanticPose.hh"
 #include "sdf/Types.hh"

diff --git a/include/sdf/Magnetometer.hh b/include/sdf/Magnetometer.hh
@@ -17,7 +17,7 @@
 #ifndef SDF_MAGNETOMETER_HH_
 #define SDF_MAGNETOMETER_HH_
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/Noise.hh>

diff --git a/include/sdf/Material.hh b/include/sdf/Material.hh
@@ -18,7 +18,7 @@
 #define SDF_MATERIAL_HH_
 
 #include <string>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "sdf/Element.hh"
 #include "sdf/Types.hh"
 #include "sdf/sdf_config.h"

diff --git a/include/sdf/Mesh.hh b/include/sdf/Mesh.hh
@@ -18,8 +18,8 @@
 #define SDF_MESH_HH_
 
 #include <string>
-#include <ignition/math/Vector3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Vector3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Element.hh>
 #include <sdf/Error.hh>
 #include <sdf/sdf_config.h>

diff --git a/include/sdf/Model.hh b/include/sdf/Model.hh
@@ -21,8 +21,8 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <ignition/math/Pose3.hh>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "sdf/Element.hh"
 #include "sdf/OutputConfig.hh"
 #include "sdf/ParserConfig.hh"

diff --git a/include/sdf/NavSat.hh b/include/sdf/NavSat.hh
@@ -17,13 +17,13 @@
 #ifndef SDF_NAVSAT_HH_
 #define SDF_NAVSAT_HH_
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/Noise.hh>
 #include <sdf/sdf_config.h>
 
-#include <ignition/math/Angle.hh>
+#include <gz/math/Angle.hh>
 
 namespace sdf
 {

diff --git a/include/sdf/Noise.hh b/include/sdf/Noise.hh
@@ -17,7 +17,7 @@
 #ifndef SDF_NOISE_HH_
 #define SDF_NOISE_HH_
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include <sdf/Error.hh>
 #include <sdf/Element.hh>
 #include <sdf/sdf_config.h>

diff --git a/include/sdf/OutputConfig.hh b/include/sdf/OutputConfig.hh
@@ -18,7 +18,7 @@
 #ifndef SDF_OUTPUT_CONFIG_HH_
 #define SDF_OUTPUT_CONFIG_HH_
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 
 #include "sdf/InterfaceElements.hh"
 #include "sdf/sdf_config.h"

diff --git a/include/sdf/Param.hh b/include/sdf/Param.hh
@@ -33,7 +33,7 @@
 #include <variant>
 #include <vector>
 
-#include <ignition/math.hh>
+#include <gz/math.hh>
 
 #include "sdf/Console.hh"
 #include "sdf/PrintConfig.hh"