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.

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

Bumps in Ionic: gz-rendering9 #935

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-rendering8 VERSION 8.0.0)
project(gz-rendering9 VERSION 9.0.0)

#============================================================================
# Find gz-cmake
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Gazebo Rendering

### Gazebo Rendering 9.X

### Gazebo Rendering 9.0.0 (2023-XX-XX)

### Gazebo Rendering 8.X

### Gazebo Rendering 8.0.0 (2023-09-29)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ of libraries designed to rapidly develop robot applications.

# Install

See the [installation tutorial](https://gazebosim.org/api/rendering/8/installation.html).
See the [installation tutorial](https://gazebosim.org/api/rendering/9/installation.html).

# Usage

The Gazebo Rendering API can be found in the documentation. See the
[installation tutorial](https://gazebosim.org/api/rendering/8/installation.html)
[installation tutorial](https://gazebosim.org/api/rendering/9/installation.html)
on how to build the documentation files using Doxygen.

You can also take a look at the sample applications in the `examples` folder.
Expand Down
2 changes: 1 addition & 1 deletion examples/actor_animation/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-actor-animation)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/boundingbox_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-boundingbox-camera)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/camera_tracking/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-camera-tracking)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-custom-scene-viewer)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_shaders/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_shaders_uniforms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(gz-rendering8)
find_package(gz-rendering9)

set(TARGET_THIRD_PARTY_DEPENDS "")

Expand Down
2 changes: 1 addition & 1 deletion examples/depth_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-depth-camera)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/global_illumination/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(gz-rendering-global_illumination)

find_package(gz-rendering8)
find_package(gz-rendering9)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/heightmap/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-heightmap)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/hello_world_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)

find_package(gz-rendering8 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR})
find_package(gz-rendering9 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})

find_package(gz-plugin2 REQUIRED COMPONENTS all)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
Expand Down
2 changes: 1 addition & 1 deletion examples/lidar_visual/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-lidar_visual)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/mesh_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-mesh-viewer)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/mouse_picking/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-mouse-picking)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/ogre2_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(gz-rendering-ogre2-demo)

find_package(gz-rendering8)
find_package(gz-rendering9)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/particles_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-particles-demo)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
6 changes: 3 additions & 3 deletions examples/projector/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-projector)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down Expand Up @@ -30,8 +30,8 @@ target_link_libraries(projector
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
gz-rendering8::gz-rendering8
gz-rendering8::core
gz-rendering9::gz-rendering9
gz-rendering9::core
)

add_custom_command(TARGET projector POST_BUILD
Expand Down
2 changes: 1 addition & 1 deletion examples/render_pass/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-render-pass)

find_package(gz-rendering8)
find_package(gz-rendering9)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/segmentation_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-segmentation-camera)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-simple-demo)

find_package(gz-rendering8)
find_package(gz-rendering9)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_demo_qml/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})

#------------------------------------------------------------------------
# Find gz-rendering
find_package(gz-rendering8)
find_package(gz-rendering9)

#======================================
# Find Qt
Expand Down
2 changes: 1 addition & 1 deletion examples/text_geom/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-text-geom)

find_package(gz-rendering8)
find_package(gz-rendering9)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/thermal_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-thermal-camera)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/transform_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-transform-control)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/view_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-view-control)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion examples/visualization_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-visualization-demo)

find_package(gz-rendering8)
find_package(gz-rendering9)

if (APPLE OR UNIX)
find_package(GLUT REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion examples/waves/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(gz-rendering8)
find_package(gz-rendering9)

set(TARGET_THIRD_PARTY_DEPENDS "")

Expand Down
2 changes: 1 addition & 1 deletion examples/wide_angle_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-rendering-wide-angle-camera)
find_package(gz-rendering8 REQUIRED)
find_package(gz-rendering9 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
2 changes: 1 addition & 1 deletion tutorials/17_render_pass_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering8-ogre]
[Msg] Loading plugin [gz-rendering9-ogre]
===============================
TAB - Switch render engines
ESC - Exit
Expand Down
2 changes: 1 addition & 1 deletion tutorials/18_simple_demo_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering8-ogre]
[Msg] Loading plugin [gz-rendering9-ogre]
===============================
TAB - Switch render engines
ESC - Exit
Expand Down
2 changes: 1 addition & 1 deletion tutorials/19_text_geom_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering8-ogre]
[Msg] Loading plugin [gz-rendering9-ogre]
===============================
TAB - Switch render engines
ESC - Exit
Expand Down
2 changes: 1 addition & 1 deletion tutorials/20_particles_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering8-ogre2]
[Msg] Loading plugin [gz-rendering9-ogre2]
===============================
TAB - Switch render engines
ESC - Exit
Expand Down
2 changes: 1 addition & 1 deletion tutorials/21_heightmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Example 1 (image heightmap):
You'll see:

```{.sh}
[Msg] Loading plugin [gz-rendering8-ogre]
[Msg] Loading plugin [gz-rendering9-ogre]
[Msg] Loading heightmap: scene::Heightmap(65528)
[Msg] Heightmap loaded. Process took 217 ms.
===============================
Expand Down
Loading