Merge pull request #1341 from tier4/RJD-1278/geometry-update

Rjd 1278/geometry update
tier4 · Sep 10, 2024 · 6fa3bb4 · 6fa3bb4
2 parents 7d8cdc1 + 30f1908
commit 6fa3bb4
Show file tree

Hide file tree

Showing 25 changed files with 959 additions and 755 deletions.
diff --git a/common/math/geometry/test/CMakeLists.txt b/common/math/geometry/test/CMakeLists.txt
@@ -1,26 +1,15 @@
-add_subdirectory(vector3)
+add_subdirectory(src/intersection)
+add_subdirectory(src/polygon)
+add_subdirectory(src/quaternion)
+add_subdirectory(src/solver)
+add_subdirectory(src/spline)
+add_subdirectory(src/vector3)
 
-ament_add_gtest(test_bounding_box test_bounding_box.cpp)
-ament_add_gtest(test_catmull_rom_spline test_catmull_rom_spline.cpp)
-ament_add_gtest(test_catmull_rom_subspline test_catmull_rom_subspline.cpp)
-ament_add_gtest(test_collision test_collision.cpp)
-ament_add_gtest(test_distance test_distance.cpp)
-ament_add_gtest(test_hermite_curve test_hermite_curve.cpp)
-ament_add_gtest(test_polygon test_polygon.cpp)
-ament_add_gtest(test_polynomial_solver test_polynomial_solver.cpp)
-ament_add_gtest(test_transform test_transform.cpp)
-ament_add_gtest(test_intersection test_intersection.cpp)
-ament_add_gtest(test_line_segment test_line_segment.cpp)
-ament_add_gtest(test_quaternion test_quaternion.cpp)
-target_link_libraries(test_bounding_box geometry)
-target_link_libraries(test_catmull_rom_spline geometry)
-target_link_libraries(test_catmull_rom_subspline geometry)
-target_link_libraries(test_collision geometry)
+ament_add_gtest(test_distance src/test_distance.cpp)
 target_link_libraries(test_distance geometry)
-target_link_libraries(test_hermite_curve geometry)
-target_link_libraries(test_polygon geometry)
-target_link_libraries(test_polynomial_solver geometry)
+
+ament_add_gtest(test_bounding_box src/test_bounding_box.cpp)
+target_link_libraries(test_bounding_box geometry)
+
+ament_add_gtest(test_transform src/test_transform.cpp)
 target_link_libraries(test_transform geometry)
-target_link_libraries(test_intersection geometry)
-target_link_libraries(test_line_segment geometry)
-target_link_libraries(test_quaternion geometry)
diff --git a/...n/math/geometry/test/expect_eq_macros.hpp → ...th/geometry/test/src/expect_eq_macros.hpp b/...n/math/geometry/test/expect_eq_macros.hpp → ...th/geometry/test/src/expect_eq_macros.hpp
diff --git a/common/math/geometry/test/src/intersection/CMakeLists.txt b/common/math/geometry/test/src/intersection/CMakeLists.txt
@@ -0,0 +1,5 @@
+ament_add_gtest(test_collision test_collision.cpp)
+target_link_libraries(test_collision geometry)
+
+ament_add_gtest(test_intersection test_intersection.cpp)
+target_link_libraries(test_intersection geometry)
diff --git a/common/math/geometry/test/test_collision.cpp → .../test/src/intersection/test_collision.cpp b/common/math/geometry/test/test_collision.cpp → .../test/src/intersection/test_collision.cpp
@@ -17,7 +17,7 @@
 #include <geometry/intersection/collision.hpp>
 #include <scenario_simulator_exception/exception.hpp>
 
-#include "test_utils.hpp"
+#include "../test_utils.hpp"
 
 TEST(Collision, DifferentHeight)
 {

diff --git a/.../math/geometry/test/test_intersection.cpp → ...st/src/intersection/test_intersection.cpp b/.../math/geometry/test/test_intersection.cpp → ...st/src/intersection/test_intersection.cpp
@@ -18,8 +18,8 @@
 #include <geometry/intersection/intersection.hpp>
 #include <scenario_simulator_exception/exception.hpp>
 
-#include "expect_eq_macros.hpp"
-#include "test_utils.hpp"
+#include "../expect_eq_macros.hpp"
+#include "../test_utils.hpp"
 
 TEST(Intersection, isIntersect2DDisjoint)
 {

diff --git a/common/math/geometry/test/src/polygon/CMakeLists.txt b/common/math/geometry/test/src/polygon/CMakeLists.txt
@@ -0,0 +1,5 @@
+ament_add_gtest(test_line_segment test_line_segment.cpp)
+target_link_libraries(test_line_segment geometry)
+
+ament_add_gtest(test_polygon test_polygon.cpp)
+target_link_libraries(test_polygon geometry)