Skip to content

Commit 1523103

Browse files
committed
Refactor world solvers with centralized entity manager
1 parent 05bcc80 commit 1523103

File tree

13 files changed

+926
-75
lines changed

13 files changed

+926
-75
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ set(DART_VERSION "${DART_MAJOR_VERSION}.${DART_MINOR_VERSION}.${DART_PATCH_VERSI
113113
# Already set above
114114

115115
set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.")
116-
set(DART_PKG_EXTERNAL_DEPS "assimp, ccd, eigen3, fcl, octomap")
116+
set(DART_PKG_EXTERNAL_DEPS "assimp, ccd, eigen3, entt, fcl, octomap")
117117
set_property(GLOBAL PROPERTY DART_PKG_LINK_LIBS "")
118118
set_property(GLOBAL PROPERTY DART_PUBLIC_INCLUDE_DIRS "")
119119
set_property(GLOBAL PROPERTY DART_PUBLIC_SYSTEM_INCLUDE_DIRS "")

cmake/DARTFindDependencies.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ endif()
1313
dart_find_package(fmt)
1414
dart_check_required_package(fmt "libfmt")
1515

16+
# EnTT
17+
dart_find_package(EnTT)
18+
dart_check_required_package(EnTT "EnTT")
19+
1620
# Eigen
1721
dart_find_package(Eigen3)
1822
dart_check_required_package(EIGEN3 "eigen3")

dart/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ target_link_libraries(
125125
PUBLIC
126126
${CMAKE_DL_LIBS}
127127
Eigen3::Eigen
128+
EnTT::EnTT
128129
fcl
129130
assimp
130131
)
@@ -222,7 +223,7 @@ endif()
222223
# Default component
223224
add_component_targets(${PROJECT_NAME} dart dart)
224225
add_component_dependency_packages(${PROJECT_NAME} dart
225-
assimp Eigen3 fcl fmt
226+
assimp EnTT Eigen3 fcl fmt
226227
)
227228
if(TARGET octomap)
228229
add_component_dependency_packages(${PROJECT_NAME} dart octomap)

dart/simulation/CMakeLists.txt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@ file(GLOB hdrs "*.hpp")
33
file(GLOB srcs "*.cpp")
44
file(GLOB detail_hdrs "detail/*.hpp")
55
file(GLOB detail_srcs "detail/*.cpp")
6-
dart_add_core_headers(${hdrs} ${detail_hdrs})
7-
dart_add_core_sources(${srcs} ${detail_srcs})
6+
file(GLOB solver_hdrs "solver/*.hpp")
7+
file(GLOB solver_srcs "solver/*.cpp")
8+
dart_add_core_headers(${hdrs} ${detail_hdrs} ${solver_hdrs})
9+
dart_add_core_sources(${srcs} ${detail_srcs} ${solver_srcs})
810

911
# Generate header for this namespace
10-
dart_get_filename_components(header_names "simulation headers" ${hdrs})
12+
dart_get_filename_components(header_names "simulation headers" ${hdrs} ${solver_hdrs})
1113
list(REMOVE_ITEM header_names SmartPointer.hpp)
1214
dart_generate_component_headers(
1315
COMPONENT_NAME simulation
1416
TARGET_DIR "dart/simulation/"
1517
OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}"
1618
HEADERS ${header_names}
17-
SOURCE_HEADERS ${hdrs} ${detail_hdrs}
19+
SOURCE_HEADERS ${hdrs} ${detail_hdrs} ${solver_hdrs}
1820
)
1921

2022
# Install (includes All.hpp, simulation.hpp for component compatibility,
@@ -29,6 +31,11 @@ install(
2931
DESTINATION include/dart/simulation/detail
3032
COMPONENT headers
3133
)
34+
install(
35+
FILES ${solver_hdrs}
36+
DESTINATION include/dart/simulation/solver
37+
COMPONENT headers
38+
)
3239
# Install generated compatibility headers preserving subdirectory structure
3340
dart_install_compat_headers(
3441
COMPAT_HEADERS ${DART_GENERATED_COMPAT_HEADERS}

0 commit comments

Comments
 (0)