diff --git a/.github/workflows/BuildAndRun.yaml b/.github/workflows/BuildAndRun.yaml index f9d0fdb12e5..d261ca86f8b 100644 --- a/.github/workflows/BuildAndRun.yaml +++ b/.github/workflows/BuildAndRun.yaml @@ -19,8 +19,8 @@ on: - master jobs: job1: - name: Build and run - runs-on: ubuntu-22.04 + name: BuildAndRun + runs-on: ${{ matrix.runs_on }} timeout-minutes: 180 container: ros:${{ matrix.rosdistro }} env: @@ -29,6 +29,7 @@ jobs: fail-fast: false matrix: rosdistro: [humble] + runs_on: [ubuntu-22.04] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - name: Suppress warnings run: git config --global --add safe.directory '*' diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index f279065ca53..150e6778d61 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -6,30 +6,39 @@ on: - cron: 0 0 * * * pull_request: paths: - - '**' - - '!docs/**' - - '!README.md' - - '!.github/**' - - '.github/workflows/Docker.yaml' - - '!mkdocs.yml' + - "**" + - "!docs/**" + - "!README.md" + - "!.github/**" + - ".github/workflows/Docker.yaml" + - "!mkdocs.yml" push: branches: - master release: types: [published] jobs: - job1: - name: Build Docker image - runs-on: ubuntu-20.04 - timeout-minutes: 180 + build_docker_image: + name: Build Docker Image + runs-on: ubuntu-22.04 + timeout-minutes: 720 strategy: matrix: rosdistro: [humble] + arch: [amd64, arm64] steps: - - uses: actions/checkout@v3 + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@main + with: + tool-cache: false + + - name: Install docker for ubuntu runner + uses: docker/setup-buildx-action@v3 - - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 + - name: Install QEMU + uses: docker/setup-qemu-action@v3 + + - uses: actions/checkout@v3 - name: Login to GitHub Container Registry uses: docker/login-action@v2 @@ -38,10 +47,15 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v3 + - name: Build and push (${{ matrix.arch }}) + uses: docker/bake-action@v3 with: - tags: ghcr.io/${{ github.repository_owner }}/scenario_simulator_v2:${{ matrix.rosdistro }} - no-cache: true - build-args: ROS_DISTRO=${{ matrix.rosdistro }} - push: ${{ github.event_name != 'pull_request' }} + files: | + ./docker-bake.hcl + workdir: . + set: | + *.cache-to=type=gha,mode=max + *.cache-from=type=gha + push: ${{ github.event_name != 'pull_request' && matrix.arch == 'amd64' }} + targets: | + ${{ matrix.rosdistro }}_base_${{ matrix.arch }} diff --git a/.gitignore b/.gitignore index 665a3b4b50c..b06f5fabf95 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ log # external packages external/* !external/concealer +!external/embree_vendor # auto-generated files html diff --git a/Dockerfile b/Dockerfile index 4d69742ada8..66dac7baeb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,22 @@ -ARG ROS_DISTRO -FROM ros:${ROS_DISTRO} +ARG ROS_DISTRO="humble" +FROM ros:${ROS_DISTRO} as build-stage SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NOWARNINGS=yes -ARG ROS_DISTRO -RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common +RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \ + apt-get update && apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache # cspell: ignore kisak -RUN add-apt-repository ppa:kisak/kisak-mesa -y -RUN apt-get update && apt-get install libegl-mesa0 -y +RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \ + add-apt-repository ppa:kisak/kisak-mesa -y +RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \ + apt-get update && apt-get install libegl-mesa0 -y + +RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ + echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator COPY . $WORKDIR @@ -18,10 +26,24 @@ RUN mkdir -p /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/e WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator RUN vcs import external < dependency_${ROS_DISTRO}.repos WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src -RUN source /opt/ros/${ROS_DISTRO}/setup.bash && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} +RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \ + source /opt/ros/${ROS_DISTRO}/setup.bash \ + && apt-get update \ + && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws -RUN source /opt/ros/${ROS_DISTRO}/setup.bash && colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release + +ENV CC="/usr/lib/ccache/gcc" +ENV CXX="/usr/lib/ccache/g++" +ENV CCACHE_DIR="/ccache" +RUN --mount=type=cache,target=/ccache source /opt/ros/${ROS_DISTRO}/setup.bash && \ + colcon build --symlink-install \ + --cmake-args \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DBUILD_CPP_MOCK_SCENARIOS=ON COPY ./docker-entrypoint.sh / RUN chmod a+x /docker-entrypoint.sh diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 new file mode 100644 index 00000000000..ff997f01684 --- /dev/null +++ b/Dockerfile.arm64 @@ -0,0 +1,53 @@ +ARG ROS_DISTRO="humble" + +# cspell: ignore impactaky deno BUILDPLATFORM TARGETARCH + +FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.1.0 AS mimic-host +FROM ros:${ROS_DISTRO} as build-stage + +SHELL ["/bin/bash", "-c"] +ENV DEBIAN_FRONTEND=noninteractive +ENV DEBCONF_NOWARNINGS=yes + +COPY --from=mimic-host / /mimic-cross +RUN /mimic-cross/mimic-cross.deno/setup.sh + +RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ + sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache +# cspell: ignore kisak +RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ + add-apt-repository ppa:kisak/kisak-mesa -y +RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ + apt-get update && apt-get install libegl-mesa0 -y + +RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ + echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache + +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator +COPY . $WORKDIR + +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/ +RUN mkdir -p /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/external +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator +RUN vcs import external < dependency_${ROS_DISTRO}.repos +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src +RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ + source /opt/ros/${ROS_DISTRO}/setup.bash \ + && apt-get update \ + && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} + +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws + +RUN source /opt/ros/${ROS_DISTRO}/setup.bash && \ + colcon build --symlink-install \ + --cmake-args \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_CPP_MOCK_SCENARIOS=ON +COPY ./docker-entrypoint.sh / +RUN chmod a+x /docker-entrypoint.sh + +ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 9387395f678..d00bfee7a93 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package arithmetic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index d7c8fbfff97..6142a129368 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 1.10.0 + 1.11.3 arithmetic library for scenario_simulator_v2 Tatsuya Yamasaki Apache License 2.0 diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index b903b6ea3ba..3881b5d0ff2 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package geometry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index d087cbab749..afc684f0ac7 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 1.10.0 + 1.11.3 geometry math library for scenario_simulator_v2 application Masaya Kataoka Apache License 2.0 diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index 12ea9bb8dd0..0711999e9e1 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog for package scenario_simulator_exception ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 10188878ddb..9da1d8dfee9 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 1.10.0 + 1.11.3 Exception types for scenario simulator Tatsuya Yamasaki Apache License 2.0 diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index 55704fe2b01..ef62923d74a 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog for package junit_exporter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index d6dbad05c0d..e8e1b7c1f85 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 1.10.0 + 1.11.3 Lightweight JUnit library for ROS 2 Masaya Kataoka Tatsuya Yamasaki diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index 7fac272bf2a..39a0c3aa114 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package status_monitor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 7bc45cf59f4..62cc99ed916 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 1.10.0 + 1.11.3 none Tatsuya Yamasaki Apache License 2.0 diff --git a/docker-bake.hcl b/docker-bake.hcl new file mode 100644 index 00000000000..fac2c5237a4 --- /dev/null +++ b/docker-bake.hcl @@ -0,0 +1,26 @@ +group "default" { + targets = ["humble"] +} + +target "base_amd64" { + target = "build-stage" + dockerfile = "Dockerfile" + platforms = ["linux/amd64"] +} + +target "base_arm64" { + target = "build-stage" + dockerfile = "Dockerfile.arm64" + platforms = ["linux/arm64/v8"] +} + +target "humble" { + inherits = [base] + name = "humble_${base}" + tags = ["ghcr.io/tier4/scenario_simulator_v2:humble"] + args = {"ROS_DISTRO" : "humble"} + group = ["humble"] + matrix = { + base = ["base_amd64", "base_arm64"] + } +} diff --git a/docs/developer_guide/TrafficSimulator.md b/docs/developer_guide/TrafficSimulator.md index a2063379add..67d8839a7a1 100644 --- a/docs/developer_guide/TrafficSimulator.md +++ b/docs/developer_guide/TrafficSimulator.md @@ -26,10 +26,7 @@ You can also see the detailed documentation of the API classes [here](https://ti #include #include #include - #include - -// headers in STL #include #include #include diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index b4d65e04ec0..7a75a3866d4 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog for package concealer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 2ff02e0bb7a..0546395848d 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 1.10.0 + 1.11.3 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/external/embree_vendor/.gitignore b/external/embree_vendor/.gitignore new file mode 100644 index 00000000000..9ce007f53e1 --- /dev/null +++ b/external/embree_vendor/.gitignore @@ -0,0 +1,2 @@ +debian +obj-x86_64-linux-gnu diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst new file mode 100644 index 00000000000..c59088db103 --- /dev/null +++ b/external/embree_vendor/CHANGELOG.rst @@ -0,0 +1,102 @@ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package embree_vendor +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +0.0.9 (2021-07-13) +------------------ + +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge pull request `#1173 `_ from tier4/feature/arm_support + Feature/arm_build_test +* update version +* remove unused files +* remove unused .github directory +* add embree_vendor package to the repository +* Contributors: Masaya Kataoka + +0.1.0 (2021-07-14) +------------------ +* Merge branch 'master' of https://github.com/OUXT-Polaris/embree_vendor +* Merge pull request `#4 `_ from OUXT-Polaris/feature/onetbb_src + Feature/onetbb src +* change build order +* remove unused action +* add tbb build command +* fix version +* Contributors: Masaya Kataoka + +0.8.1 (2021-07-13) +------------------ +* add pkg-config to the depends +* Contributors: Masaya Kataoka + +0.0.8 (2021-07-12) +------------------ +* fix embree version +* Contributors: Masaya Kataoka + +0.0.7 (2021-07-12) +------------------ +* remove test lines +* Merge pull request `#3 `_ from OUXT-Polaris/workflow/galactic + update CI workflow for galactic +* update .github/workflows/ROS2-Galactic.yaml +* Merge pull request `#2 `_ from OUXT-Polaris/workflow/foxy + update CI workflow for foxy +* update .github/workflows/ROS2-Foxy.yaml +* update dependency.repos +* add workflow_dispatch trigger +* Contributors: Masaya Kataoka, robotx_buildfarm + +0.0.6 (2021-01-10) +------------------ +* Merge pull request `#1 `_ from OUXT-Polaris/feature/add_tbb_to_depends + update package.xml +* update package.xml +* update workflow +* rename workflow +* fix workflow +* add generate foxy dpkg workflow +* Contributors: Masaya Kataoka + +0.0.5 (2021-01-04) +------------------ +* update LICENSE +* add ignore +* Contributors: Masaya Kataoka + +0.0.4 (2021-01-03) +------------------ +* update release workflow +* Contributors: Masaya Kataoka + +0.0.2 (2021-01-03) +------------------ +* update version +* update version tag +* update version +* add description +* add Release action +* fix xml tag +* add libglfw3-dev to the depends +* update workflow +* add README.md +* Create ROS2-Foxy.yaml + adding ROS2-Foxy workflow +* update instal dir +* enable pass rostest +* Contributors: Masaya Kataoka diff --git a/external/embree_vendor/CMakeLists.txt b/external/embree_vendor/CMakeLists.txt new file mode 100644 index 00000000000..9b2ebb8acd7 --- /dev/null +++ b/external/embree_vendor/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 3.5) +project(embree_vendor) + +# Default to C99 +if(NOT CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 99) +endif() + +# Default to C++14 +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() + +if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options(-Wall -Wextra -Wpedantic) +endif() + +# find dependencies +find_package(ament_cmake REQUIRED) + +macro(build_embree) + + set(cmake_commands) + set(cmake_configure_args + -Wno-dev + -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_install + -DEMBREE_ISPC_SUPPORT=OFF) + + include(ExternalProject) + externalproject_add(embree-ext + GIT_REPOSITORY https://github.com/embree/embree.git + GIT_TAG v4.1.0 + TIMEOUT 6000 + ${cmake_commands} + CMAKE_ARGS + ${cmake_configure_args} + ) + + # The external project will install to the build folder, but we'll install that on make install. + install( + DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_install/ + DESTINATION + ${CMAKE_INSTALL_PREFIX} + ) +endmacro() + +build_embree() + +ament_export_include_directories(include) +ament_export_libraries(embree4) + +ament_package() diff --git a/external/embree_vendor/README.md b/external/embree_vendor/README.md new file mode 100644 index 00000000000..71ef1e10ef5 --- /dev/null +++ b/external/embree_vendor/README.md @@ -0,0 +1,3 @@ +# embree_vendor + +vendor package for ray-tracing library made by Intel. (https://github.com/embree/embree) diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml new file mode 100644 index 00000000000..3eb2d4348ab --- /dev/null +++ b/external/embree_vendor/package.xml @@ -0,0 +1,21 @@ + + + + embree_vendor + 1.11.3 + vendor packages for intel raytracing kernel library + masaya + Apache 2.0 + + ament_cmake + libglfw3-dev + pkg-config + tbb + + ament_lint_auto + ament_lint_common + + + ament_cmake + + diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 8444f8099b2..e9da25b5fcc 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package kashiwanoha_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 1eca16fa1d0..0c06e0df682 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 1.10.0 + 1.11.3 map package for kashiwanoha Masaya Kataoka Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index 5c7ffe7e59e..1e2ed6a4856 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package cpp_mock_scenarios ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- +* Merge pull request `#1224 `_ from tier4/fix/remove_headers_in_stl_comment + remove // headers in STL comment +* remove // headers in STL comment +* Contributors: Masaya Kataoka, Tatsuya Yamasaki + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp b/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp index cee1618f281..5989f077922 100644 --- a/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp +++ b/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp @@ -15,14 +15,12 @@ #ifndef CPP_MOCK_SCENARIOS__CPP_SCENARIO_NODE_HPP_ #define CPP_MOCK_SCENARIOS__CPP_SCENARIO_NODE_HPP_ -#include -#include -#include - -// headers in STL #include #include +#include +#include #include +#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 09eed289b97..ef8a043331e 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 1.10.0 + 1.11.3 C++ mock scenarios masaya Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp b/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp index d511b065fe7..124f53f1597 100644 --- a/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp +++ b/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp b/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp index f85738e8817..a7cb7b95605 100644 --- a/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp +++ b/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp b/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp index 7210d5c8bdc..04fa1eceac6 100644 --- a/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp +++ b/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp b/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp index 3e433423821..cd19c42a469 100644 --- a/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp +++ b/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp b/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp index d71729b2a30..d89f8584c03 100644 --- a/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp +++ b/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp b/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp index 24108503cb6..6079e54af5e 100644 --- a/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp +++ b/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp b/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp index e2c477b79e3..9ca26be1585 100644 --- a/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp +++ b/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp b/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp index 3631456c15a..ea6d6cbf02d 100644 --- a/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp +++ b/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp b/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp index d21a4889826..acb92544a19 100644 --- a/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp +++ b/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp b/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp index 38bba72a680..dc2d0df7616 100644 --- a/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp +++ b/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp index e7ad9daa2a0..0da53d6be17 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp index b49470be49a..f44fd8cf1db 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp index a22427f0691..96e4f951e36 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp index 5f81424dced..5fb7bf04e9c 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp index a0581369b18..ce85da9136b 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp index c822a005b25..18b71d0914a 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp index 491f557bd4b..99a832208b4 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp index 9ebd20c6b51..aca94784ae8 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp index 3d815d19113..d51f0629965 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp index 4d51b8dd65c..373ba5d72de 100644 --- a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp +++ b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp b/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp index 0ffc13ec20b..b059a66602b 100644 --- a/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp +++ b/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/merge/merge_left.cpp b/mock/cpp_mock_scenarios/src/merge/merge_left.cpp index 1dd1ab4738a..58657664c30 100644 --- a/mock/cpp_mock_scenarios/src/merge/merge_left.cpp +++ b/mock/cpp_mock_scenarios/src/merge/merge_left.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp b/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp index ee1f035b666..a9fb6e778d1 100644 --- a/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp +++ b/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp @@ -15,22 +15,20 @@ #include #include +#include #include #include +#include +#include #include +#include #include #include +#include #include "rclcpp/logger.hpp" #include "rclcpp/logging.hpp" -// headers in STL -#include -#include -#include -#include -#include - namespace cpp_mock_scenarios { class TraveledDistanceScenario : public cpp_mock_scenarios::CppScenarioNode diff --git a/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp b/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp index 33638138c07..86472368741 100644 --- a/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp +++ b/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp b/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp index 54478ddc5ab..c43a293acaa 100644 --- a/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp +++ b/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp b/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp index 07c451dcb0c..18ba59f2115 100644 --- a/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp +++ b/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp @@ -17,15 +17,13 @@ #include #include #include +#include #include +#include #include +#include #include #include - -// headers in STL -#include -#include -#include #include class RandomScenario : public cpp_mock_scenarios::CppScenarioNode diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp index 94844fabf3f..79b7c5dfb05 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp index 7a83e377531..b49c3b12311 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp index c1c14e5e77d..87721639833 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp index 7e6d66932bc..2cdec5c0d60 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp index 675181e00c4..5e9e161d001 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp index f486fcec618..3552d6dbb75 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp index 144857533df..b6999ecd263 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp index 9336be41024..be3fa4e59d9 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp b/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp index a3c311ad6a6..d323f921542 100644 --- a/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp +++ b/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index 28f90c63f07..dcfb781eef1 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package openscenario_experimental_catalog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index f6c53b49177..2eab13edfd0 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 1.10.0 + 1.11.3 TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index 0d770ce9c3e..f2c5a74d226 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -2,6 +2,44 @@ Changelog for package openscenario_interpreter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge pull request `#1220 `_ from tier4/refactor/basic_types + Stop using ROS messages as basic types in `openscenario_interpreter` +* Merge branch 'master' into refactor/basic_types +* chore: apply linter +* chore: make another version of Properties::get to suite new form of basic types of openscenario_interpreter/syntax +* chore: fixed tests for structures that became trivial +* refactor: stop marking as const to members of Orientation +* refactor: stop using explicit keyword to default constructors +* refactor: stop using explicit keyword to default constructors +* refactor: remove redundant code according to N4659 (6.1) + Co-authored-by: Tatsuya Yamasaki +* refactor: remove redundant code according to N4659 (6.1) + Co-authored-by: Tatsuya Yamasaki +* refactor: remove redundant code according to N4659 (6.1) + Co-authored-by: Tatsuya Yamasaki +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* chore: apply linter +* refactor(openscenario_interpreter): delete ros messages from basic types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/scope.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/scope.hpp index 4a2ebd26c49..4f6cfe13ed5 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/scope.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/scope.hpp @@ -57,7 +57,7 @@ class EnvironmentFrame #undef DEFINE_SYNTAX_ERROR - explicit EnvironmentFrame() = default; + EnvironmentFrame() = default; explicit EnvironmentFrame(EnvironmentFrame &, const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp index 9d0d9874b86..a7250388353 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp @@ -28,9 +28,9 @@ struct Boolean value_type data; - explicit Boolean() = default; + Boolean() = default; - explicit constexpr Boolean(value_type value) noexcept : data(value) {} + constexpr Boolean(value_type value) noexcept : data(value) {} explicit Boolean(const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/catalog_locations.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/catalog_locations.hpp index 2a97dee348b..155a4838aa8 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/catalog_locations.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/catalog_locations.hpp @@ -42,7 +42,7 @@ inline namespace syntax struct CatalogLocations : public std::unordered_map { - explicit CatalogLocations() = default; + CatalogLocations() = default; explicit CatalogLocations(const pugi::xml_node &, Scope &); }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/command.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/command.hpp index 5db0bf35707..ccc0638ac54 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/command.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/command.hpp @@ -30,7 +30,7 @@ struct Command print, } value; - explicit Command() = default; + Command() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/condition_edge.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/condition_edge.hpp index 6514ef25399..702d2527f51 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/condition_edge.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/condition_edge.hpp @@ -101,7 +101,7 @@ struct ConditionEdge sticky, } value; - explicit ConditionEdge() = default; + ConditionEdge() = default; operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/coordinate_system.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/coordinate_system.hpp index ba40742fc71..d36e3fd51d4 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/coordinate_system.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/coordinate_system.hpp @@ -50,7 +50,7 @@ struct CoordinateSystem trajectory, } value; - explicit CoordinateSystem() = default; + CoordinateSystem() = default; constexpr CoordinateSystem(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp index 13b02b4caac..d7332cdfbda 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp @@ -15,16 +15,17 @@ #ifndef OPENSCENARIO_INTERPRETER__SYNTAX__DOUBLE_HPP_ #define OPENSCENARIO_INTERPRETER__SYNTAX__DOUBLE_HPP_ -#include #include namespace openscenario_interpreter { inline namespace syntax { -struct Double : public std_msgs::msg::Float64 +struct Double { - using value_type = decltype(std_msgs::msg::Float64::data); + using value_type = double; + + value_type data; Double() = default; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_dimension.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_dimension.hpp index 326394f911f..576402efe67 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_dimension.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_dimension.hpp @@ -54,7 +54,7 @@ struct DynamicsDimension distance, } value; - explicit DynamicsDimension() = default; + DynamicsDimension() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_shape.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_shape.hpp index 6e0fc013bcc..444558646e9 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_shape.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_shape.hpp @@ -84,7 +84,7 @@ struct DynamicsShape step, } value; - explicit DynamicsShape() = default; + DynamicsShape() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/fractional_cloud_cover.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/fractional_cloud_cover.hpp index f238add5eca..7bcbcf3bc5c 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/fractional_cloud_cover.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/fractional_cloud_cover.hpp @@ -61,7 +61,7 @@ struct FractionalCloudCover nineOktas } value; - explicit FractionalCloudCover() = default; + FractionalCloudCover() = default; constexpr FractionalCloudCover(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp index 9c090abe082..b074cf26ae6 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp @@ -17,20 +17,21 @@ #include #include -#include #include namespace openscenario_interpreter { inline namespace syntax { -struct Integer : public std_msgs::msg::Int64 +struct Integer { - using value_type = decltype(std_msgs::msg::Int64::data); + using value_type = std::int64_t; - explicit Integer() = default; + value_type data; - explicit Integer(value_type); + Integer() = default; + + Integer(value_type); explicit Integer(const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/misc_object_category.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/misc_object_category.hpp index d402ce6c7f9..35df8c0f39e 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/misc_object_category.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/misc_object_category.hpp @@ -83,7 +83,7 @@ struct MiscObjectCategory wind, // NOTE: DEPRECATED (since OpenSCENARIO 1.1) } value; - explicit MiscObjectCategory() = default; + MiscObjectCategory() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/orientation.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/orientation.hpp index 2690cf3309a..8c92271a4c6 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/orientation.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/orientation.hpp @@ -39,7 +39,7 @@ struct Orientation { const ReferenceContext type{}; - const Double h, p, r; + Double h, p, r; Orientation() = default; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/override_controller_value_action.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/override_controller_value_action.hpp index 5b7bac04856..3da3cf3930c 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/override_controller_value_action.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/override_controller_value_action.hpp @@ -58,7 +58,7 @@ struct OverrideControllerValueAction // New value for gear position or unset value. // const OverrideGearAction overrideGear; - explicit OverrideControllerValueAction() = default; + OverrideControllerValueAction() = default; explicit OverrideControllerValueAction(const pugi::xml_node &, Scope &); }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp index bc5e6dbfdc8..c90b054104d 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp @@ -34,7 +34,8 @@ inline namespace syntax * -------------------------------------------------------------------------- */ struct ParameterAssignments : std::list { - explicit ParameterAssignments() = default; + ParameterAssignments() = default; + explicit ParameterAssignments(const pugi::xml_node & node, Scope & scope) : std::list( readElements("ParameterAssignment", node, scope)) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_declaration.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_declaration.hpp index 8b1d1d6addb..8d8e55f708b 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_declaration.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_declaration.hpp @@ -44,7 +44,7 @@ struct ParameterDeclaration const String value; - explicit ParameterDeclaration() = default; + ParameterDeclaration() = default; explicit ParameterDeclaration(const pugi::xml_node &, Scope &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_type.hpp index c995fe40c63..61692f2ba6b 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_type.hpp @@ -62,7 +62,7 @@ struct ParameterType UNSIGNED_SHORT, } value; - explicit ParameterType() = default; + ParameterType() = default; constexpr operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/precipitation_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/precipitation_type.hpp index 52124740284..d56aff38176 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/precipitation_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/precipitation_type.hpp @@ -43,7 +43,7 @@ struct PrecipitationType { enum value_type { dry, rain, snow } value; - explicit PrecipitationType() = default; + PrecipitationType() = default; constexpr PrecipitationType(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/priority.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/priority.hpp index c767a029420..c3fa6578e7f 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/priority.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/priority.hpp @@ -62,7 +62,7 @@ struct Priority parallel, } value; - explicit Priority() = default; + Priority() = default; constexpr operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/properties.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/properties.hpp index e4e94a551ef..f9421ec345b 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/properties.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/properties.hpp @@ -61,7 +61,7 @@ struct Properties explicit Properties(const pugi::xml_node &, Scope &); template - auto get(const String & name, const T & default_value = T()) const -> auto + auto get(const String & name, const T & default_value) const -> auto { if (auto iter = properties.find(name); iter != std::end(properties)) { if (const auto [name, property] = *iter; not property.value.empty()) { @@ -73,6 +73,12 @@ struct Properties return default_value; } } + + template + auto get(const String & name) const -> auto + { + return get(name, T()); + } }; } // namespace syntax } // namespace openscenario_interpreter diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_type.hpp index 0d7c371aed3..1f8e11fd8a9 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_type.hpp @@ -59,7 +59,7 @@ struct RelativeDistanceType euclidianDistance, } value; - explicit RelativeDistanceType() = default; + RelativeDistanceType() = default; constexpr RelativeDistanceType(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/route_strategy.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/route_strategy.hpp index aa0deba931e..be6c1ba467d 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/route_strategy.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/route_strategy.hpp @@ -49,7 +49,7 @@ struct RouteStrategy random, // Random route. } value; - explicit RouteStrategy() = default; + RouteStrategy() = default; constexpr operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/rule.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/rule.hpp index dfd97ba602e..6f87833fc87 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/rule.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/rule.hpp @@ -56,7 +56,7 @@ struct Rule notEqualTo, } value; - explicit Rule() = default; + Rule() = default; explicit Rule(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_target_value_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_target_value_type.hpp index 0d3eb829857..69d0008099a 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_target_value_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_target_value_type.hpp @@ -58,7 +58,7 @@ struct SpeedTargetValueType factor, } value; - explicit SpeedTargetValueType() = default; + SpeedTargetValueType() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_state.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_state.hpp index 8d84cf37aee..34ed0960a65 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_state.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_state.hpp @@ -173,7 +173,7 @@ struct StoryboardElementState skipTransition, } value; - explicit StoryboardElementState() = default; + StoryboardElementState() = default; explicit StoryboardElementState(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_type.hpp index 19d07780954..7d7ad1f65ae 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_type.hpp @@ -53,7 +53,7 @@ struct StoryboardElementType story, } value; - explicit StoryboardElementType() = default; + StoryboardElementType() = default; constexpr operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/triggering_entities_rule.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/triggering_entities_rule.hpp index d7c9bcea9f8..0bab155fa87 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/triggering_entities_rule.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/triggering_entities_rule.hpp @@ -48,7 +48,7 @@ struct TriggeringEntitiesRule none, } value; - explicit TriggeringEntitiesRule() = default; + TriggeringEntitiesRule() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp index fe2e8cf51eb..8e052473a5f 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp @@ -17,18 +17,21 @@ #include #include -#include #include namespace openscenario_interpreter { inline namespace syntax { -struct UnsignedInteger : public std_msgs::msg::UInt64 +struct UnsignedInteger { - using value_type = decltype(std_msgs::msg::UInt64::data); + using value_type = std::uint64_t; - explicit UnsignedInteger(value_type value = {}); + value_type data; + + UnsignedInteger() = default; + + UnsignedInteger(value_type); explicit UnsignedInteger(const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp index 3f9c5f57a91..958076e50a1 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp @@ -16,18 +16,19 @@ #define OPENSCENARIO_INTERPRETER__SYNTAX__UNSIGNED_SHORT_HPP_ #include -#include #include namespace openscenario_interpreter { inline namespace syntax { -struct UnsignedShort : public std_msgs::msg::UInt16 +struct UnsignedShort { - using value_type = decltype(std_msgs::msg::UInt16::data); + using value_type = std::uint16_t; - explicit UnsignedShort() = default; + value_type data; + + UnsignedShort() = default; explicit UnsignedShort(value_type); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/wetness.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/wetness.hpp index 216c16fb2bc..a2193c705a5 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/wetness.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/wetness.hpp @@ -51,7 +51,7 @@ struct Wetness highFlooded // Road completely covered with water. Water depth > 5cm. } value; - explicit Wetness() = default; + Wetness() = default; constexpr Wetness(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 4c5b2de0f34..4aefed35e33 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 1.10.0 + 1.11.3 OpenSCENARIO 1.2.0 interpreter package for Autoware Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/src/syntax/double.cpp b/openscenario/openscenario_interpreter/src/syntax/double.cpp index 101bb74d7ee..84b28e35fd9 100644 --- a/openscenario/openscenario_interpreter/src/syntax/double.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/double.cpp @@ -25,9 +25,9 @@ inline namespace syntax { static_assert(std::is_standard_layout::value, ""); -static_assert(not std::is_trivial::value, ""); +static_assert(std::is_trivial::value, ""); -Double::Double(value_type value) { data = value; } +Double::Double(value_type value) : data(value) {} Double::Double(const std::string & s) try { diff --git a/openscenario/openscenario_interpreter/src/syntax/integer.cpp b/openscenario/openscenario_interpreter/src/syntax/integer.cpp index c5fe10c4df8..2c7f55c03ea 100644 --- a/openscenario/openscenario_interpreter/src/syntax/integer.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/integer.cpp @@ -21,7 +21,7 @@ inline namespace syntax { static_assert(std::is_standard_layout::value, ""); -static_assert(not std::is_trivial::value, ""); +static_assert(std::is_trivial::value, ""); Integer::Integer(value_type value) { data = value; } diff --git a/openscenario/openscenario_interpreter/src/syntax/unsigned_integer.cpp b/openscenario/openscenario_interpreter/src/syntax/unsigned_integer.cpp index a08d6ce8921..4a2094c8cf8 100644 --- a/openscenario/openscenario_interpreter/src/syntax/unsigned_integer.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/unsigned_integer.cpp @@ -20,7 +20,7 @@ inline namespace syntax { static_assert(std::is_standard_layout::value, ""); -static_assert(not std::is_trivial::value, ""); +static_assert(std::is_trivial::value, ""); UnsignedInteger::UnsignedInteger(value_type value) { data = value; } diff --git a/openscenario/openscenario_interpreter/src/syntax/unsigned_short.cpp b/openscenario/openscenario_interpreter/src/syntax/unsigned_short.cpp index e5f09a0c064..bfc23d9f58c 100644 --- a/openscenario/openscenario_interpreter/src/syntax/unsigned_short.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/unsigned_short.cpp @@ -22,7 +22,7 @@ inline namespace syntax { static_assert(std::is_standard_layout::value, ""); -static_assert(not std::is_trivial::value, ""); +static_assert(std::is_trivial::value, ""); UnsignedShort::UnsignedShort(value_type value) { data = value; } diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index ed5c9842713..848f7aa6042 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package openscenario_interpreter_example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index cb822110862..47449f6469b 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 1.10.0 + 1.11.3 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index 8fb12e424f1..615325c2f7c 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package openscenario_interpreter_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 27d11358abc..d49f40fafad 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 1.10.0 + 1.11.3 ROS message types for package openscenario_interpreter Yamasaki Tatsuya Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index 1256f3e2cfb..279be7cf41f 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog for package openscenario_preprocessor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index b88da2a539a..904a58ca59d 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 1.10.0 + 1.11.3 Example package for TIER IV OpenSCENARIO Interpreter Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index b185416be79..aaf5e9823c7 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package openscenario_preprocessor_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index fa3f6e2e5c9..c8931ce5bef 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 1.10.0 + 1.11.3 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index 4ca515c5098..ee70d6df75c 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package openscenario_utility ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 2e95cfa1881..f183843c341 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 1.10.0 + 1.11.3 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst index a2bb551d0d2..2e56960ae02 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package openscenario_visualization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge pull request `#1173 `_ from tier4/feature/arm_support + Feature/arm_build_test +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/rviz_plugins/openscenario_visualization/CMakeLists.txt b/rviz_plugins/openscenario_visualization/CMakeLists.txt index 459e794f473..0fb38db9278 100644 --- a/rviz_plugins/openscenario_visualization/CMakeLists.txt +++ b/rviz_plugins/openscenario_visualization/CMakeLists.txt @@ -12,7 +12,7 @@ if(NOT CMAKE_CXX_STANDARD) endif() if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wall -Wpedantic -Werror) # -Wextra + add_compile_options(-Wall -Werror -Wextra -Wpedantic) endif() # find dependencies diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index 1a987ad7ad0..b741c069698 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 1.10.0 + 1.11.3 Visualization tools for simulation results Masaya Kataoka Kyoichi Sugahara diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst index 9f5bc071df4..d0d4b0d3019 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst @@ -2,6 +2,26 @@ Changelog for package real_time_factor_control_rviz_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml index 90bf9ccfefd..4035aa98655 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml @@ -2,7 +2,7 @@ real_time_factor_control_rviz_plugin - 1.10.0 + 1.11.3 Slider controlling real time factor value. Paweł Lech Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 23c31d9857a..2d91b3a569b 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 30e11412263..19ec4af4084 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 1.10.0 + 1.11.3 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index 1bcc756a436..336090019ba 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog for package behavior_tree_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 45cf999daad..b67fd1fb60c 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 1.10.0 + 1.11.3 Behavior tree plugin for traffic_simulator masaya Apache 2.0 diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index 5fd3932729d..0f20942ede7 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog for package do_nothing_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 7dfa2c7848a..f4ac12b0917 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 1.10.0 + 1.11.3 Behavior plugin for do nothing Masaya Kataoka Apache 2.0 diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index 8eb43091914..4bd73407ee4 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -2,6 +2,38 @@ Changelog for package simple_sensor_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge pull request `#1173 `_ from tier4/feature/arm_support + Feature/arm_build_test +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* fix compile error +* remove IntersectContext +* remove unused function +* remove unused line +* rename to new struct name + https://github.com/embree/embree/blob/be0accfd0b246e2b03355b8ee7710a22c1b49240/README.md?plain=1#L1360-L1361 +* remove some warnings +* change header +* add arm support branch +* Contributors: Masaya Kataoka, Ubuntu, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge pull request `#1200 `_ from tier4/feature/simple_sensor_simulator/custom_noise diff --git a/simulation/simple_sensor_simulator/CMakeLists.txt b/simulation/simple_sensor_simulator/CMakeLists.txt index 8e784fecd3a..df6f898805f 100644 --- a/simulation/simple_sensor_simulator/CMakeLists.txt +++ b/simulation/simple_sensor_simulator/CMakeLists.txt @@ -54,7 +54,6 @@ ament_auto_add_library(simple_sensor_simulator_component SHARED src/vehicle_simulation/vehicle_model/sim_model_interface.cpp ) target_link_libraries(simple_sensor_simulator_component - embree3 pthread sodium zmq diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp index d1113e8f5ac..d0bd697c469 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ -#include +#include #include #include @@ -76,8 +76,7 @@ class Raycaster static void intersect( int thread_id, int thread_count, RTCScene scene, - pcl::PointCloud::Ptr thread_cloud, RTCIntersectContext context, - geometry_msgs::msg::Pose origin, + pcl::PointCloud::Ptr thread_cloud, geometry_msgs::msg::Pose origin, std::reference_wrapper> ref_thread_detected_ids, double max_distance, double min_distance, std::reference_wrapper> ref_rotation_matrices) @@ -101,7 +100,7 @@ class Raycaster rayhit.ray.dir_y = rotation_mat(1); rayhit.ray.dir_z = rotation_mat(2); rayhit.hit.geomID = RTC_INVALID_GEOMETRY_ID; - rtcIntersect1(scene, &context, &rayhit); + rtcIntersect1(scene, &rayhit); if (rayhit.hit.geomID != RTC_INVALID_GEOMETRY_ID) { double distance = rayhit.ray.tfar; diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp index 9f83be58331..c514d40247e 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__PRIMITIVE_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__PRIMITIVE_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 788720ace53..57a954b71f7 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 1.10.0 + 1.11.3 simple_sensor_simulator package masaya kataoka @@ -39,7 +39,7 @@ autoware_perception_msgs boost eigen - embree + embree_vendor libpcl-all-dev nav_msgs pcl_conversions diff --git a/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp b/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp index a8ffc0ed6d6..e1325bfa354 100644 --- a/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp +++ b/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp @@ -119,12 +119,11 @@ const sensor_msgs::msg::PointCloud2 Raycaster::raycast( std::vector::Ptr> thread_cloud(thread_count); rtcCommitScene(scene_); - RTCIntersectContext context; for (unsigned int i = 0; i < threads.size(); ++i) { thread_cloud[i] = pcl::PointCloud::Ptr(new pcl::PointCloud()); threads[i] = std::thread( - intersect, i, thread_count, scene_, thread_cloud[i], context, origin, - std::ref(thread_detected_ids[i]), max_distance, min_distance, std::ref(rotation_matrices_)); + intersect, i, thread_count, scene_, thread_cloud[i], origin, std::ref(thread_detected_ids[i]), + max_distance, min_distance, std::ref(rotation_matrices_)); } for (unsigned int i = 0; i < threads.size(); ++i) { threads[i].join(); diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index d226cab0a0a..f4c44bea45a 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package simulation_interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index baf7cd5ba4e..f71bf1b2ea5 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 1.10.0 + 1.11.3 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index ec4a207d939..6eddfa0c171 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -2,6 +2,29 @@ Changelog for package traffic_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index d61440b0818..061a3beaba0 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 1.10.0 + 1.11.3 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 42fb4e8dc3d..d9a9068b3fd 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog for package openscenario_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index b0d1643fa4d..1fd28b8ea37 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 1.10.0 + 1.11.3 ROS messages for openscenario Masaya Kataoka Apache License 2.0 diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 09d90277f4a..b47d952d954 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package random_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- +* Merge pull request `#1225 `_ from tier4/fix/remove_warnings_from_random_test_runner + fix -Wreorder warnings in test extcutor class +* fix -Wreorder warnings in test extcutor class +* Contributors: Kotaro Yoshimoto, Masaya Kataoka + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/test_runner/random_test_runner/include/random_test_runner/test_executor.hpp b/test_runner/random_test_runner/include/random_test_runner/test_executor.hpp index 43c5d645515..57a3caf44ff 100644 --- a/test_runner/random_test_runner/include/random_test_runner/test_executor.hpp +++ b/test_runner/random_test_runner/include/random_test_runner/test_executor.hpp @@ -243,8 +243,8 @@ class TestExecutor EgoCollisionMetric ego_collision_metric_; JunitXmlReporterTestCase error_reporter_; - ArchitectureType architecture_type_; double test_timeout_; + ArchitectureType architecture_type_; bool scenario_completed_ = false; diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index fb6dd901648..4452bb571d6 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 1.10.0 + 1.11.3 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index f2ef14d0802..b681c3a6c08 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package scenario_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + +1.11.2 (2024-04-08) +------------------- + +1.11.1 (2024-04-05) +------------------- + +1.11.0 (2024-04-02) +------------------- +* Merge pull request `#1173 `_ from tier4/feature/arm_support + Feature/arm_build_test +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* add scenario +* Contributors: Masaya Kataoka, Ubuntu, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index a518bb0c36a..e8df2c5f064 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 1.10.0 + 1.11.3 scenario test runner package Tatsuya Yamasaki Apache License 2.0 diff --git a/test_runner/scenario_test_runner/scenario/arm_demo.yaml b/test_runner/scenario_test_runner/scenario/arm_demo.yaml new file mode 100644 index 00000000000..d2919bcbe00 --- /dev/null +++ b/test_runner/scenario_test_runner/scenario/arm_demo.yaml @@ -0,0 +1,245 @@ +ScenarioModifiers: + ScenarioModifier: [] +OpenSCENARIO: + FileHeader: + revMajor: 1 + revMinor: 1 + date: '2023-11-27T07:31:13.505Z' + description: '' + author: Masaya Kataoka + ParameterDeclarations: + ParameterDeclaration: + - name: __ego_dimensions_length__ + parameterType: double + value: '0' + - name: __ego_dimensions_width__ + parameterType: double + value: '0' + - name: __ego_dimensions_height__ + parameterType: double + value: '0' + - name: __ego_center_x__ + parameterType: double + value: '0' + - name: __ego_center_y__ + parameterType: double + value: '0' + - name: __ego_center_z__ + parameterType: double + value: '0' + CatalogLocations: + CatalogLocation: [] + RoadNetwork: + LogicFile: + filepath: $(find-pkg-share kashiwanoha_map)/map + Entities: + ScenarioObject: + - name: ego + Vehicle: + name: '' + vehicleCategory: car + BoundingBox: + Center: + x: 1.355 + y: 0 + z: 1.25 + Dimensions: + length: 4.77 + width: 1.83 + height: 2.5 + Performance: + maxSpeed: 50 + maxAcceleration: INF + maxDeceleration: INF + Axles: + FrontAxle: + maxSteering: 0.5236 + wheelDiameter: 0.78 + trackWidth: 1.63 + positionX: 1.385 + positionZ: 0.39 + RearAxle: + maxSteering: 0.5236 + wheelDiameter: 0.78 + trackWidth: 1.63 + positionX: 0 + positionZ: 0.39 + Properties: + Property: [] + ObjectController: + Controller: + name: '' + Properties: + Property: + - name: isEgo + value: 'true' + - name: Npc1 + Vehicle: + name: '' + vehicleCategory: car + BoundingBox: + Center: + x: 0 + y: 0 + z: 1.25 + Dimensions: + length: 4 + width: 1.8 + height: 2.5 + Performance: + maxSpeed: 50 + maxAcceleration: INF + maxDeceleration: INF + Axles: + FrontAxle: + maxSteering: 0.5236 + wheelDiameter: 0.6 + trackWidth: 1.8 + positionX: 2 + positionZ: 0.3 + RearAxle: + maxSteering: 0.5236 + wheelDiameter: 0.6 + trackWidth: 1.8 + positionX: 0 + positionZ: 0.3 + Properties: + Property: [] + ObjectController: + Controller: + name: '' + Properties: + Property: [] + Storyboard: + Init: + Actions: + Private: + - entityRef: ego + PrivateAction: + - TeleportAction: + Position: + LanePosition: + roadId: '' + laneId: '34507' + s: 5 + offset: 0 + Orientation: + type: relative + h: 0 + p: -0.0 + r: 0 + - RoutingAction: + AcquirePositionAction: + Position: + LanePosition: + roadId: '' + laneId: '34468' + s: 55 + offset: 0 + Orientation: + type: relative + h: 0 + p: -0.0 + r: 0 + - entityRef: Npc1 + PrivateAction: + - TeleportAction: + Position: + LanePosition: + roadId: '' + laneId: '34507' + s: 25 + offset: 0 + Orientation: + type: relative + h: 0 + p: -0.0 + r: 0 + Story: + - name: '' + Act: + - name: _EndCondition + ManeuverGroup: + - maximumExecutionCount: 1 + name: '' + Actors: + selectTriggeringEntities: false + EntityRef: + - entityRef: ego + Maneuver: + - name: '' + Event: + - name: '' + priority: parallel + StartTrigger: + ConditionGroup: + - Condition: + - name: '' + delay: 0 + conditionEdge: none + ByEntityCondition: + TriggeringEntities: + triggeringEntitiesRule: any + EntityRef: + - entityRef: ego + EntityCondition: + ReachPositionCondition: + Position: + LanePosition: + roadId: '' + laneId: '34468' + s: 55 + offset: 0 + Orientation: + type: relative + h: 0 + p: -0.0 + r: 0 + tolerance: 1 + Action: + - name: '' + UserDefinedAction: + CustomCommandAction: + type: exitSuccess + - name: '' + priority: parallel + StartTrigger: + ConditionGroup: + - Condition: + - name: '' + delay: 0 + conditionEdge: none + ByValueCondition: + SimulationTimeCondition: + value: 180 + rule: greaterThan + - Condition: + - name: '' + delay: 0 + conditionEdge: none + ByEntityCondition: + TriggeringEntities: + triggeringEntitiesRule: any + EntityRef: + - entityRef: ego + EntityCondition: + CollisionCondition: + EntityRef: + entityRef: Npc1 + Action: + - name: '' + UserDefinedAction: + CustomCommandAction: + type: exitFailure + StartTrigger: + ConditionGroup: + - Condition: + - name: '' + delay: 0 + conditionEdge: none + ByValueCondition: + SimulationTimeCondition: + value: 0 + rule: greaterThan + StopTrigger: + ConditionGroup: []