Skip to content

Commit 553d630

Browse files
authored
Merge branch 'main' into scpeters/pose_deprecate_subtraction
2 parents 167723c + 88e0c49 commit 553d630

File tree

9 files changed

+11
-1
lines changed

9 files changed

+11
-1
lines changed

examples/standalone/light_control/light_control.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include <chrono>
1919
#include <iostream>
20+
#include <random>
2021

2122
#include <gz/sim/components/Light.hh>
2223
#include <gz/sim/components/LightCmd.hh>

include/gz/sim/Conversions.hh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <string>
4040

4141
#include <gz/common/Console.hh>
42+
#include <gz/math/AxisAlignedBox.hh>
4243
#include <gz/math/Inertial.hh>
4344
#include <sdf/Actor.hh>
4445
#include <sdf/Atmosphere.hh>

include/gz/sim/rendering/SceneManager.hh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
#include <gz/common/Animation.hh>
3838
#include <gz/common/graphics/Types.hh>
3939

40+
#include <gz/math/Matrix4.hh>
41+
4042
#include <gz/msgs/particle_emitter.pb.h>
4143

4244
#include <gz/rendering/RenderTypes.hh>

src/gui/plugins/component_inspector_editor/ComponentInspectorEditor.hh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <sdf/Physics.hh>
2727
#include <sdf/Joint.hh>
2828

29+
#include <gz/math/SphericalCoordinates.hh>
2930
#include <gz/math/Vector3.hh>
3031

3132
#include <gz/sim/components/Component.hh>

src/rendering/MarkerManager.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <mutex>
2222
#include <string>
2323

24+
#include <gz/math/Rand.hh>
2425
#include <gz/msgs.hh>
2526
#include <gz/transport/Node.hh>
2627

src/rendering/SceneManager.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include <map>
2020
#include <memory>
21+
#include <queue>
2122
#include <unordered_map>
2223

2324
#include <sdf/Box.hh>

src/systems/multicopter_control/Common.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <string>
2121

2222
#include <gz/common/Console.hh>
23+
#include <gz/math/Rand.hh>
2324
#include <gz/math/eigen3/Conversions.hh>
2425

2526
#include <gz/sim/components/ChildLinkName.hh>

src/systems/odometry_publisher/OdometryPublisher.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <gz/math/Helpers.hh>
3131
#include <gz/math/Pose3.hh>
3232
#include <gz/math/Quaternion.hh>
33+
#include <gz/math/Rand.hh>
3334
#include <gz/math/RollingMean.hh>
3435
#include <gz/plugin/Register.hh>
3536
#include <gz/transport/Node.hh>
@@ -95,7 +96,7 @@ class gz::sim::systems::OdometryPublisherPrivate
9596
public: math::Pose3d lastUpdatePose{0, 0, 0, 0, 0, 0};
9697

9798
/// \brief Current timestamp.
98-
public: math::clock::time_point lastUpdateTime;
99+
public: std::chrono::steady_clock::time_point lastUpdateTime;
99100

100101
/// \brief Allow specifying constant xyz and rpy offsets
101102
public: gz::math::Pose3d offset = {0, 0, 0, 0, 0, 0};

src/systems/thruster/Thruster.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <gz/msgs/double.pb.h>
2222

2323
#include <gz/math/Helpers.hh>
24+
#include <gz/math/PID.hh>
2425

2526
#include <gz/plugin/Register.hh>
2627

0 commit comments

Comments
 (0)