Merge pull request #331 from ignitionrobotics/merge_5_6_060421

5 -> 6 (main)
gazebosim · Jun 4, 2021 · cbc35f8 · cbc35f8
2 parents 3d93e9c + 63132ac
commit cbc35f8
Show file tree

Hide file tree

Showing 41 changed files with 1,495 additions and 5,946 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -245,7 +245,31 @@
 
 ### Ignition Rendering 3.X.X (2021-XX-XX)
 
+### Ignition Rendering 3.5.0 (2021-05-25)
 
+1. Include MoveTo Helper class to ign-rendering
+    * [Pull request 311](https://github.com/ignitionrobotics/ign-rendering/pull/311)
+
+1. Remove tools/code_check and update codecov
+    * [Pull request 321](https://github.com/ignitionrobotics/ign-rendering/pull/321)
+
+1. Helper function to get a scene (#320)
+    * [Pull request 320](https://github.com/ignitionrobotics/ign-rendering/pull/320)
+
+1. Fix DepthGaussianNoise test (#271)
+    * [Pull request 271](https://github.com/ignitionrobotics/ign-rendering/pull/271)
+
+1. Master branch updates (#268)
+    * [Pull request 268](https://github.com/ignitionrobotics/ign-rendering/pull/268)
+
+1. 👩🌾 Make GitHub actions tests that are flaky due to display more verbose information (#255)
+    * [Pull request 255](https://github.com/ignitionrobotics/ign-rendering/pull/255)
+
+1. Fixed OBJ textures with the same name (#239)
+    * [Pull request 239](https://github.com/ignitionrobotics/ign-rendering/pull/239)
+
+1. More verbose messages when failing to load render engine (#236)
+    * [Pull request 236](https://github.com/ignitionrobotics/ign-rendering/pull/236)
 
 ### Ignition Rendering 3.4.0 (2021-02-09)
 

diff --git a/examples/actor_animation/Main.cc b/examples/actor_animation/Main.cc
@@ -181,17 +181,17 @@ int main(int _argc, char** _argv)
 
   // Expose engine name to command line because we can't instantiate both
   // ogre and ogre2 at the same time
-  std::string engine("ogre");
+  std::string ogreEngineName("ogre");
   if (_argc > 1)
   {
-    engine = _argv[1];
+    ogreEngineName = _argv[1];
   }
 
   common::Console::SetVerbosity(4);
   std::vector<std::string> engineNames;
   std::vector<CameraPtr> cameras;
 
-  engineNames.push_back(engine);
+  engineNames.push_back(ogreEngineName);
 
   std::vector<VisualPtr> visuals;
   ic::SkeletonPtr skel = nullptr;

diff --git a/examples/camera_tracking/Main.cc b/examples/camera_tracking/Main.cc
@@ -118,12 +118,20 @@ int main(int _argc, char** _argv)
 {
   glutInit(&_argc, _argv);
 
+  // Expose engine name to command line because we can't instantiate both
+  // ogre and ogre2 at the same time
+  std::string ogreEngineName("ogre");
+  if (_argc > 1)
+  {
+    ogreEngineName = _argv[1];
+  }
+
   common::Console::SetVerbosity(4);
   std::vector<std::string> engineNames;
   std::vector<CameraPtr> cameras;
   std::vector<NodePtr> nodes;
 
-  engineNames.push_back("ogre");
+  engineNames.push_back(ogreEngineName);
   engineNames.push_back("optix");
 
   for (auto engineName : engineNames)

diff --git a/examples/custom_scene_viewer/ManualSceneDemo.cc b/examples/custom_scene_viewer/ManualSceneDemo.cc
@@ -185,10 +185,10 @@ int main(int _argc, char** _argv)
 
   // Expose engine name to command line because we can't instantiate both
   // ogre and ogre2 at the same time
-  std::string ogreEngine("ogre");
+  std::string ogreEngineName("ogre");
   if (_argc > 1)
   {
-    ogreEngine = _argv[1];
+    ogreEngineName = _argv[1];
   }
 
   common::Console::SetVerbosity(4);
@@ -208,7 +208,7 @@ int main(int _argc, char** _argv)
   sceneDemo->AddScene(SceneBuilderPtr(new ShadowSceneBuilder(4)));
   sceneDemo->AddScene(SceneBuilderPtr(new ShadowSceneBuilder(5)));
 //! [add scenes]
-  sceneDemo->AddCamera(ogreEngine);
+  sceneDemo->AddCamera(ogreEngineName);
   sceneDemo->AddCamera("optix");
   sceneDemo->Run();
   return 0;

diff --git a/examples/custom_shaders_uniforms/CMakeLists.txt b/examples/custom_shaders_uniforms/CMakeLists.txt
@@ -0,0 +1,71 @@
+cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+project(ignition-rendering-custom_shaders_uniforms)
+
+include_directories(SYSTEM
+  ${PROJECT_BINARY_DIR}
+)
+
+find_package(ignition-rendering4)
+
+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(custom_shaders_uniforms Main.cc GlutWindow.cc)
+
+target_link_libraries(custom_shaders_uniforms
+  ${IGNITION-RENDERING_LIBRARIES}
+  ${TARGET_THIRD_PARTY_DEPENDS}
+)
+
+if (WIN32)
+  set_target_properties(custom_shaders_uniforms
+    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 custom_shaders_uniforms POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy_directory
+  ${CMAKE_SOURCE_DIR}/media
+  $<TARGET_FILE_DIR:custom_shaders_uniforms>/media)