From 6b210b81b23e9f974aa50326412c54f45cf8e5df Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Sat, 8 Feb 2025 19:58:09 -0300 Subject: [PATCH] Rename everything to gz_ekumen_worlds Signed-off-by: Michel Hidalgo --- .github/workflows/ci.yml | 2 +- CONTRIBUTING.md | 16 ++++++++-------- README.md | 4 ++-- docker/docker-compose.yml | 10 +++++----- docker/images/humble/Dockerfile | 2 +- docker/images/jazzy/Dockerfile | 2 +- docker/run.sh | 4 ++-- gz-ekumen/README.md | 0 {gz-ekumen => gz_ekumen_worlds}/CMakeLists.txt | 2 +- .../env-hooks/gz_ekumen_worlds.dsv | 0 .../env-hooks/gz_ekumen_worlds.sh | 0 .../textures/tiles/Tiles054_1K-JPG_Color.jpg | Bin .../textures/tiles/Tiles054_1K-JPG_NormalDX.jpg | Bin .../tiles/Tiles054_1K-JPG_Roughness.jpg | Bin .../textures/walls/macro_flour_diff_4k.jpg | Bin .../textures/walls/macro_flour_nor_gl_4k.exr | Bin .../textures/walls/macro_flour_rough_4k.exr | Bin .../textures/wood/wood_floor_diff_4k.jpg | Bin .../textures/wood/wood_floor_nor_gl_4k.exr | Bin .../textures/wood/wood_floor_rough_4k.exr | Bin .../models/ekumen_hq4/meshes/tiles.dae | 0 .../models/ekumen_hq4/meshes/walls.dae | 0 .../models/ekumen_hq4/meshes/wood.dae | 0 .../models/ekumen_hq4/model.config | 0 .../models/ekumen_hq4/model.sdf | 0 {gz-ekumen => gz_ekumen_worlds}/package.xml | 2 +- .../worlds/empty_ekumen_hq4.world | 2 +- .../worlds/populated_ekumen_hq4.world | 2 +- 28 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 gz-ekumen/README.md rename {gz-ekumen => gz_ekumen_worlds}/CMakeLists.txt (97%) rename gz-ekumen/env-hooks/gz-ekumen.dsv => gz_ekumen_worlds/env-hooks/gz_ekumen_worlds.dsv (100%) rename gz-ekumen/env-hooks/gz-ekumen.sh => gz_ekumen_worlds/env-hooks/gz_ekumen_worlds.sh (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Color.jpg (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_NormalDX.jpg (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Roughness.jpg (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/walls/macro_flour_diff_4k.jpg (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/walls/macro_flour_nor_gl_4k.exr (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/walls/macro_flour_rough_4k.exr (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/wood/wood_floor_diff_4k.jpg (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/wood/wood_floor_nor_gl_4k.exr (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/materials/textures/wood/wood_floor_rough_4k.exr (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/meshes/tiles.dae (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/meshes/walls.dae (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/meshes/wood.dae (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/model.config (100%) rename {gz-ekumen => gz_ekumen_worlds}/models/ekumen_hq4/model.sdf (100%) rename {gz-ekumen => gz_ekumen_worlds}/package.xml (95%) rename {gz-ekumen => gz_ekumen_worlds}/worlds/empty_ekumen_hq4.world (98%) rename {gz-ekumen => gz_ekumen_worlds}/worlds/populated_ekumen_hq4.world (99%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd60cfa..a7fd3e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,6 +41,6 @@ jobs: required-ros-distributions: jazzy - uses: ros-tooling/action-ros-ci@v0.3 with: - package-name: gz-ekumen + package-name: gz_ekumen_worlds target-ros2-distro: jazzy import-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index caf92b3..4af13c9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,9 +2,9 @@ The contributing guidelines are based on the [Andino](https://github.com/Ekumen-OS/andino) project's guidelines. -## Contributing to `gz-worlds` +## Contributing to `gz_ekumen_worlds` -The following is a set of guidelines for contributing to the `gz-worlds` project. +The following is a set of guidelines for contributing to the `gz_ekumen_worlds` project. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request. @@ -49,12 +49,12 @@ Provide more context by answering these questions: Include details about your configuration and environment: -* **Which version of `gz-worlds` are you using?**? +* **Which version of `gz_ekumen_worlds` are you using?**? * **What's the name and version of the OS you're using**? * **What's the ROS 2 distribution you're using**? * **What's the Gazebo version you're using**? -* **Are you running `gz-worlds` using the provided docker container?** See [docker](docker/README.md). -* **Are you running `gz-worlds` in a virtual machine?** If so, which VM software are you using and which operating systems and versions are used for the host and the guest? +* **Are you running `gz_ekumen_worlds` using the provided docker container?** See [docker](docker/README.md). +* **Are you running `gz_ekumen_worlds` in a virtual machine?** If so, which VM software are you using and which operating systems and versions are used for the host and the guest? ### Suggesting Enhancements @@ -75,7 +75,7 @@ existed. * **Check if you're using the latest software version**. A more recent version may contain your desired feature. * **Determine which repository the enhancement should be suggested in** -* **Perform a** [cursory search](https://github.com/Ekumen-OS/gz-worlds/issues?q=is%3Aissue) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one. +* **Perform a** [cursory search](https://github.com/Ekumen-OS/gz_ekumen_worlds/issues?q=is%3Aissue) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one. #### How Do I Submit A (Good) Enhancement Suggestion @@ -89,7 +89,7 @@ After you've determined which repository your enhancement suggestion is related * **Describe the current behavior** and **explain which behavior you expected to see instead** and why. * **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem. * **Explain why this enhancement would be useful** to most users and isn't something that can or should be implemented as a separate application. -* **Specify which version of `gz-worlds` you're using.** +* **Specify which version of `gz_ekumen_worlds` you're using.** * **Specify the name and version of the OS you're using.** ### Contributing Code @@ -100,7 +100,7 @@ get acquainted with this development process. #. **Read the** [reporting_bugs](#reporting-bugs) **and** [suggesting_enhancements](#suggesting-enhancements) **sections first.** -#. **Fork the `gz-worlds` repository**. All of your development should take place in your fork. +#. **Fork the `gz_ekumen_worlds` repository**. All of your development should take place in your fork. - An important thing to do is create a remote pointing to the [upstream remote repository](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork). This way, you can always check for modifications on the original repository and **always** keep your fork repository up to date. #. **Work out of a new branch**, one that is not diff --git a/README.md b/README.md index 4f888de..955bcd6 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ These worlds have been tested the following matrix: Once built and sourced, package resources may be found under `/models` and `/worlds`, e.g.: ``` sh -gz sim -r gz-ekumen/worlds/populated_ekumen_hq4.world # for Gazebo Garden and later versions -ign gazebo -r gz-ekumen/worlds/populated_ekumen_hq4.world # for Gazebo Fortress and earlier versions +gz sim -r gz_ekumen_worlds/worlds/populated_ekumen_hq4.world # for Gazebo Garden and later versions +ign gazebo -r gz_ekumen_worlds/worlds/populated_ekumen_hq4.world # for Gazebo Fortress and earlier versions ``` ## :raised_hands: Contributing diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 39d04f6..797e1d1 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,13 +1,13 @@ services: - gz-worlds-dev: + gz_ekumen_worlds-dev: build: context: .. dockerfile: docker/images/${ROSDISTRO:-humble}/Dockerfile args: - GZ_VERSION=${GZ_VERSION:-harmonic} - image: ekumenlabs/gz-worlds-${ROSDISTRO:-humble}-dev - hostname: gz-worlds-${ROSDISTRO:-humble}-dev - container_name: gz-worlds-${ROSDISTRO:-humble}-dev + image: ekumenlabs/gz_ekumen_worlds-${ROSDISTRO:-humble}-dev + hostname: gz_ekumen_worlds-${ROSDISTRO:-humble}-dev + container_name: gz_ekumen_worlds-${ROSDISTRO:-humble}-dev environment: - DISPLAY - QT_X11_NO_MITSHM=1 @@ -22,7 +22,7 @@ services: volumes: - /tmp/.X11-unix:/tmp/.X11-unix:rw - /tmp/.docker.xauth:/tmp/.docker.xauth - - ..:/home/developer/ws/src/gz-worlds + - ..:/home/developer/ws/src/gz_ekumen_worlds - gz-fuel-cache:/home/developer/.gz deploy: resources: diff --git a/docker/images/humble/Dockerfile b/docker/images/humble/Dockerfile index f7a143f..8922feb 100644 --- a/docker/images/humble/Dockerfile +++ b/docker/images/humble/Dockerfile @@ -2,7 +2,7 @@ FROM ros:humble-ros-base-jammy AS cacher WORKDIR /ws/src -COPY . gz-worlds/ +COPY . gz_ekumen_worlds/ RUN mkdir -p /tmp/ws/src \ && find ./ -name "package.xml" | xargs cp --parents -t /tmp/ws/src \ diff --git a/docker/images/jazzy/Dockerfile b/docker/images/jazzy/Dockerfile index 41415b1..eb7cad0 100644 --- a/docker/images/jazzy/Dockerfile +++ b/docker/images/jazzy/Dockerfile @@ -2,7 +2,7 @@ FROM ros:jazzy-ros-base-noble AS cacher WORKDIR /ws/src -COPY . gz-worlds/ +COPY . gz_ekumen_worlds/ RUN mkdir -p /tmp/ws/src \ && find ./ -name "package.xml" | xargs cp --parents -t /tmp/ws/src \ diff --git a/docker/run.sh b/docker/run.sh index c110497..2f98236 100755 --- a/docker/run.sh +++ b/docker/run.sh @@ -70,6 +70,6 @@ done # https://github.com/docker/compose/releases/tag/v2.13.0. # We have this for convenience and compatibility with previous versions. # Otherwise, we could just forward the script arguments to the run verb. -[[ "$BUILD" = true ]] && docker compose build gz-worlds-dev +[[ "$BUILD" = true ]] && docker compose build gz_ekumen_worlds-dev -PRIVILEGED_CONTAINER=$PRIVILEGED_CONTAINER USERID=$(id -u) GROUPID=dialout docker compose run --rm gz-worlds-dev +PRIVILEGED_CONTAINER=$PRIVILEGED_CONTAINER USERID=$(id -u) GROUPID=dialout docker compose run --rm gz_ekumen_worlds-dev diff --git a/gz-ekumen/README.md b/gz-ekumen/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/gz-ekumen/CMakeLists.txt b/gz_ekumen_worlds/CMakeLists.txt similarity index 97% rename from gz-ekumen/CMakeLists.txt rename to gz_ekumen_worlds/CMakeLists.txt index b83a7cf..94b1693 100644 --- a/gz-ekumen/CMakeLists.txt +++ b/gz_ekumen_worlds/CMakeLists.txt @@ -13,7 +13,7 @@ # limitations under the License. cmake_minimum_required(VERSION 3.7) -project(gz-ekumen) +project(gz_ekumen_worlds) find_package(ament_cmake REQUIRED) diff --git a/gz-ekumen/env-hooks/gz-ekumen.dsv b/gz_ekumen_worlds/env-hooks/gz_ekumen_worlds.dsv similarity index 100% rename from gz-ekumen/env-hooks/gz-ekumen.dsv rename to gz_ekumen_worlds/env-hooks/gz_ekumen_worlds.dsv diff --git a/gz-ekumen/env-hooks/gz-ekumen.sh b/gz_ekumen_worlds/env-hooks/gz_ekumen_worlds.sh similarity index 100% rename from gz-ekumen/env-hooks/gz-ekumen.sh rename to gz_ekumen_worlds/env-hooks/gz_ekumen_worlds.sh diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Color.jpg b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Color.jpg similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Color.jpg rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Color.jpg diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_NormalDX.jpg b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_NormalDX.jpg similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_NormalDX.jpg rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_NormalDX.jpg diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Roughness.jpg b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Roughness.jpg similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Roughness.jpg rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/tiles/Tiles054_1K-JPG_Roughness.jpg diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/walls/macro_flour_diff_4k.jpg b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/walls/macro_flour_diff_4k.jpg similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/walls/macro_flour_diff_4k.jpg rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/walls/macro_flour_diff_4k.jpg diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/walls/macro_flour_nor_gl_4k.exr b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/walls/macro_flour_nor_gl_4k.exr similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/walls/macro_flour_nor_gl_4k.exr rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/walls/macro_flour_nor_gl_4k.exr diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/walls/macro_flour_rough_4k.exr b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/walls/macro_flour_rough_4k.exr similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/walls/macro_flour_rough_4k.exr rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/walls/macro_flour_rough_4k.exr diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/wood/wood_floor_diff_4k.jpg b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/wood/wood_floor_diff_4k.jpg similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/wood/wood_floor_diff_4k.jpg rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/wood/wood_floor_diff_4k.jpg diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/wood/wood_floor_nor_gl_4k.exr b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/wood/wood_floor_nor_gl_4k.exr similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/wood/wood_floor_nor_gl_4k.exr rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/wood/wood_floor_nor_gl_4k.exr diff --git a/gz-ekumen/models/ekumen_hq4/materials/textures/wood/wood_floor_rough_4k.exr b/gz_ekumen_worlds/models/ekumen_hq4/materials/textures/wood/wood_floor_rough_4k.exr similarity index 100% rename from gz-ekumen/models/ekumen_hq4/materials/textures/wood/wood_floor_rough_4k.exr rename to gz_ekumen_worlds/models/ekumen_hq4/materials/textures/wood/wood_floor_rough_4k.exr diff --git a/gz-ekumen/models/ekumen_hq4/meshes/tiles.dae b/gz_ekumen_worlds/models/ekumen_hq4/meshes/tiles.dae similarity index 100% rename from gz-ekumen/models/ekumen_hq4/meshes/tiles.dae rename to gz_ekumen_worlds/models/ekumen_hq4/meshes/tiles.dae diff --git a/gz-ekumen/models/ekumen_hq4/meshes/walls.dae b/gz_ekumen_worlds/models/ekumen_hq4/meshes/walls.dae similarity index 100% rename from gz-ekumen/models/ekumen_hq4/meshes/walls.dae rename to gz_ekumen_worlds/models/ekumen_hq4/meshes/walls.dae diff --git a/gz-ekumen/models/ekumen_hq4/meshes/wood.dae b/gz_ekumen_worlds/models/ekumen_hq4/meshes/wood.dae similarity index 100% rename from gz-ekumen/models/ekumen_hq4/meshes/wood.dae rename to gz_ekumen_worlds/models/ekumen_hq4/meshes/wood.dae diff --git a/gz-ekumen/models/ekumen_hq4/model.config b/gz_ekumen_worlds/models/ekumen_hq4/model.config similarity index 100% rename from gz-ekumen/models/ekumen_hq4/model.config rename to gz_ekumen_worlds/models/ekumen_hq4/model.config diff --git a/gz-ekumen/models/ekumen_hq4/model.sdf b/gz_ekumen_worlds/models/ekumen_hq4/model.sdf similarity index 100% rename from gz-ekumen/models/ekumen_hq4/model.sdf rename to gz_ekumen_worlds/models/ekumen_hq4/model.sdf diff --git a/gz-ekumen/package.xml b/gz_ekumen_worlds/package.xml similarity index 95% rename from gz-ekumen/package.xml rename to gz_ekumen_worlds/package.xml index f0ae5a8..35d07ef 100644 --- a/gz-ekumen/package.xml +++ b/gz_ekumen_worlds/package.xml @@ -1,6 +1,6 @@ - gz-ekumen + gz_ekumen_worlds 0.1.0 Useful Gazebo worlds and models Franco Cipollone diff --git a/gz-ekumen/worlds/empty_ekumen_hq4.world b/gz_ekumen_worlds/worlds/empty_ekumen_hq4.world similarity index 98% rename from gz-ekumen/worlds/empty_ekumen_hq4.world rename to gz_ekumen_worlds/worlds/empty_ekumen_hq4.world index 6e03968..a80c791 100644 --- a/gz-ekumen/worlds/empty_ekumen_hq4.world +++ b/gz_ekumen_worlds/worlds/empty_ekumen_hq4.world @@ -118,7 +118,7 @@ - model://gz-ekumen/models/ekumen_hq4 + model://gz_ekumen_worlds/models/ekumen_hq4 diff --git a/gz-ekumen/worlds/populated_ekumen_hq4.world b/gz_ekumen_worlds/worlds/populated_ekumen_hq4.world similarity index 99% rename from gz-ekumen/worlds/populated_ekumen_hq4.world rename to gz_ekumen_worlds/worlds/populated_ekumen_hq4.world index 01e9bb5..7749857 100644 --- a/gz-ekumen/worlds/populated_ekumen_hq4.world +++ b/gz_ekumen_worlds/worlds/populated_ekumen_hq4.world @@ -118,7 +118,7 @@ - model://gz-ekumen/models/ekumen_hq4 + model://gz_ekumen_worlds/models/ekumen_hq4 https://fuel.gazebosim.org/1.0/OpenRobotics/models/Office Desk