Merge pull request #277 from ignitionrobotics/chapulina/3_to_4

3 ➡️ 4
gazebosim · Dec 6, 2021 · c0f8521 · c0f8521
2 parents f75ad3d + f5c0d8d
commit c0f8521
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -141,6 +141,32 @@
 
 ## Ignition Common 3.X.X
 
+## Ignition Common 3.14.0 (2021-10-12)
+
+1. Support loading PBR textures in OBJLoader
+    * [Pull request #216](https://github.com/ignitionrobotics/ign-common/pull/216)
+
+1. Remove CMAKE_CXX_FLAGS from test targetrs 
+    * [Pull request #214](https://github.com/ignitionrobotics/ign-common/pull/214)
+
+1. Set project-wide standard to C++17
+    * [Pull request #221](https://github.com/ignitionrobotics/ign-common/pull/221)
+
+1. Fix av_* API usage for deprecations 
+    * [Pull request #220](https://github.com/ignitionrobotics/ign-common/pull/220)
+
+1. Make KeyEvent rule-of-five compliant 
+    * [Pull request #224](https://github.com/ignitionrobotics/ign-common/pull/224)
+
+1. Fix segfault caused by destructionb order of Event and Connection 
+    * [Pull request #234](https://github.com/ignitionrobotics/ign-common/pull/234)
+
+1. Fix a typo in VideoEncoder_TEST 
+    * [Pull request #231](https://github.com/ignitionrobotics/ign-common/pull/231)
+
+1. Use direct evaluation for SKIP_av 
+    * [Pull request #250](https://github.com/ignitionrobotics/ign-common/pull/250)
+
 ## Ignition Common 3.13.2 (2021-05-11)
 
 1. Backport collada fixes (Backport #204)

diff --git a/graphics/src/OBJLoader.cc b/graphics/src/OBJLoader.cc
@@ -234,6 +234,7 @@ Mesh *OBJLoader::Load(const std::string &_filename)
           ignition::math::Vector3d normal(attrib.normals[3 * nIdx],
                                           attrib.normals[3 * nIdx + 1],
                                           attrib.normals[3 * nIdx + 2]);
+          normal.Normalize();
           subMesh->AddNormal(normal);
         }
         // texcoords

diff --git a/profiler/src/CMakeLists.txt b/profiler/src/CMakeLists.txt
@@ -58,6 +58,7 @@ ign_add_component(profiler SOURCES ${PROFILER_SRCS} GET_TARGET_NAME profiler_tar
 # Always enable profiler so that it's built, but make it
 # private so that downstream users can still disable profiling
 target_compile_definitions(${profiler_target} PRIVATE "IGN_PROFILER_ENABLE=1")
+target_compile_definitions(${profiler_target} PRIVATE "RMT_USE_METAL=${RMT_USE_METAL}")
 
 if(IGN_PROFILER_REMOTERY)
   target_compile_definitions(${profiler_target} PRIVATE "IGN_PROFILER_REMOTERY=1")

diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
@@ -6,7 +6,7 @@ ign_get_sources(tests)
 # FIXME the mesh test does not work
 list(REMOVE_ITEM tests mesh.cc)
 
-if (${SKIP_av})
+if (SKIP_av OR INTERNAL_SKIP_av)
   list(REMOVE_ITEM tests encoder_timing.cc)
   list(REMOVE_ITEM tests video_encoder.cc)
 endif()
@@ -29,4 +29,4 @@ endif()
 
 if(TARGET INTEGRATION_video_encoder)
   target_link_libraries(INTEGRATION_video_encoder ${PROJECT_LIBRARY_TARGET_NAME}-av)
-endif()
+endif()