From 98f074b072de58b4c2153fe64f0d681a968c8926 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Mon, 31 Jul 2023 19:17:02 -0700 Subject: [PATCH] [wpimath] Add folder prefix to geometry includes (#5489) --- wpimath/src/main/native/include/frc/geometry/Pose2d.h | 8 ++++---- wpimath/src/main/native/include/frc/geometry/Pose3d.h | 8 ++++---- wpimath/src/main/native/include/frc/geometry/Rotation2d.h | 2 +- wpimath/src/main/native/include/frc/geometry/Rotation3d.h | 4 ++-- .../src/main/native/include/frc/geometry/Transform2d.h | 4 ++-- .../src/main/native/include/frc/geometry/Transform3d.h | 2 +- .../src/main/native/include/frc/geometry/Translation2d.h | 4 ++-- .../src/main/native/include/frc/geometry/Translation3d.h | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/wpimath/src/main/native/include/frc/geometry/Pose2d.h b/wpimath/src/main/native/include/frc/geometry/Pose2d.h index 12e82eddd1..5c5c65454d 100644 --- a/wpimath/src/main/native/include/frc/geometry/Pose2d.h +++ b/wpimath/src/main/native/include/frc/geometry/Pose2d.h @@ -9,9 +9,9 @@ #include -#include "Transform2d.h" -#include "Translation2d.h" -#include "Twist2d.h" +#include "frc/geometry/Transform2d.h" +#include "frc/geometry/Translation2d.h" +#include "frc/geometry/Twist2d.h" namespace wpi { class json; @@ -206,4 +206,4 @@ void from_json(const wpi::json& json, Pose2d& pose); } // namespace frc -#include "Pose2d.inc" +#include "frc/geometry/Pose2d.inc" diff --git a/wpimath/src/main/native/include/frc/geometry/Pose3d.h b/wpimath/src/main/native/include/frc/geometry/Pose3d.h index 8c7ace3681..a1e1460ab7 100644 --- a/wpimath/src/main/native/include/frc/geometry/Pose3d.h +++ b/wpimath/src/main/native/include/frc/geometry/Pose3d.h @@ -6,10 +6,10 @@ #include -#include "Pose2d.h" -#include "Transform3d.h" -#include "Translation3d.h" -#include "Twist3d.h" +#include "frc/geometry/Pose2d.h" +#include "frc/geometry/Transform3d.h" +#include "frc/geometry/Translation3d.h" +#include "frc/geometry/Twist3d.h" namespace wpi { class json; diff --git a/wpimath/src/main/native/include/frc/geometry/Rotation2d.h b/wpimath/src/main/native/include/frc/geometry/Rotation2d.h index 406ef3c15c..17201189cd 100644 --- a/wpimath/src/main/native/include/frc/geometry/Rotation2d.h +++ b/wpimath/src/main/native/include/frc/geometry/Rotation2d.h @@ -179,4 +179,4 @@ void from_json(const wpi::json& json, Rotation2d& rotation); } // namespace frc -#include "Rotation2d.inc" +#include "frc/geometry/Rotation2d.inc" diff --git a/wpimath/src/main/native/include/frc/geometry/Rotation3d.h b/wpimath/src/main/native/include/frc/geometry/Rotation3d.h index df01f3b689..ca053b2c7d 100644 --- a/wpimath/src/main/native/include/frc/geometry/Rotation3d.h +++ b/wpimath/src/main/native/include/frc/geometry/Rotation3d.h @@ -6,9 +6,9 @@ #include -#include "Quaternion.h" -#include "Rotation2d.h" #include "frc/EigenCore.h" +#include "frc/geometry/Quaternion.h" +#include "frc/geometry/Rotation2d.h" #include "units/angle.h" namespace wpi { diff --git a/wpimath/src/main/native/include/frc/geometry/Transform2d.h b/wpimath/src/main/native/include/frc/geometry/Transform2d.h index 3c21ec1d6e..5395f33d68 100644 --- a/wpimath/src/main/native/include/frc/geometry/Transform2d.h +++ b/wpimath/src/main/native/include/frc/geometry/Transform2d.h @@ -6,7 +6,7 @@ #include -#include "Translation2d.h" +#include "frc/geometry/Translation2d.h" namespace frc { @@ -112,4 +112,4 @@ class WPILIB_DLLEXPORT Transform2d { }; } // namespace frc -#include "Transform2d.inc" +#include "frc/geometry/Transform2d.inc" diff --git a/wpimath/src/main/native/include/frc/geometry/Transform3d.h b/wpimath/src/main/native/include/frc/geometry/Transform3d.h index 5f50ec2577..91c78cfc43 100644 --- a/wpimath/src/main/native/include/frc/geometry/Transform3d.h +++ b/wpimath/src/main/native/include/frc/geometry/Transform3d.h @@ -6,7 +6,7 @@ #include -#include "Translation3d.h" +#include "frc/geometry/Translation3d.h" namespace frc { diff --git a/wpimath/src/main/native/include/frc/geometry/Translation2d.h b/wpimath/src/main/native/include/frc/geometry/Translation2d.h index d6a7f20b41..9d64be455a 100644 --- a/wpimath/src/main/native/include/frc/geometry/Translation2d.h +++ b/wpimath/src/main/native/include/frc/geometry/Translation2d.h @@ -9,7 +9,7 @@ #include -#include "Rotation2d.h" +#include "frc/geometry/Rotation2d.h" #include "units/length.h" namespace wpi { @@ -201,4 +201,4 @@ void from_json(const wpi::json& json, Translation2d& state); } // namespace frc -#include "Translation2d.inc" +#include "frc/geometry/Translation2d.inc" diff --git a/wpimath/src/main/native/include/frc/geometry/Translation3d.h b/wpimath/src/main/native/include/frc/geometry/Translation3d.h index ab641fa02b..455c37ccc5 100644 --- a/wpimath/src/main/native/include/frc/geometry/Translation3d.h +++ b/wpimath/src/main/native/include/frc/geometry/Translation3d.h @@ -6,8 +6,8 @@ #include -#include "Rotation3d.h" -#include "Translation2d.h" +#include "frc/geometry/Rotation3d.h" +#include "frc/geometry/Translation2d.h" #include "units/length.h" namespace wpi { @@ -186,4 +186,4 @@ void from_json(const wpi::json& json, Translation3d& state); } // namespace frc -#include "Translation3d.inc" +#include "frc/geometry/Translation3d.inc"