Merge 0d3b7ae into 9382513

gazebosim · Oct 11, 2023 · 26365dd · 26365dd
2 parents 9382513 + 0d3b7ae
commit 26365dd
Show file tree

Hide file tree

Showing 35 changed files with 42 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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

diff --git a/Changelog.md b/Changelog.md
@@ -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)

diff --git a/README.md b/README.md
@@ -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.

diff --git a/examples/actor_animation/CMakeLists.txt b/examples/actor_animation/CMakeLists.txt
@@ -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}

diff --git a/examples/boundingbox_camera/CMakeLists.txt b/examples/boundingbox_camera/CMakeLists.txt
@@ -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}

diff --git a/examples/camera_tracking/CMakeLists.txt b/examples/camera_tracking/CMakeLists.txt
@@ -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})

diff --git a/examples/custom_scene_viewer/CMakeLists.txt b/examples/custom_scene_viewer/CMakeLists.txt
@@ -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}

diff --git a/examples/custom_shaders/CMakeLists.txt b/examples/custom_shaders/CMakeLists.txt
@@ -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})

diff --git a/examples/custom_shaders_uniforms/CMakeLists.txt b/examples/custom_shaders_uniforms/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
 )
 
-find_package(gz-rendering8)
+find_package(gz-rendering9)
 
 set(TARGET_THIRD_PARTY_DEPENDS "")
 

diff --git a/examples/depth_camera/CMakeLists.txt b/examples/depth_camera/CMakeLists.txt
@@ -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}

diff --git a/examples/global_illumination/CMakeLists.txt b/examples/global_illumination/CMakeLists.txt
@@ -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}

diff --git a/examples/heightmap/CMakeLists.txt b/examples/heightmap/CMakeLists.txt
@@ -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}

diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt
@@ -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})

diff --git a/examples/lidar_visual/CMakeLists.txt b/examples/lidar_visual/CMakeLists.txt
@@ -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}

diff --git a/examples/mesh_viewer/CMakeLists.txt b/examples/mesh_viewer/CMakeLists.txt
@@ -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}

diff --git a/examples/mouse_picking/CMakeLists.txt b/examples/mouse_picking/CMakeLists.txt
@@ -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}

diff --git a/examples/ogre2_demo/CMakeLists.txt b/examples/ogre2_demo/CMakeLists.txt
@@ -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}

diff --git a/examples/particles_demo/CMakeLists.txt b/examples/particles_demo/CMakeLists.txt
@@ -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}

diff --git a/examples/projector/CMakeLists.txt b/examples/projector/CMakeLists.txt
@@ -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}
@@ -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

diff --git a/examples/render_pass/CMakeLists.txt b/examples/render_pass/CMakeLists.txt
@@ -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})

diff --git a/examples/segmentation_camera/CMakeLists.txt b/examples/segmentation_camera/CMakeLists.txt
@@ -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}

diff --git a/examples/simple_demo/CMakeLists.txt b/examples/simple_demo/CMakeLists.txt
@@ -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})

diff --git a/examples/simple_demo_qml/CMakeLists.txt b/examples/simple_demo_qml/CMakeLists.txt
@@ -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

diff --git a/examples/text_geom/CMakeLists.txt b/examples/text_geom/CMakeLists.txt
@@ -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})

diff --git a/examples/thermal_camera/CMakeLists.txt b/examples/thermal_camera/CMakeLists.txt
@@ -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}

diff --git a/examples/transform_control/CMakeLists.txt b/examples/transform_control/CMakeLists.txt
@@ -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}

diff --git a/examples/view_control/CMakeLists.txt b/examples/view_control/CMakeLists.txt
@@ -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})

diff --git a/examples/visualization_demo/CMakeLists.txt b/examples/visualization_demo/CMakeLists.txt
@@ -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)

diff --git a/examples/waves/CMakeLists.txt b/examples/waves/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
 )
 
-find_package(gz-rendering8)
+find_package(gz-rendering9)
 
 set(TARGET_THIRD_PARTY_DEPENDS "")
 

diff --git a/examples/wide_angle_camera/CMakeLists.txt b/examples/wide_angle_camera/CMakeLists.txt
@@ -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}

diff --git a/tutorials/17_render_pass_tutorial.md b/tutorials/17_render_pass_tutorial.md
@@ -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

diff --git a/tutorials/18_simple_demo_tutorial.md b/tutorials/18_simple_demo_tutorial.md
@@ -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

diff --git a/tutorials/19_text_geom_tutorial.md b/tutorials/19_text_geom_tutorial.md
@@ -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

diff --git a/tutorials/20_particles_tutorial.md b/tutorials/20_particles_tutorial.md
@@ -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

diff --git a/tutorials/21_heightmap.md b/tutorials/21_heightmap.md
@@ -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.
 ===============================