From fd87059c605153535077bdf609da0f459f6dd066 Mon Sep 17 00:00:00 2001 From: Marcus Weber Date: Thu, 21 Mar 2024 13:25:20 +0100 Subject: [PATCH] Release v1.10.2 --- CHANGELOG.md | 8 ++++++++ CMakeLists.txt | 2 +- .../libRamsesBase/src/ramses_adaptor/SkinAdaptor.cpp | 11 +---------- third_party/ramses-logic | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8040b179..688f09fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,14 @@ If a copy of the MPL was not distributed with this file, You can obtain one at h --> +## [1.10.2] Ramses Logic Update + +### Changes +* Update ramses-logic from 1.4.2 to 1.4.5. +* Update ramses from 27.0.130 to 27.0.139. +* Since the LogicEngine now fixed the export of Skin objects the workaround in RamsesComposer has been removed. + + ## [1.10.1] Skinning Export Bugfix ### Fixes diff --git a/CMakeLists.txt b/CMakeLists.txt index 49b65a98..dfdc7d69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.19) SET(CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebInfo") -project(RaCoOS VERSION 1.10.1) +project(RaCoOS VERSION 1.10.2) SET(RACO_RELEASE_DIRECTORY ${CMAKE_BINARY_DIR}/release) diff --git a/components/libRamsesBase/src/ramses_adaptor/SkinAdaptor.cpp b/components/libRamsesBase/src/ramses_adaptor/SkinAdaptor.cpp index 370320aa..04b60f75 100644 --- a/components/libRamsesBase/src/ramses_adaptor/SkinAdaptor.cpp +++ b/components/libRamsesBase/src/ramses_adaptor/SkinAdaptor.cpp @@ -78,16 +78,7 @@ bool SkinAdaptor::sync(core::Errors* errors) { std::string name = targetAdaptors.size() == 1 ? editorObject()->objectName() : fmt::format("{}_SkinBinding_{}", editorObject()->objectName(), index); - // TODO workaround for the LogicEngine SkinBindingImpl::Serialize function reversing the order of the bind matrices. - // Remove this again once the LogicEngine has been fixed. - std::vector> matrices; - if (sceneAdaptor_->optimizeForExport()) { - std::copy(data->inverseBindMatrices.rbegin(), data->inverseBindMatrices.rend(), std::inserter(matrices, matrices.end())); - } else { - std::copy(data->inverseBindMatrices.begin(), data->inverseBindMatrices.end(), std::inserter(matrices, matrices.end())); - } - - auto skinBinding = ramses_base::ramsesSkinBinding(&sceneAdaptor_->logicEngine(), jointBindings, matrices, appearanceBinding, + auto skinBinding = ramses_base::ramsesSkinBinding(&sceneAdaptor_->logicEngine(), jointBindings, data->inverseBindMatrices, appearanceBinding, uniform, name, editorObject()->objectIDAsRamsesLogicID()); if (skinBinding) { skinBindings_.emplace_back(skinBinding); diff --git a/third_party/ramses-logic b/third_party/ramses-logic index a58dd77f..e7ebf21f 160000 --- a/third_party/ramses-logic +++ b/third_party/ramses-logic @@ -1 +1 @@ -Subproject commit a58dd77f2b3f87ed18181a9599e3e697a0451ec8 +Subproject commit e7ebf21f3a96df73ce0e6e00251f832040eba38e