Merge pull request #552 from ignitionrobotics/merge_6_7_20220131

6 -> 7

Changelog.md

@@ -6,6 +6,52 @@
 
 ### Ignition Rendering 6.X
 
+### Ignition Rendering 6.2.0 (2022-01-28)
+
+1. Fix missing terrain shadows casted on objects
+    * [Pull request #547](https://github.com/ignitionrobotics/ign-rendering/pull/547)
+
+1. Add waves
+    * [Pull request #541](https://github.com/ignitionrobotics/ign-rendering/pull/541)
+
+1. Fix crash when hovering the cursor in heightmap.sdf
+    * [Pull request #536](https://github.com/ignitionrobotics/ign-rendering/pull/536)
+
+1. Fix material switching for objects using shaders (ogre2)
+    * [Pull request #533](https://github.com/ignitionrobotics/ign-rendering/pull/533)
+
+1. [Metal] Fix depth camera
+    * [Pull request #535](https://github.com/ignitionrobotics/ign-rendering/pull/535)
+    * A contribution from Rhys Mainwaring <[email protected]>
+
+1. Bind shader uniforms to constants from ogre
+    * [Pull request #531](https://github.com/ignitionrobotics/ign-rendering/pull/531)
+
+1. Silence CMake policy CMP0072
+    * [Pull request #528](https://github.com/ignitionrobotics/ign-rendering/pull/528)
+
+1. Fix various issues with Ogre2GpuRays
+    * [Pull request #522](https://github.com/ignitionrobotics/ign-rendering/pull/522)
+    * [Pull request #527](https://github.com/ignitionrobotics/ign-rendering/pull/527)
+
+1. Fix Ogre2ThermalCamera using garbage depth data
+    * [Pull request #523](https://github.com/ignitionrobotics/ign-rendering/pull/523)
+
+1. Performance optimization by avoiding unnecessary passes
+    * [Pull request #524](https://github.com/ignitionrobotics/ign-rendering/pull/524)
+
+1. Support using custom shader materials and updating uniform variables (ogre2)
+    * [Pull request #520](https://github.com/ignitionrobotics/ign-rendering/pull/520)
+
+1. Port Camera Distortion effect from gazebo11
+    * [Pull request #502](https://github.com/ignitionrobotics/ign-rendering/pull/502)
+
+1. Fix sky background in RGBD camera
+    * [Pull request #515](https://github.com/ignitionrobotics/ign-rendering/pull/515)
+
+1. RenderOrder is in different scale in Reverse Z
+    * [Pull request #514](https://github.com/ignitionrobotics/ign-rendering/pull/514)
+
 ### Ignition Rendering 6.1.0 (2021-12-09)
 
 1. Check for OpenGL backend before calling GL APIs

examples/waves/CMakeLists.txt

@@ -0,0 +1,71 @@
+cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+project(ignition-rendering-waves)
+
+include_directories(SYSTEM
+  ${PROJECT_BINARY_DIR}
+)
+
+find_package(ignition-rendering6)
+
+set(TARGET_THIRD_PARTY_DEPENDS "")
+
+if (APPLE OR UNIX)
+  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})
+  set(TARGET_THIRD_PARTY_DEPENDS
+    ${TARGET_THIRD_PARTY_DEPENDS}
+    ${OPENGL_LIBRARIES}
+    ${GLUT_LIBRARIES}
+  )
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+endif()
+
+if (NOT APPLE)
+  find_package(GLEW REQUIRED)
+  if (WIN32)
+    set(TARGET_THIRD_PARTY_DEPENDS
+      ${TARGET_THIRD_PARTY_DEPENDS}
+      GLEW::glew
+    )
+  else ()
+    set(TARGET_THIRD_PARTY_DEPENDS
+      ${TARGET_THIRD_PARTY_DEPENDS}
+      GLEW
+    )
+  endif()
+endif()
+
+configure_file (example_config.hh.in ${PROJECT_BINARY_DIR}/example_config.hh)
+
+if (WIN32)
+  find_package(FreeGLUT REQUIRED)
+  set(TARGET_THIRD_PARTY_DEPENDS ${TARGET_THIRD_PARTY_DEPENDS} FreeGLUT::freeglut)
+endif()
+
+add_executable(waves Main.cc GlutWindow.cc)
+
+target_link_libraries(waves
+  ${IGNITION-RENDERING_LIBRARIES}
+  ${TARGET_THIRD_PARTY_DEPENDS}
+)
+
+if (WIN32)
+  set_target_properties(waves
+    PROPERTIES
+      RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
+      RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}
+      RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}
+      RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${PROJECT_BINARY_DIR}
+      RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${PROJECT_BINARY_DIR}
+  )
+endif()
+
+add_custom_command(TARGET waves POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy_directory
+  ${CMAKE_SOURCE_DIR}/media
+  $<TARGET_FILE_DIR:waves>/media)