From 0a3d5419941594147bd67b90e41580d80ab5689c Mon Sep 17 00:00:00 2001 From: Hill Ma Date: Mon, 27 Sep 2021 08:41:55 -0700 Subject: [PATCH 1/5] Use direct evaluation for SKIP_av. (#250) Signed-off-by: Hill Ma --- test/integration/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index b03dd4ebd..464f8cbc1 100644 --- 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) 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() \ No newline at end of file +endif() From df11d6e8ae931e42c7ae2b3aa60758d5f90d65a7 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Wed, 13 Oct 2021 16:25:53 -0500 Subject: [PATCH 2/5] Prepare for 3.14.0 release (#258) Signed-off-by: Michael Carroll --- BUILD.bazel | 4 ++-- CMakeLists.txt | 2 +- Changelog.md | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index ec24a4fb1..7693c24a9 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -21,9 +21,9 @@ PROJECT_NAME = "ignition-common" PROJECT_MAJOR = 3 -PROJECT_MINOR = 13 +PROJECT_MINOR = 14 -PROJECT_PATCH = 2 +PROJECT_PATCH = 0 # Generates config.hh based on the version numbers in CMake code. ign_config_header( diff --git a/CMakeLists.txt b/CMakeLists.txt index 901c0e8bf..5267a9b20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-common3 VERSION 3.13.2) +project(ignition-common3 VERSION 3.14.0) #============================================================================ # Find ignition-cmake diff --git a/Changelog.md b/Changelog.md index a9a92c3e1..322c38a39 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,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) From 46ef74c4685fa7047c1aa39b86867ea6b87e5285 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 28 Oct 2021 14:17:41 -0700 Subject: [PATCH 3/5] Fix skip logic for integration tests (#264) Check both SKIP_av and INTERNAL_SKIP_av before building integration tests that require av component. Reported in #263. Signed-off-by: Steve Peters --- test/integration/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index 464f8cbc1..1aa52c366 100644 --- 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() From c649e647016b76482b4045657db0e940bfd9951e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Tue, 9 Nov 2021 03:04:28 +0100 Subject: [PATCH 4/5] Fixed macos symbol in common::profiler (#262) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández --- profiler/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/profiler/src/CMakeLists.txt b/profiler/src/CMakeLists.txt index dc2bc58f1..c826df5e5 100644 --- 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") From 6d6b9d5b5e68f23bd95b0c6c15733af2b2430ed0 Mon Sep 17 00:00:00 2001 From: Hill Ma Date: Fri, 19 Nov 2021 13:41:38 -0800 Subject: [PATCH 5/5] Normalize normal vectors from OBJ. (#269) Normal vectors that are not normalized might cause incorrect rendering results. Signed-off-by: Hill Ma --- graphics/src/OBJLoader.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/graphics/src/OBJLoader.cc b/graphics/src/OBJLoader.cc index 274d8e6e9..d293f437a 100644 --- 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