Skip to content

Commit

Permalink
Release v1.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
webermm committed Mar 21, 2024
1 parent 06f2bd6 commit fd87059
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
11 changes: 1 addition & 10 deletions components/libRamsesBase/src/ramses_adaptor/SkinAdaptor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::array<float, 16>> 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);
Expand Down
2 changes: 1 addition & 1 deletion third_party/ramses-logic

0 comments on commit fd87059

Please sign in to comment.