Merge branch 'main' into gz-rendering9-v1

gazebosim · Jan 15, 2025 · 7f77af8 · 7f77af8
2 parents 5c86f06 + f5dbc9d
commit 7f77af8
Show file tree

Hide file tree

Showing 43 changed files with 70 additions and 80 deletions.
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -6,7 +6,7 @@ jobs:
   build:
     name: Window CI
     env:
-      PACKAGE: gz-rendering9
+      PACKAGE: gz-rendering10
     runs-on: windows-latest
     steps:
     - name: setup-pixi

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-rendering9 VERSION 9.0.0)
+project(gz-rendering10 VERSION 10.0.0)
 
 #============================================================================
 # Find gz-cmake
@@ -18,7 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-gz_configure_project(VERSION_SUFFIX)
+gz_configure_project(VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
@@ -151,6 +151,7 @@ endif()
 set(GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR
   ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
 )
+
 set(GZ_RENDERING_ENGINE_INSTALL_DIR
   ${CMAKE_INSTALL_PREFIX}/${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR})
 
@@ -196,7 +197,6 @@ else()
 endif()
 
 set(GZ_RENDERING_RELATIVE_RESOURCE_PATH ${GZ_DATA_INSTALL_DIR})
-set(GZ_RENDERING_RESOURCE_PATH ${CMAKE_INSTALL_PREFIX}/${GZ_RENDERING_RELATIVE_RESOURCE_PATH})
 
 #============================================================================
 # Configure the build

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 ## Gazebo Rendering
 
+### Gazebo Rendering 10.X
+
+### Gazebo Rendering 10.0.0 (20XX-XX-XX)
+
 ### Gazebo Rendering 9.X
 
 ### Gazebo Rendering 9.0.0 (2024-09-25)

diff --git a/Migration.md b/Migration.md
@@ -5,6 +5,20 @@ Deprecated code produces compile-time warnings. These warning serve as
 notification to users that their code should be upgraded. The next major
 release will remove the deprecated code.
 
+## Gazebo Rendering 9.x to 10.x
+
+### Removals
+
+1. The macro `GZ_RENDERING_RESOURCE_PATH` is removed. Use
+`gz::rendering::getResourcePath()` instead.
+
+1. The macro `GZ_RENDERING_ENGINE_INSTALL_DIR` is removed. Use
+`gz::rendering::getEngineInstallDir()` instead.
+
+1. **Ogre2SelectionBuffer**
+    + Removed: `bool ExecuteQuery(const int _x, const int _y, Ogre::Item *&_item, math::Vector3d &_point)`
+    + Replacement: `bool ExecuteQuery(int _x, int _y, Ogre::MovableObject *&_obj, math::Vector3d &_point)`
+
 ## Gazebo Rendering 8.x to 9.x
 
 ### Deprecations

diff --git a/README.md b/README.md
@@ -9,10 +9,10 @@
 
 Build | Status
 -- | --
-Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-rendering/tree/gz-rendering9/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-rendering/tree/gz-rendering9)
-Ubuntu Noble  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-gz-rendering9-noble-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-gz-rendering9-noble-amd64)
-Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-gz-rendering9-homebrew-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-gz-rendering9-homebrew-amd64)
-Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-9-win)](https://build.osrfoundation.org/job/gz_rendering-9-win)
+Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-rendering/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-rendering/tree/main)
+Ubuntu Noble  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-main-noble-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-main-homebrew-amd64)
+Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-main-win)](https://build.osrfoundation.org/job/gz_rendering-main-win)
 
 Gazebo Rendering is a C++ library designed to provide an abstraction
 for different rendering engines. It offers unified APIs for creating

diff --git a/examples/actor_animation/CMakeLists.txt b/examples/actor_animation/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-actor-animation)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-boundingbox-camera)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-camera-tracking)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-custom-scene-viewer)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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-rendering9 REQUIRED)
+find_package(gz-rendering10 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-rendering9)
+find_package(gz-rendering10)
 
 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.22.1 FATAL_ERROR)
 project(gz-rendering-depth-camera)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-global_illumination)
 
-find_package(gz-rendering9)
+find_package(gz-rendering10)
 
 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.22.1 FATAL_ERROR)
 project(gz-rendering-heightmap)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 
-find_package(gz-rendering9 REQUIRED)
-set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})
+find_package(gz-rendering10 REQUIRED)
+set(GZ_RENDERING_VER ${gz-rendering10_VERSION_MAJOR})
 
 find_package(gz-plugin3 REQUIRED COMPONENTS all)
 set(GZ_PLUGIN_VER ${gz-plugin3_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.22.1 FATAL_ERROR)
 project(gz-rendering-lidar_visual)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}

diff --git a/examples/lux_core_engine/CMakeLists.txt b/examples/lux_core_engine/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 set(GZ_PLUGIN_VER 2)
 set(GZ_COMMON_VER 5)
 
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 REQUIRED)
 find_package(gz-plugin3 REQUIRED COMPONENTS all)
 
 if (NOT DEFINED ENV{LUXCORE_SDK_PATH})

diff --git a/examples/mesh_viewer/CMakeLists.txt b/examples/mesh_viewer/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-rendering-mesh-viewer)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-mouse-picking)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-ogre2-demo)
 
