From c2c1b8a1a59df180ece4a083b3c6777760e5dfed Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Fri, 9 Dec 2022 20:33:20 -0800 Subject: [PATCH 1/4] bump rendering, sensors, gui to version 8 Signed-off-by: Ian Chen --- .github/ci/packages.apt | 6 +++--- CMakeLists.txt | 12 ++++++------ docker/Dockerfile.nightly | 6 +++--- examples/plugin/custom_sensor_system/CMakeLists.txt | 6 +++--- examples/plugin/rendering_plugins/CMakeLists.txt | 10 +++++----- tutorials/migrating_ardupilot_plugin.md | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 5ce1073d0a..9c1a69f800 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -10,13 +10,13 @@ libglew-dev libgz-cmake3-dev libgz-common5-dev libgz-fuel-tools8-dev -libgz-gui7-dev +libgz-gui8-dev libgz-math7-eigen3-dev libgz-msgs9-dev libgz-physics6-dev libgz-plugin2-dev -libgz-rendering7-dev -libgz-sensors7-dev +libgz-rendering8-dev +libgz-sensors8-dev libgz-tools2-dev libgz-transport12-dev libgz-utils2-cli-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index bf466b53e6..77b704bac8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,8 +106,8 @@ set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools8_VERSION_MAJOR}) #-------------------------------------- # Find gz-gui -gz_find_package(gz-gui7 REQUIRED) -set(GZ_GUI_VER ${gz-gui7_VERSION_MAJOR}) +gz_find_package(gz-gui8 REQUIRED) +set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR}) gz_find_package (Qt5 COMPONENTS Core @@ -129,7 +129,7 @@ set(GZ_PHYSICS_VER ${gz-physics6_VERSION_MAJOR}) #-------------------------------------- # Find gz-sensors -gz_find_package(gz-sensors7 REQUIRED +gz_find_package(gz-sensors8 REQUIRED # component order is important COMPONENTS # non-rendering @@ -155,12 +155,12 @@ gz_find_package(gz-sensors7 REQUIRED thermal_camera wide_angle_camera ) -set(GZ_SENSORS_VER ${gz-sensors7_VERSION_MAJOR}) +set(GZ_SENSORS_VER ${gz-sensors8_VERSION_MAJOR}) #-------------------------------------- # Find gz-rendering -gz_find_package(gz-rendering7 REQUIRED) -set(GZ_RENDERING_VER ${gz-rendering7_VERSION_MAJOR}) +gz_find_package(gz-rendering8 REQUIRED) +set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR}) #-------------------------------------- # Find gz-math diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly index 48e385faaf..f81b263ac0 100644 --- a/docker/Dockerfile.nightly +++ b/docker/Dockerfile.nightly @@ -17,12 +17,12 @@ RUN apt-get update \ libgz-math7-eigen3-dev \ libgz-plugin2-dev \ libgz-physics6-dev \ - libgz-rendering7-dev \ + libgz-rendering8-dev \ libgz-tools2-dev \ libgz-transport12-dev \ - libgz-gui7-dev \ + libgz-gui8-dev \ libgz-msgs9-dev \ - libgz-sensors7-dev \ + libgz-sensors8-dev \ libsdformat13-dev COPY . gz-sim diff --git a/examples/plugin/custom_sensor_system/CMakeLists.txt b/examples/plugin/custom_sensor_system/CMakeLists.txt index cf04295b78..66ceb25192 100644 --- a/examples/plugin/custom_sensor_system/CMakeLists.txt +++ b/examples/plugin/custom_sensor_system/CMakeLists.txt @@ -10,8 +10,8 @@ set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR}) gz_find_package(gz-sim8 REQUIRED) set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR}) -find_package(gz-sensors7 REQUIRED) -set(GZ_SENSORS_VER ${gz-sensors7_VERSION_MAJOR}) +find_package(gz-sensors8 REQUIRED) +set(GZ_SENSORS_VER ${gz-sensors8_VERSION_MAJOR}) # Fetch the custom sensor example from gz-sensors # Users won't commonly use this to fetch their sensors. The sensor may be part @@ -20,7 +20,7 @@ include(FetchContent) FetchContent_Declare( sensors_clone GIT_REPOSITORY https://github.com/gazebosim/gz-sensors - GIT_TAG gz-sensors7 + GIT_TAG main ) FetchContent_Populate(sensors_clone) add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_clone_BINARY_DIR}) diff --git a/examples/plugin/rendering_plugins/CMakeLists.txt b/examples/plugin/rendering_plugins/CMakeLists.txt index faf60e356a..4ee33c6105 100644 --- a/examples/plugin/rendering_plugins/CMakeLists.txt +++ b/examples/plugin/rendering_plugins/CMakeLists.txt @@ -7,14 +7,14 @@ endif() project(RenderingPlugins) # Common to both plugins -find_package(gz-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) # GUI plugin set(GUI_PLUGIN RenderingGuiPlugin) set(CMAKE_AUTOMOC ON) -find_package(gz-gui7 REQUIRED) +find_package(gz-gui) QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc) @@ -24,8 +24,8 @@ add_library(${GUI_PLUGIN} SHARED ) target_link_libraries(${GUI_PLUGIN} PRIVATE - gz-gui7::gz-gui7 - gz-rendering7::gz-rendering7 + gz-gui8::gz-gui8 + gz-rendering8::gz-rendering8 ) # Server plugin @@ -40,5 +40,5 @@ target_link_libraries(${SERVER_PLUGIN} PRIVATE gz-plugin2::gz-plugin2 gz-sim8::gz-sim8 - gz-rendering7::gz-rendering7 + gz-rendering8::gz-rendering8 ) diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md index e797def998..afe8a71f63 100644 --- a/tutorials/migrating_ardupilot_plugin.md +++ b/tutorials/migrating_ardupilot_plugin.md @@ -735,7 +735,7 @@ find_package(gz-sim8-all REQUIRED) find_package(gz-math7-all REQUIRED) find_package(gz-msgs9-all REQUIRED) find_package(gz-physics6-all REQUIRED) -find_package(gz-sensors7-all REQUIRED) +find_package(gz-sensors8-all REQUIRED) find_package(gz-transport12-all REQUIRED) ``` From 4d2b47d3104f138bbbde1e2a50222040a6bb131a Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Tue, 13 Dec 2022 14:17:17 -0800 Subject: [PATCH 2/4] fix render engine plugin example Signed-off-by: Ian Chen --- examples/plugin/rendering_plugins/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/plugin/rendering_plugins/CMakeLists.txt b/examples/plugin/rendering_plugins/CMakeLists.txt index 4ee33c6105..fef9316c89 100644 --- a/examples/plugin/rendering_plugins/CMakeLists.txt +++ b/examples/plugin/rendering_plugins/CMakeLists.txt @@ -14,7 +14,7 @@ set(GUI_PLUGIN RenderingGuiPlugin) set(CMAKE_AUTOMOC ON) -find_package(gz-gui) +find_package(gz-gui8) QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc) From c3d79e2e0a502393b036467546943b5370ae09e7 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Tue, 13 Dec 2022 17:16:43 -0800 Subject: [PATCH 3/4] include only what you need Signed-off-by: Ian Chen --- src/rendering/RenderUtil.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rendering/RenderUtil.cc b/src/rendering/RenderUtil.cc index 7f9c2f11f1..34e9eb53ac 100644 --- a/src/rendering/RenderUtil.cc +++ b/src/rendering/RenderUtil.cc @@ -46,10 +46,12 @@ #include -#include +#include #include #include #include +#include +#include #include "gz/sim/components/Actor.hh" #include "gz/sim/components/BoundingBoxCamera.hh" @@ -93,9 +95,9 @@ #include "gz/sim/EntityComponentManager.hh" #include "gz/sim/rendering/Events.hh" +#include "gz/sim/rendering/MarkerManager.hh" #include "gz/sim/rendering/RenderUtil.hh" #include "gz/sim/rendering/SceneManager.hh" -#include "gz/sim/rendering/MarkerManager.hh" #include "gz/sim/Util.hh" From 44766f0412d33d1d3f3c43b49ce85ca57db89690 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Thu, 15 Dec 2022 10:15:56 -0800 Subject: [PATCH 4/4] minor tweak Signed-off-by: Ian Chen --- examples/plugin/rendering_plugins/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/plugin/rendering_plugins/CMakeLists.txt b/examples/plugin/rendering_plugins/CMakeLists.txt index fef9316c89..8668676cf0 100644 --- a/examples/plugin/rendering_plugins/CMakeLists.txt +++ b/examples/plugin/rendering_plugins/CMakeLists.txt @@ -14,7 +14,7 @@ set(GUI_PLUGIN RenderingGuiPlugin) set(CMAKE_AUTOMOC ON) -find_package(gz-gui8) +find_package(gz-gui8 REQUIRED) QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)