From 7e4e7a4f260125a69671be4fc53fb2e370f0d4eb Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 5 Aug 2022 11:31:24 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20Bump=20main=20to=20?= =?UTF-8?q?8.0.0~pre1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- examples/actor_animation/CMakeLists.txt | 2 +- examples/boundingbox_camera/CMakeLists.txt | 2 +- examples/camera_tracking/CMakeLists.txt | 2 +- examples/custom_scene_viewer/CMakeLists.txt | 2 +- examples/custom_shaders/CMakeLists.txt | 2 +- examples/custom_shaders_uniforms/CMakeLists.txt | 2 +- examples/depth_camera/CMakeLists.txt | 2 +- examples/gazebo_scene_viewer/CMakeLists.txt | 2 +- examples/heightmap/CMakeLists.txt | 2 +- examples/hello_world_plugin/CMakeLists.txt | 4 ++-- examples/lidar_visual/CMakeLists.txt | 2 +- examples/mesh_viewer/CMakeLists.txt | 2 +- examples/mouse_picking/CMakeLists.txt | 2 +- examples/ogre2_demo/CMakeLists.txt | 2 +- examples/particles_demo/CMakeLists.txt | 2 +- examples/render_pass/CMakeLists.txt | 2 +- examples/segmentation_camera/CMakeLists.txt | 2 +- examples/simple_demo/CMakeLists.txt | 2 +- examples/simple_demo_qml/CMakeLists.txt | 2 +- examples/text_geom/CMakeLists.txt | 2 +- examples/thermal_camera/CMakeLists.txt | 2 +- examples/transform_control/CMakeLists.txt | 2 +- examples/view_control/CMakeLists.txt | 2 +- examples/visualization_demo/CMakeLists.txt | 2 +- examples/waves/CMakeLists.txt | 2 +- examples/wide_angle_camera/CMakeLists.txt | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 781e05dd5..66ed515bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(gz-rendering7 VERSION 7.0.0) +project(gz-rendering8 VERSION 8.0.0) #============================================================================ # Find gz-cmake diff --git a/examples/actor_animation/CMakeLists.txt b/examples/actor_animation/CMakeLists.txt index 65273b4ae..3bb9382c7 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/boundingbox_camera/CMakeLists.txt b/examples/boundingbox_camera/CMakeLists.txt index cbd1fb348..476ec1b64 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/camera_tracking/CMakeLists.txt b/examples/camera_tracking/CMakeLists.txt index d7837fdb4..3f86245d9 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 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 index ad3ef8b4d..b5a4646d8 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/custom_shaders/CMakeLists.txt b/examples/custom_shaders/CMakeLists.txt index 5caa55c67..74226e504 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 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 index d00c57d52..570ec31f4 100644 --- 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-rendering7) +find_package(gz-rendering8) set(TARGET_THIRD_PARTY_DEPENDS "") diff --git a/examples/depth_camera/CMakeLists.txt b/examples/depth_camera/CMakeLists.txt index 3df420355..5202a53e8 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/gazebo_scene_viewer/CMakeLists.txt b/examples/gazebo_scene_viewer/CMakeLists.txt index 93a72b3c6..2f851c29c 100644 --- a/examples/gazebo_scene_viewer/CMakeLists.txt +++ b/examples/gazebo_scene_viewer/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-rendering-gazebo-scene-viewer) -find_package(gz-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) find_package(gazebo REQUIRED) include_directories(SYSTEM ${GAZEBO_INCLUDE_DIRS}) diff --git a/examples/heightmap/CMakeLists.txt b/examples/heightmap/CMakeLists.txt index 685621dc3..5d576951f 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt index b4f78736e..3d1ad7bef 100644 --- 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-rendering7 REQUIRED) -set(GZ_RENDERING_VER ${gz-rendering7_VERSION_MAJOR}) +find_package(gz-rendering8 REQUIRED) +set(GZ_RENDERING_VER ${gz-rendering8_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 index d3fc88d56..c322afe3d 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/mesh_viewer/CMakeLists.txt b/examples/mesh_viewer/CMakeLists.txt index b73adb4c0..f8a41ee97 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/mouse_picking/CMakeLists.txt b/examples/mouse_picking/CMakeLists.txt index 7b21a0ee7..daa11dd4e 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/ogre2_demo/CMakeLists.txt b/examples/ogre2_demo/CMakeLists.txt index fb229d56e..a379fa2c1 100644 --- 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-rendering7) +find_package(gz-rendering8) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/particles_demo/CMakeLists.txt b/examples/particles_demo/CMakeLists.txt index 65186e939..c255dac98 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/render_pass/CMakeLists.txt b/examples/render_pass/CMakeLists.txt index 70b693a6e..3631111d0 100644 --- 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-rendering7) +find_package(gz-rendering8) find_package(GLUT REQUIRED) include_directories(SYSTEM ${GLUT_INCLUDE_DIRS}) diff --git a/examples/segmentation_camera/CMakeLists.txt b/examples/segmentation_camera/CMakeLists.txt index 177e6ad3d..aba189a41 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/simple_demo/CMakeLists.txt b/examples/simple_demo/CMakeLists.txt index 86e0a0f81..4f9c5da02 100644 --- 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-rendering7) +find_package(gz-rendering8) 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 index 971891e82..6d6ad50ff 100644 --- 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-rendering7) +find_package(gz-rendering8) #====================================== # Find Qt diff --git a/examples/text_geom/CMakeLists.txt b/examples/text_geom/CMakeLists.txt index 0e07f7558..c28b42d03 100644 --- 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-rendering7) +find_package(gz-rendering8) find_package(GLUT REQUIRED) include_directories(SYSTEM ${GLUT_INCLUDE_DIRS}) diff --git a/examples/thermal_camera/CMakeLists.txt b/examples/thermal_camera/CMakeLists.txt index 1727390d4..abf1d4413 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/transform_control/CMakeLists.txt b/examples/transform_control/CMakeLists.txt index 6f895d46c..e031b2acf 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/view_control/CMakeLists.txt b/examples/view_control/CMakeLists.txt index e06301cf1..3370d3a77 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 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 index 3d89d4758..62ec67dd6 100644 --- 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-rendering7) +find_package(gz-rendering8) if (APPLE OR UNIX) find_package(GLUT REQUIRED) diff --git a/examples/waves/CMakeLists.txt b/examples/waves/CMakeLists.txt index 81a3237b5..d1750a7fd 100644 --- a/examples/waves/CMakeLists.txt +++ b/examples/waves/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(SYSTEM ${PROJECT_BINARY_DIR} ) -find_package(gz-rendering7) +find_package(gz-rendering8) set(TARGET_THIRD_PARTY_DEPENDS "") diff --git a/examples/wide_angle_camera/CMakeLists.txt b/examples/wide_angle_camera/CMakeLists.txt index bbc20fcf7..5a95cde0b 100644 --- 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-rendering7 REQUIRED) +find_package(gz-rendering8 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} From 6cbf82d4ba2afb16c1e153f7d2c707d324147bf5 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 8 Aug 2022 09:47:06 -0700 Subject: [PATCH 2/2] changelog Signed-off-by: Louise Poubel --- Changelog.md | 4 ++++ tutorials/17_render_pass_tutorial.md | 2 +- tutorials/18_simple_demo_tutorial.md | 2 +- tutorials/19_text_geom_tutorial.md | 2 +- tutorials/20_particles_tutorial.md | 2 +- tutorials/21_heightmap.md | 2 +- tutorials/23_depth_camera_tutorial.md | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8a93072eb..6e92cd6ea 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ ## Gazebo Rendering +### Gazebo Rendering 8.X + +### Gazebo Rendering 8.0.0 (202X-XX-XX) + ### Gazebo Rendering 7.X ### Gazebo Rendering 7.0.0 (202X-XX-XX) diff --git a/tutorials/17_render_pass_tutorial.md b/tutorials/17_render_pass_tutorial.md index c16f9079c..291d57e22 100644 --- 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-rendering7-ogre] +[Msg] Loading plugin [gz-rendering8-ogre] Engine 'optix' is not supported =============================== TAB - Switch render engines diff --git a/tutorials/18_simple_demo_tutorial.md b/tutorials/18_simple_demo_tutorial.md index 6d4e10cde..4e9e1cce2 100644 --- 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-rendering7-ogre] +[Msg] Loading plugin [gz-rendering8-ogre] Engine 'optix' is not supported =============================== TAB - Switch render engines diff --git a/tutorials/19_text_geom_tutorial.md b/tutorials/19_text_geom_tutorial.md index f26540718..1005dfa47 100644 --- 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-rendering7-ogre] +[Msg] Loading plugin [gz-rendering8-ogre] Engine 'optix' is not supported =============================== TAB - Switch render engines diff --git a/tutorials/20_particles_tutorial.md b/tutorials/20_particles_tutorial.md index 8ff5426b6..5b369abaa 100644 --- 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-rendering7-ogre2] +[Msg] Loading plugin [gz-rendering8-ogre2] =============================== TAB - Switch render engines ESC - Exit diff --git a/tutorials/21_heightmap.md b/tutorials/21_heightmap.md index bca43a378..7c78712aa 100644 --- 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-rendering7-ogre] +[Msg] Loading plugin [gz-rendering8-ogre] [Msg] Loading heightmap: scene::Heightmap(65528) [Msg] Heightmap loaded. Process took 217 ms. =============================== diff --git a/tutorials/23_depth_camera_tutorial.md b/tutorials/23_depth_camera_tutorial.md index 0e94761d0..396ca7712 100644 --- a/tutorials/23_depth_camera_tutorial.md +++ b/tutorials/23_depth_camera_tutorial.md @@ -63,7 +63,7 @@ depth camera to a memory reserved in a globally scoped `Image`. \snippet examples/depth_camera/GlutWindow.cc convert depth to image -The other option is the [ConnectNewRgbPointCloud](https://github.com/gazebosim/gz-rendering/blob/ign-rendering7/include/gz/rendering/DepthCamera.hh#L58) call that receives colored point cloud data on callback. +The other option is the [ConnectNewRgbPointCloud](https://github.com/gazebosim/gz-rendering/blob/main/include/gz/rendering/DepthCamera.hh#L58) call that receives colored point cloud data on callback. The reason for setting the camera image format to `PixelFormat::PF_FLOAT32_RGBA` is to ensure that when the `Image` is created it reserves a buffer of the