merge, fix conflicts, address projector todos

Signed-off-by: Ian Chen <[email protected]>

CMakeLists.txt

@@ -63,9 +63,17 @@ if ((NOT ${CMAKE_VERSION} VERSION_LESS 3.11) AND (NOT OpenGL_GL_PREFERENCE))
   set(OpenGL_GL_PREFERENCE "GLVND")
 endif()
 
-gz_find_package(OpenGL
-  REQUIRED_BY ogre ogre2
-  PKGCONFIG gl)
+if (APPLE)
+  gz_find_package(OpenGL
+    REQUIRED_BY ogre ogre2
+    PKGCONFIG gl)
+else()
+  gz_find_package(OpenGL REQUIRED
+    COMPONENTS OpenGL
+    OPTIONAL_COMPONENTS EGL
+    REQUIRED_BY ogre ogre2
+    PKGCONFIG gl)
+endif()
 
 if (OpenGL_FOUND)
   set(HAVE_OPENGL TRUE)
@@ -151,9 +159,12 @@ if (UNIX AND NOT APPLE)
 endif()
 
 # Plugin install dirs
-set(GZ_RENDERING_ENGINE_INSTALL_DIR
-  ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
+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})
+
 
 #--------------------------------------
 # Find dependencies that we ignore for Visual Studio
@@ -181,7 +192,8 @@ else()
   set(GZ_RENDERING_PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 endif()
 
-set(GZ_RENDERING_RESOURCE_PATH ${CMAKE_INSTALL_PREFIX}/${GZ_DATA_INSTALL_DIR})
+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

Changelog.md

@@ -6,6 +6,41 @@
 
 ### Gazebo Rendering 7.X
 
+### Gazebo Rendering 7.4.0 (2023-05-18)
+
+1. Add optional binary relocatability
+    * [Pull request #804](https://github.com/gazebosim/gz-rendering/pull/804)
+
+1. Add Projector
+    * [Pull request #845](https://github.com/gazebosim/gz-rendering/pull/845)
+
+1. Add support for bayer images to Ogre and Ogre2
+    * [Pull request #838](https://github.com/gazebosim/gz-rendering/pull/838)
+
+1. Fix requiring OpenGL on macOS
+    * [Pull request #844](https://github.com/gazebosim/gz-rendering/pull/844)
+
+### Gazebo Rendering 7.3.1 (2023-04-13)
+
+1. Lower severity level for ogre2 visibility mask msgs and unavailable render passes
+    * [Pull request #830](https://github.com/gazebosim/gz-rendering/pull/830)
+
+1.  Fix deleting ogre2 when created (and deleted) in a thread
+    * [Pull request #840](https://github.com/gazebosim/gz-rendering/pull/840)
+    * [Pull request #841](https://github.com/gazebosim/gz-rendering/pull/841)
+
+1. CI workflow: use checkout v3
+    * [Pull request #834](https://github.com/gazebosim/gz-rendering/pull/834)
+
+1. Rename COPYING to LICENSE
+    * [Pull request #833](https://github.com/gazebosim/gz-rendering/pull/833)
+
+1. Add message to see troubleshooting page when render engine fails to create dummy window
+    * [Pull request #829](https://github.com/gazebosim/gz-rendering/pull/829)
+
+1. Tweak max camera position limit
+    * [Pull request #827](https://github.com/gazebosim/gz-rendering/pull/827)
+
 ### Gazebo Rendering 7.3.0 (2023-03-03)
 
 1. Limit max camera position vector length

Migration.md

@@ -55,6 +55,11 @@ release will remove the deprecated code.
     * CMake `-config` files
     * Paths that depend on the project name
 
+1. Updated Bayer image format enums in `PixelFormat.h` to match the Bayer
+formats used in gz-common and gz-msgs.
+  * `PF_BAYER_GBGR8` -> `PF_BAYER_GBRG8`
+  * `PF_BAYER_GRGB8` -> `PF_BAYER_GRBG8`
+
 ## Gazebo Rendering 6.2.1 to 6.X
 
 ### Modifications

examples/projector/CMakeLists.txt

@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+project(gz-rendering-projector)
+find_package(gz-rendering8 REQUIRED)
+
+include_directories(SYSTEM
+  ${PROJECT_BINARY_DIR}
+)
+
+find_package(GLUT REQUIRED)
+include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
+link_directories(${GLUT_LIBRARY_DIRS})
+
+find_package(OpenGL REQUIRED)
+include_directories(SYSTEM ${OpenGL_INCLUDE_DIRS})
+link_directories(${OpenGL_LIBRARY_DIRS})
+
+if (NOT APPLE)
+  find_package(GLEW REQUIRED)
+  include_directories(SYSTEM ${GLEW_INCLUDE_DIRS})
+  link_directories(${GLEW_LIBRARY_DIRS})
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+
+configure_file (example_config.hh.in ${PROJECT_BINARY_DIR}/example_config.hh)
+
+add_executable(projector Main.cc GlutWindow.cc)
+
+target_link_libraries(projector
+  ${GLUT_LIBRARIES}
+  ${OPENGL_LIBRARIES}
+  ${GLEW_LIBRARIES}
+  gz-rendering8::gz-rendering8
+  gz-rendering8::core
+)
+
+add_custom_command(TARGET projector POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy_directory
+  ${CMAKE_SOURCE_DIR}/media
+  $<TARGET_FILE_DIR:projector>/media)