diff --git a/src/fanuc_sim/CMakeLists.txt b/src/fanuc_sim/CMakeLists.txt index 98ed68c5..ace747cd 100644 --- a/src/fanuc_sim/CMakeLists.txt +++ b/src/fanuc_sim/CMakeLists.txt @@ -2,7 +2,19 @@ cmake_minimum_required(VERSION 3.22) project(fanuc_sim) find_package(ament_cmake REQUIRED) +find_package(picknik_accessories REQUIRED) +# Install all XML files in directory +set(PICKNIK_ACCESSORIES_SHARE_DIR +"${CMAKE_INSTALL_PREFIX}/../picknik_accessories/share/picknik_accessories/mujoco_assets/" +) +# Destination directory +set(DEST_DIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/description/") + +install(DIRECTORY "${PICKNIK_ACCESSORIES_SHARE_DIR}" + DESTINATION "${DEST_DIR}" + FILES_MATCHING PATTERN "*") + install( DIRECTORY config diff --git a/src/fanuc_sim/description/scene.xml b/src/fanuc_sim/description/scene.xml index aec8caad..d55cd798 100644 --- a/src/fanuc_sim/description/scene.xml +++ b/src/fanuc_sim/description/scene.xml @@ -6,12 +6,12 @@ - + - - + + - + @@ -117,6 +117,8 @@ resolution="640 480" euler="-0.9 0 3.1415" /> - + + + diff --git a/src/fanuc_sim/package.xml b/src/fanuc_sim/package.xml index ab8ac55c..3e125fd9 100644 --- a/src/fanuc_sim/package.xml +++ b/src/fanuc_sim/package.xml @@ -11,6 +11,7 @@ ament_cmake + picknik_accessories admittance_controller kinematics_interface_kdl moveit_planners_stomp