From 13c02f632a6481ae31c5373d5a90feb35f94ab43 Mon Sep 17 00:00:00 2001 From: Rakesh Vivekanandan Date: Mon, 24 Jun 2024 13:14:27 -0700 Subject: [PATCH] package rename --- examples/dave_demos/README.md | 10 +++++----- .../launch/model_in_empty_world.launch.py | 2 +- .../CMakeLists.txt | 4 ++-- .../description/mossy_cinder_block/model.sdf | 0 .../description/nortek_dvl500_300/model.sdf | 0 .../hooks/dave_object_models.dsv.in} | 0 .../launch/upload_model.launch.py | 2 +- .../meshes/nortek_dvl500_300/DVL500-300m.dae | 0 .../meshes/nortek_dvl500_300/tx-DVL500-300m.png | Bin .../{dave_models => dave_object_models}/package.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename models/{dave_models => dave_object_models}/CMakeLists.txt (77%) rename models/{dave_models => dave_object_models}/description/mossy_cinder_block/model.sdf (100%) rename models/{dave_models => dave_object_models}/description/nortek_dvl500_300/model.sdf (100%) rename models/{dave_models/hooks/dave_models.dsv.in => dave_object_models/hooks/dave_object_models.dsv.in} (100%) rename models/{dave_models => dave_object_models}/launch/upload_model.launch.py (96%) rename models/{dave_models => dave_object_models}/meshes/nortek_dvl500_300/DVL500-300m.dae (100%) rename models/{dave_models => dave_object_models}/meshes/nortek_dvl500_300/tx-DVL500-300m.png (100%) rename models/{dave_models => dave_object_models}/package.xml (95%) diff --git a/examples/dave_demos/README.md b/examples/dave_demos/README.md index 52ff071e..0d31ef51 100644 --- a/examples/dave_demos/README.md +++ b/examples/dave_demos/README.md @@ -22,16 +22,16 @@ This method simplifies the process by pulling the model directly from Fuel, ensu If you prefer to use model files downloaded from Fuel, proceed as follows: -1. Add a hook within the `dave_models` package to configure the necessary environment variables for Gazebo model lookup. +1. Add a hook within the `dave_object_models` package to configure the necessary environment variables for Gazebo model lookup. ```bash - cd /src/dave/models/dave_models + cd /src/dave/models/dave_object_models mkdir hooks && cd hooks - touch dave_models.dsv.in - echo "prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@" >> dave_models.dsv.in + touch dave_object_models.dsv.in + echo "prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@" >> dave_object_models.dsv.in ``` -2. Append the following line to the CMakeLists.txt file in the `dave_models` package: +2. Append the following line to the CMakeLists.txt file in the `dave_object_models` package: ```bash ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/${PROJECT_NAME}.dsv.in") diff --git a/examples/dave_demos/launch/model_in_empty_world.launch.py b/examples/dave_demos/launch/model_in_empty_world.launch.py index 807299a3..5365a4b7 100755 --- a/examples/dave_demos/launch/model_in_empty_world.launch.py +++ b/examples/dave_demos/launch/model_in_empty_world.launch.py @@ -61,7 +61,7 @@ def generate_launch_description(): [ PathJoinSubstitution( [ - FindPackageShare("dave_models"), + FindPackageShare("dave_object_models"), "launch", "upload_model.launch.py", ] diff --git a/models/dave_models/CMakeLists.txt b/models/dave_object_models/CMakeLists.txt similarity index 77% rename from models/dave_models/CMakeLists.txt rename to models/dave_object_models/CMakeLists.txt index b384e2de..49536328 100644 --- a/models/dave_models/CMakeLists.txt +++ b/models/dave_object_models/CMakeLists.txt @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.8) -project(dave_models) +project(dave_object_models) find_package(ament_cmake REQUIRED) install( DIRECTORY description launch meshes - DESTINATION share/dave_models + DESTINATION share/dave_object_models ) ament_environment_hooks( diff --git a/models/dave_models/description/mossy_cinder_block/model.sdf b/models/dave_object_models/description/mossy_cinder_block/model.sdf similarity index 100% rename from models/dave_models/description/mossy_cinder_block/model.sdf rename to models/dave_object_models/description/mossy_cinder_block/model.sdf diff --git a/models/dave_models/description/nortek_dvl500_300/model.sdf b/models/dave_object_models/description/nortek_dvl500_300/model.sdf similarity index 100% rename from models/dave_models/description/nortek_dvl500_300/model.sdf rename to models/dave_object_models/description/nortek_dvl500_300/model.sdf diff --git a/models/dave_models/hooks/dave_models.dsv.in b/models/dave_object_models/hooks/dave_object_models.dsv.in similarity index 100% rename from models/dave_models/hooks/dave_models.dsv.in rename to models/dave_object_models/hooks/dave_object_models.dsv.in diff --git a/models/dave_models/launch/upload_model.launch.py b/models/dave_object_models/launch/upload_model.launch.py similarity index 96% rename from models/dave_models/launch/upload_model.launch.py rename to models/dave_object_models/launch/upload_model.launch.py index c7c2650d..3efa3440 100755 --- a/models/dave_models/launch/upload_model.launch.py +++ b/models/dave_object_models/launch/upload_model.launch.py @@ -26,7 +26,7 @@ def generate_launch_description(): description_file = PathJoinSubstitution( [ - FindPackageShare("dave_models"), + FindPackageShare("dave_object_models"), "description", model_name, "model.sdf", diff --git a/models/dave_models/meshes/nortek_dvl500_300/DVL500-300m.dae b/models/dave_object_models/meshes/nortek_dvl500_300/DVL500-300m.dae similarity index 100% rename from models/dave_models/meshes/nortek_dvl500_300/DVL500-300m.dae rename to models/dave_object_models/meshes/nortek_dvl500_300/DVL500-300m.dae diff --git a/models/dave_models/meshes/nortek_dvl500_300/tx-DVL500-300m.png b/models/dave_object_models/meshes/nortek_dvl500_300/tx-DVL500-300m.png similarity index 100% rename from models/dave_models/meshes/nortek_dvl500_300/tx-DVL500-300m.png rename to models/dave_object_models/meshes/nortek_dvl500_300/tx-DVL500-300m.png diff --git a/models/dave_models/package.xml b/models/dave_object_models/package.xml similarity index 95% rename from models/dave_models/package.xml rename to models/dave_object_models/package.xml index ed2e90c1..2cd202ec 100644 --- a/models/dave_models/package.xml +++ b/models/dave_object_models/package.xml @@ -2,7 +2,7 @@ - dave_models + dave_object_models 0.1.0 Dave model description files are placed here.