From 230b0b21f5db530a194ed7a1fa531e8f1a201067 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 7 Oct 2021 14:45:00 -0700 Subject: [PATCH 1/2] Bump main to 7.0.0~pre1 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- Changelog.md | 4 ++++ examples/actor_animation/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/gazebo_scene_viewer/CMakeLists.txt | 2 +- examples/heightmap/CMakeLists.txt | 2 +- examples/hello_world_plugin/CMakeLists.txt | 2 +- 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 +- 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 +- 29 files changed, 32 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f84ba440..23b392db2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-rendering6 VERSION 6.0.0) +project(ignition-rendering7 VERSION 7.0.0) #============================================================================ # Find ignition-cmake diff --git a/Changelog.md b/Changelog.md index 5c6ea524c..464f47ca8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ ## Ignition Rendering +### Ignition Rendering 7.X + +### Ignition Rendering 7.0.0 (202X-XX-XX) + ### Ignition Rendering 6.X ### Ignition Rendering 6.0.0 (20XX-XX-XX) diff --git a/examples/actor_animation/CMakeLists.txt b/examples/actor_animation/CMakeLists.txt index 1b2119d0d..caab3b48f 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(ignition-rendering-actor-animation) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/camera_tracking/CMakeLists.txt b/examples/camera_tracking/CMakeLists.txt index 4c2b3b221..ff857e727 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(ignition-rendering-camera-tracking) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 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 5846bbdb1..98ac3493d 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(ignition-rendering-custom-scene-viewer) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/custom_shaders/CMakeLists.txt b/examples/custom_shaders/CMakeLists.txt index e9c922162..3da852c14 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(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 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 5fc59e542..ad95b14b9 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(ignition-rendering6) +find_package(ignition-rendering7) set(TARGET_THIRD_PARTY_DEPENDS "") diff --git a/examples/gazebo_scene_viewer/CMakeLists.txt b/examples/gazebo_scene_viewer/CMakeLists.txt index 3ce7a5b5b..19c4dd01a 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(ignition-rendering-gazebo-scene-viewer) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) find_package(gazebo REQUIRED) include_directories(SYSTEM ${GAZEBO_INCLUDE_DIRS}) diff --git a/examples/heightmap/CMakeLists.txt b/examples/heightmap/CMakeLists.txt index 4b7c2e060..d4e7a24eb 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(ignition-rendering-heightmap) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt index 94cae8f92..e1036550e 100644 --- a/examples/hello_world_plugin/CMakeLists.txt +++ b/examples/hello_world_plugin/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) set(IGN_PLUGIN_VER 1) set(IGN_COMMON_VER 3) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) find_package(ignition-plugin1 REQUIRED COMPONENTS all) add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc) diff --git a/examples/lidar_visual/CMakeLists.txt b/examples/lidar_visual/CMakeLists.txt index a9664be5f..3cad6641c 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(ignition-rendering-lidar_visual) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/mesh_viewer/CMakeLists.txt b/examples/mesh_viewer/CMakeLists.txt index abf9ea18f..3bc3f6e76 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(ignition-rendering-mesh-viewer) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/mouse_picking/CMakeLists.txt b/examples/mouse_picking/CMakeLists.txt index 1268d0bf1..f1db8b24f 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(ignition-rendering-mouse-picking) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/ogre2_demo/CMakeLists.txt b/examples/ogre2_demo/CMakeLists.txt index 2ad666669..4ff93954e 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(ignition-rendering-ogre2-demo) -find_package(ignition-rendering6) +find_package(ignition-rendering7) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/particles_demo/CMakeLists.txt b/examples/particles_demo/CMakeLists.txt index c03b334c7..53baebfc8 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(ignition-rendering-particles-demo) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/render_pass/CMakeLists.txt b/examples/render_pass/CMakeLists.txt index eec9ca335..b25c2a99b 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(ignition-rendering-render-pass) -find_package(ignition-rendering6) +find_package(ignition-rendering7) 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 06816095b..5cfb5b471 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(ignition-rendering-segmentation-camera) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/simple_demo/CMakeLists.txt b/examples/simple_demo/CMakeLists.txt index f182d176e..13f790dc2 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(ignition-rendering-simple-demo) -find_package(ignition-rendering6) +find_package(ignition-rendering7) 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 a4dcf597e..1786c1e2f 100644 --- a/examples/simple_demo_qml/CMakeLists.txt +++ b/examples/simple_demo_qml/CMakeLists.txt @@ -14,7 +14,7 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR}) #------------------------------------------------------------------------ # Find ign-rendering -find_package(ignition-rendering6) +find_package(ignition-rendering7) #====================================== # Find Qt diff --git a/examples/text_geom/CMakeLists.txt b/examples/text_geom/CMakeLists.txt index 6859c39df..87b470cd0 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(ignition-rendering-text-geom) -find_package(ignition-rendering6) +find_package(ignition-rendering7) 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 de0531a8f..dd68d67fe 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(ignition-rendering-thermal-camera) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/transform_control/CMakeLists.txt b/examples/transform_control/CMakeLists.txt index ddeb66a91..8f8c15997 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(ignition-rendering-transform-control) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/view_control/CMakeLists.txt b/examples/view_control/CMakeLists.txt index e9334fe60..97c9fcfab 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(ignition-rendering-view-control) -find_package(ignition-rendering6 REQUIRED) +find_package(ignition-rendering7 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 21474cd5d..7001b2cf5 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(ignition-rendering-visualization-demo) -find_package(ignition-rendering6) +find_package(ignition-rendering7) if (APPLE OR UNIX) find_package(GLUT REQUIRED) diff --git a/tutorials/17_render_pass_tutorial.md b/tutorials/17_render_pass_tutorial.md index 3d5e8e10d..fb0185fbd 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 [ignition-rendering6-ogre] +[Msg] Loading plugin [ignition-rendering7-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 373824769..11b54a9fb 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 [ignition-rendering6-ogre] +[Msg] Loading plugin [ignition-rendering7-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 cad86252d..25166c8fb 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 [ignition-rendering6-ogre] +[Msg] Loading plugin [ignition-rendering7-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 7a74e0eeb..42dc9a506 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 [ignition-rendering6-ogre2] +[Msg] Loading plugin [ignition-rendering7-ogre2] =============================== TAB - Switch render engines ESC - Exit diff --git a/tutorials/21_heightmap.md b/tutorials/21_heightmap.md index 677ee5d30..8a2431d95 100644 --- a/tutorials/21_heightmap.md +++ b/tutorials/21_heightmap.md @@ -25,7 +25,7 @@ Execute the example: You'll see: ```{.sh} -[Msg] Loading plugin [ignition-rendering6-ogre] +[Msg] Loading plugin [ignition-rendering7-ogre] [Msg] Loading heightmap: scene::Heightmap(65528) [Msg] Heightmap loaded. Process took 217 ms. =============================== From a266806be1de3fc51c4f302e88394fc569a1fd2c Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 11 Oct 2021 10:03:51 -0700 Subject: [PATCH 2/2] pre 2 -> pre1 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23b392db2..15fbbbcdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR}) #============================================================================ # Set up the project #============================================================================ -ign_configure_project(VERSION_SUFFIX pre2) +ign_configure_project(VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options