Merge branch 'main' into env_var_migration

gazebosim · Jun 8, 2022 · 65264e8 · 65264e8
2 parents 3c17b82 + 88e0c49
commit 65264e8
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 1 deletion.
diff --git a/examples/standalone/light_control/light_control.cc b/examples/standalone/light_control/light_control.cc
@@ -17,6 +17,7 @@
 
 #include <chrono>
 #include <iostream>
+#include <random>
 
 #include <gz/sim/components/Light.hh>
 #include <gz/sim/components/LightCmd.hh>

diff --git a/include/gz/sim/Conversions.hh b/include/gz/sim/Conversions.hh
@@ -39,6 +39,7 @@
 #include <string>
 
 #include <gz/common/Console.hh>
+#include <gz/math/AxisAlignedBox.hh>
 #include <gz/math/Inertial.hh>
 #include <sdf/Actor.hh>
 #include <sdf/Atmosphere.hh>

diff --git a/include/gz/sim/rendering/SceneManager.hh b/include/gz/sim/rendering/SceneManager.hh
@@ -37,6 +37,8 @@
 #include <gz/common/Animation.hh>
 #include <gz/common/graphics/Types.hh>
 
+#include <gz/math/Matrix4.hh>
+
 #include <gz/msgs/particle_emitter.pb.h>
 
 #include <gz/rendering/RenderTypes.hh>

diff --git a/src/gui/plugins/component_inspector_editor/ComponentInspectorEditor.hh b/src/gui/plugins/component_inspector_editor/ComponentInspectorEditor.hh
@@ -26,6 +26,7 @@
 #include <sdf/Physics.hh>
 #include <sdf/Joint.hh>
 
+#include <gz/math/SphericalCoordinates.hh>
 #include <gz/math/Vector3.hh>
 
 #include <gz/sim/components/Component.hh>

diff --git a/src/rendering/MarkerManager.cc b/src/rendering/MarkerManager.cc
@@ -21,6 +21,7 @@
 #include <mutex>
 #include <string>
 
+#include <gz/math/Rand.hh>
 #include <gz/msgs.hh>
 #include <gz/transport/Node.hh>
 

diff --git a/src/rendering/SceneManager.cc b/src/rendering/SceneManager.cc
@@ -18,6 +18,7 @@
 
 #include <map>
 #include <memory>
+#include <queue>
 #include <unordered_map>
 
 #include <sdf/Box.hh>

diff --git a/src/systems/multicopter_control/Common.cc b/src/systems/multicopter_control/Common.cc
@@ -20,6 +20,7 @@
 #include <string>
 
 #include <gz/common/Console.hh>
+#include <gz/math/Rand.hh>
 #include <gz/math/eigen3/Conversions.hh>
 
 #include <gz/sim/components/ChildLinkName.hh>

diff --git a/src/systems/odometry_publisher/OdometryPublisher.cc b/src/systems/odometry_publisher/OdometryPublisher.cc
@@ -30,6 +30,7 @@
 #include <gz/math/Helpers.hh>
 #include <gz/math/Pose3.hh>
 #include <gz/math/Quaternion.hh>
+#include <gz/math/Rand.hh>
 #include <gz/math/RollingMean.hh>
 #include <gz/plugin/Register.hh>
 #include <gz/transport/Node.hh>
@@ -95,7 +96,7 @@ class gz::sim::systems::OdometryPublisherPrivate
   public: math::Pose3d lastUpdatePose{0, 0, 0, 0, 0, 0};
 
   /// \brief Current timestamp.
-  public: math::clock::time_point lastUpdateTime;
+  public: std::chrono::steady_clock::time_point lastUpdateTime;
 
   /// \brief Allow specifying constant xyz and rpy offsets
   public: gz::math::Pose3d offset = {0, 0, 0, 0, 0, 0};

diff --git a/src/systems/thruster/Thruster.cc b/src/systems/thruster/Thruster.cc
@@ -21,6 +21,7 @@
 #include <gz/msgs/double.pb.h>
 
 #include <gz/math/Helpers.hh>
+#include <gz/math/PID.hh>
 
 #include <gz/plugin/Register.hh>