Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump rendering, sensors and gui dependencies to 8 #1837

Merged
merged 4 commits into from
Dec 15, 2022
Merged

Bump rendering, sensors and gui dependencies to 8 #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2c1b8a
bump rendering, sensors, gui to version 8
iche033 Dec 10, 2022
4d2b47d
fix render engine plugin example
iche033 Dec 13, 2022
c3d79e2
include only what you need
iche033 Dec 14, 2022
44766f0
minor tweak
iche033 Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/plugin/custom_sensor_system/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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})
Expand Down
10 changes: 5 additions & 5 deletions examples/plugin/rendering_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-gui8 REQUIRED)

QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)

Expand All @@ -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
Expand All @@ -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
)
6 changes: 4 additions & 2 deletions src/rendering/RenderUtil.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@

#include <gz/msgs/Utility.hh>

#include <gz/rendering.hh>
#include <gz/rendering/Grid.hh>
#include <gz/rendering/RenderEngine.hh>
#include <gz/rendering/RenderingIface.hh>
#include <gz/rendering/Scene.hh>
#include <gz/rendering/ThermalCamera.hh>
#include <gz/rendering/WireBox.hh>

#include "gz/sim/components/Actor.hh"
#include "gz/sim/components/BoundingBoxCamera.hh"
Expand Down Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion tutorials/migrating_ardupilot_plugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
```

Expand Down