-find_package(gz-rendering9)
+find_package(gz-rendering10)
 
 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.22.1 FATAL_ERROR)
 project(gz-rendering-particles-demo)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-projector)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}
@@ -30,8 +30,8 @@ target_link_libraries(projector
   ${GLUT_LIBRARIES}
   ${OPENGL_LIBRARIES}
   ${GLEW_LIBRARIES}
-  gz-rendering9::gz-rendering9
-  gz-rendering9::core
+  gz-rendering10::gz-rendering10
+  gz-rendering10::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.22.1 FATAL_ERROR)
 project(gz-rendering-render-pass)
 
-find_package(gz-rendering9)
+find_package(gz-rendering10)
 
 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.22.1 FATAL_ERROR)
 project(gz-rendering-segmentation-camera)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-simple-demo)
 
-find_package(gz-rendering9)
+find_package(gz-rendering10)
 
 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-cmake4_VERSION_MAJOR})
 
 #------------------------------------------------------------------------
 # Find gz-rendering
-find_package(gz-rendering9)
+find_package(gz-rendering10)
 
 #======================================
 # 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.22.1 FATAL_ERROR)
 project(gz-rendering-text-geom)
 
-find_package(gz-rendering9)
+find_package(gz-rendering10)
 
 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.22.1 FATAL_ERROR)
 project(gz-rendering-thermal-camera)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-transform-control)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-view-control)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 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.22.1 FATAL_ERROR)
 project(gz-rendering-visualization-demo)
 
-find_package(gz-rendering9)
+find_package(gz-rendering10)
 
 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-rendering9)
+find_package(gz-rendering10)
 
 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.22.1 FATAL_ERROR)
 project(gz-rendering-wide-angle-camera)
-find_package(gz-rendering9 REQUIRED)
+find_package(gz-rendering10 REQUIRED)
 
 include_directories(SYSTEM
   ${PROJECT_BINARY_DIR}

diff --git a/include/gz/rendering/config.hh.in b/include/gz/rendering/config.hh.in
@@ -32,10 +32,6 @@
 
 #define GZ_RENDERING_VERSION_HEADER "Gazebo Rendering, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2014 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
 
-#define GZ_RENDERING_RESOURCE_PATH _Pragma ("GCC warning \"'GZ_RENDERING_RESOURCE_PATH' macro is deprecated, use gz::rendering::getResourcePath() function instead. \"") "${GZ_RENDERING_RESOURCE_PATH}"
-
-#define GZ_RENDERING_ENGINE_INSTALL_DIR _Pragma ("GCC warning \"'GZ_RENDERING_ENGINE_INSTALL_DIR' macro is deprecated, use gz::rendering::getEngineInstallDir() function instead. \"") "${GZ_RENDERING_ENGINE_INSTALL_DIR}"
-
 #cmakedefine GZ_RENDERING_HAVE_OGRE 1
 #cmakedefine GZ_RENDERING_HAVE_OGRE2 1
 #cmakedefine GZ_RENDERING_HAVE_OPTIX 1

diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh b/ogre2/include/gz/rendering/ogre2/Ogre2SelectionBuffer.hh
@@ -65,16 +65,6 @@ namespace gz
       /// \return Returns the Ogre movable object at the coordinate.
       public: Ogre::MovableObject *OnSelectionClick(int _x, int _y);
 
-      /// \brief Perform selection operation and get ogre item and
-      /// point of intersection.
-      /// \param[in] _x X coordinate in pixels.
-      /// \param[in] _y Y coordinate in pixels.
-      /// \param[out] _item Ogre item at the coordinate.
-      /// \param[out] _point 3D point of intersection with the ogre item's mesh.
-      /// \return True if an ogre item is found, false otherwise
-      public: bool GZ_DEPRECATED(9) ExecuteQuery(const int _x, const int _y,
-          Ogre::Item *&_item, math::Vector3d &_point);
-
       /// \brief Perform selection operation and get ogre item and
       /// point of intersection.
       /// \param[in] _x X coordinate in pixels.

diff --git a/ogre2/src/Ogre2SelectionBuffer.cc b/ogre2/src/Ogre2SelectionBuffer.cc
@@ -421,20 +421,6 @@ Ogre::MovableObject *Ogre2SelectionBuffer::OnSelectionClick(int _x, int _y)
   return obj;
 }
 
-/////////////////////////////////////////////////
-bool Ogre2SelectionBuffer::ExecuteQuery(const int _x, const int _y,
-    Ogre::Item *&_item, math::Vector3d &_point)
-{
-  Ogre::MovableObject *obj = nullptr;
-  bool out = this->ExecuteQuery(_x, _y, obj, _point);
-
-  Ogre::Item *item = dynamic_cast<Ogre::Item *>(obj);
-  if (item)
-    _item = item;
-
-  return out;
-}
-
 /////////////////////////////////////////////////
 bool Ogre2SelectionBuffer::ExecuteQuery(int _x, int _y,
     Ogre::MovableObject *&_obj, math::Vector3d &_point)

diff --git a/package.xml b/package.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
-  <name>gz-rendering9</name>
-  <version>9.0.0</version>
+  <name>gz-rendering10</name>
+  <version>10.0.0</version>
   <description>Gazebo Rendering: Rendering library for robot applications</description>
   <maintainer email="[email protected]">Ian Chen</maintainer>
   <license>Apache License 2.0</license>