Oss release v1.2.0 created 2022-09-21-07-11

ramses-tech-user · nVxx · bojackHaasman · ramses-tech-user · commit db6379ff14aa · 2022-09-21T07:11:38.000Z
see CHANGELOG.md for details

Original commit sha: ea940ffc424e5c371f13d7124042f335cd2bb3d1

Co-authored-by: Askanaz Torosyan &lt;46795157+nVxx@users.noreply.github.com&gt;
Co-authored-by: Daniel Haas &lt;25718295+bojackHaasman@users.noreply.github.com&gt;
Co-authored-by: Mohamed Sharaf-El-Deen &lt;769940+mohhsharaf@users.noreply.github.com&gt;
Co-authored-by: Mirko Sova &lt;64351017+smirko-dev@users.noreply.github.com&gt;
Co-authored-by: Tobias Hammer &lt;tohammer@users.noreply.github.com&gt;
Co-authored-by: Violin Yanev &lt;violinyanev@users.noreply.github.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,8 +14,8 @@ cmake_minimum_required(VERSION 3.13)
 #==========================================================================
 
 set(RLOGIC_VERSION_MAJOR 1)
-set(RLOGIC_VERSION_MINOR 1)
-set(RLOGIC_VERSION_PATCH 1)
+set(RLOGIC_VERSION_MINOR 2)
+set(RLOGIC_VERSION_PATCH 0)
 
 set(RLOGIC_VERSION ${RLOGIC_VERSION_MAJOR}.${RLOGIC_VERSION_MINOR}.${RLOGIC_VERSION_PATCH})
 set(ramses-logic_VERSION "${RLOGIC_VERSION}" CACHE STRING "Ramses Logic version" FORCE)
diff --git a/README.md b/README.md
@@ -34,27 +34,27 @@ Prefer to learn by example? Have a look at our [self-contained example snippets]
 
 |Logic    | Included Ramses version       | Minimum required Ramses version    | Binary file compatibility    |
 |---------|-------------------------------|------------------------------------|------------------------------|
-|1.2.0    | 27.0.122                      | 27.0.102                           | >= 1.0.0, F-Levels 01 - 03   |
-|1.1.x    | 27.0.121                      | 27.0.102                           | >= 1.0.0, F-Levels 01, 02    |
-|1.0.x    | 27.0.119                      | 27.0.102                           | >= 1.0.0                     |
-|0.15.0   | 27.0.116                      | 27.0.102                           | >= 0.15.0                    |
-|0.14.2   | 27.0.115                      | 27.0.102                           | >= 0.13.0                    |
-|0.14.1   | 27.0.114                      | 27.0.102                           | >= 0.13.0                    |
-|0.13.0   | 27.0.114                      | 27.0.102                           | >= 0.13.0                    |
-|0.12.0   | 27.0.113                      | 27.0.102                           | 0.9.0 - 0.12.0               |
-|0.11.0   | 27.0.113                      | 27.0.102                           | 0.9.0 - 0.12.0               |
-|0.10.2   | 27.0.112                      | 27.0.102                           | 0.9.0 - 0.12.0               |
-|0.10.1   | 27.0.111                      | 27.0.102                           | 0.9.0 - 0.12.0               |
-|0.10.0   | 27.0.111                      | 27.0.102                           | 0.9.0 - 0.12.0               |
-|0.9.1    | 27.0.111                      | 27.0.102                           | 0.9.0 - 0.12.0               |
-|0.9.0    | 27.0.110                      | 27.0.102                           | 0.9.0 - 0.12.0               |
-|0.8.1    | 27.0.110                      | 27.0.102                           | 0.7.x or 0.8.x               |
-|0.8.0    | 27.0.110                      | 27.0.102                           | 0.7.x or 0.8.x               |
-|0.7.0    | 27.0.105                      | 27.0.102                           | 0.7.x                        |
-|0.6.2    | 27.0.105                      | 27.0.102                           | 0.6.x                        |
-|0.6.1    | 27.0.103 (includes 27.0.11)   | 27.0.102                           | 0.6.x                        |
-|0.6.0    | 27.0.102 (includes 27.0.10)   | 27.0.100                           | 0.6.x                        |
-|0.5.3    | 27.0.101                      | 27.0.100                           | 0.5.3                        |
+|v1.2.0    | 27.0.122                      | 27.0.102                           | >= 1.0.0, F-Levels 01 - 03   |
+|v1.1.x    | 27.0.121                      | 27.0.102                           | >= 1.0.0, F-Levels 01, 02    |
+|v1.0.x    | 27.0.119                      | 27.0.102                           | >= 1.0.0                     |
+|v0.15.0   | 27.0.116                      | 27.0.102                           | >= 0.15.0                    |
+|v0.14.2   | 27.0.115                      | 27.0.102                           | >= 0.13.0                    |
+|v0.14.1   | 27.0.114                      | 27.0.102                           | >= 0.13.0                    |
+|v0.13.0   | 27.0.114                      | 27.0.102                           | >= 0.13.0                    |
+|v0.12.0   | 27.0.113                      | 27.0.102                           | 0.9.0 - 0.12.0               |
+|v0.11.0   | 27.0.113                      | 27.0.102                           | 0.9.0 - 0.12.0               |
+|v0.10.2   | 27.0.112                      | 27.0.102                           | 0.9.0 - 0.12.0               |
+|v0.10.1   | 27.0.111                      | 27.0.102                           | 0.9.0 - 0.12.0               |
+|v0.10.0   | 27.0.111                      | 27.0.102                           | 0.9.0 - 0.12.0               |
+|v0.9.1    | 27.0.111                      | 27.0.102                           | 0.9.0 - 0.12.0               |
+|v0.9.0    | 27.0.110                      | 27.0.102                           | 0.9.0 - 0.12.0               |
+|v0.8.1    | 27.0.110                      | 27.0.102                           | 0.7.x or 0.8.x               |
+|v0.8.0    | 27.0.110                      | 27.0.102                           | 0.7.x or 0.8.x               |
+|v0.7.0    | 27.0.105                      | 27.0.102                           | 0.7.x                        |
+|v0.6.2    | 27.0.105                      | 27.0.102                           | 0.6.x                        |
+|v0.6.1    | 27.0.103 (includes 27.0.11)   | 27.0.102                           | 0.6.x                        |
+|v0.6.0    | 27.0.102 (includes 27.0.10)   | 27.0.100                           | 0.6.x                        |
+|v0.5.3    | 27.0.101                      | 27.0.100                           | 0.5.3                        |
 
 # License
 
diff --git a/ci/config/sanitizer/lsan_suppressions.txt b/ci/config/sanitizer/lsan_suppressions.txt
@@ -1,2 +1,5 @@
 leak:libxcb.so
 leak:calloc
+
+# TODO(mirko) suppress leaks from swrast executables
+leak:ramses-logic-viewer-test_SWRAST
diff --git a/ci/config/sanitizer/tsan_suppressions.txt b/ci/config/sanitizer/tsan_suppressions.txt
@@ -0,0 +1,2 @@
+# Race in swrast_dri lib
+race:ramses_internal::Context_EGL::~Context_EGL
diff --git a/ci/scripts/check_versions.sh b/ci/scripts/check_versions.sh
@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+
+#  -------------------------------------------------------------------------
+#  Copyright (C) 2022 BMW AG
+#  -------------------------------------------------------------------------
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#  -------------------------------------------------------------------------
+
+set -e
+
+usage() { echo "Usage: $0 -t <tag> -r <root>]" 1>&2; exit 1; }
+
+while getopts ":t:r:" o; do
+    case "${o}" in
+        t)
+            tag=${OPTARG}
+            ;;
+        r)
+            root=${OPTARG}
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${tag}" ]; then
+    echo "Missing tag!"
+    usage
+fi
+
+cmakelists="${root}/CMakeLists.txt"
+if [ -f "$cmakelists" ]; then
+    echo "Comparing $tag against version declared in $cmakelists"
+
+    VERSION_MAJOR=`cat $cmakelists | grep "set(RLOGIC_VERSION_MAJOR" | sed 's/^[^0-9]*\([0-9]*\).*$/\1/'`
+    VERSION_MINOR=`cat $cmakelists | grep "set(RLOGIC_VERSION_MINOR" | sed 's/^[^0-9]*\([0-9]*\).*$/\1/'`
+    VERSION_PATCH=`cat $cmakelists | grep "set(RLOGIC_VERSION_PATCH" | sed 's/^[^0-9]*\([0-9]*\).*$/\1/'`
+    cmake_version="v$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+
+    if [ "$cmake_version" = "$tag" ]; then
+        echo "Tag $tag matches version in $cmakelists"
+    else
+        echo "Tag $tag does not match the version in $cmakelists ($cmake_version)" 1>&2
+        exit 1
+    fi
+else
+    echo "Could not find CMakeLists ($cmakelists)!" 1>&2
+    exit 1
+fi
+
+changelog="${root}/CHANGELOG.md"
+if [ -f "$changelog" ]; then
+    echo "Checking if version $tag is mentioned in $changelog"
+
+    if [ -n "$(cat $changelog | grep $tag)" ]; then
+        echo "Tag $tag is mentioned in $changelog"
+    else
+        echo "Tag $tag is not mentioned in $changelog" 1>&2
+        exit 1
+    fi
+
+else
+    echo "Could not find changelog ($changelog)!" 1>&2
+    exit 1
+fi
+
+readme="${root}/README.md"
+if [ -f "$readme" ]; then
+    echo "Checking if version $tag is mentioned in $readme"
+
+    if [ -n "$(cat $readme | grep $tag)" ]; then
+        echo "Tag $tag is mentioned in $readme"
+    else
+        echo "Tag $tag is not mentioned in $readme" 1>&2
+        exit 1
+    fi
+
+else
+    echo "Could not find the readme ($readme)!" 1>&2
+    exit 1
+fi
diff --git a/lib/impl/AnchorPointImpl.cpp b/lib/impl/AnchorPointImpl.cpp
@@ -101,8 +101,8 @@ namespace rlogic::internal
             return nullptr;
         }
 
-        RamsesNodeBindingImpl* nodeBinding = deserializationMap.resolveNodeBinding(anchorPoint.nodeBindingId());
-        RamsesCameraBindingImpl* cameraBinding = deserializationMap.resolveCameraBinding(anchorPoint.cameraBindingId());
+        auto* nodeBinding = deserializationMap.resolveLogicObject<RamsesNodeBindingImpl>(anchorPoint.nodeBindingId());
+        auto* cameraBinding = deserializationMap.resolveLogicObject<RamsesCameraBindingImpl>(anchorPoint.cameraBindingId());
         if (!nodeBinding || !cameraBinding)
         {
             errorReporting.add("Fatal error during loading of AnchorPoint: could not resolve NodeBinding and/or CameraBinding!", nullptr, EErrorType::BinaryVersionMismatch);
diff --git a/lib/impl/LuaModuleImpl.cpp b/lib/impl/LuaModuleImpl.cpp
@@ -150,15 +150,14 @@ namespace rlogic::internal
                 errorReporting.add(fmt::format("Fatal error during loading of LuaModule '{}' module data: missing name!", name), nullptr, EErrorType::BinaryVersionMismatch);
                 return nullptr;
             }
-            const LuaModule* moduleUsed = deserializationMap.resolveLuaModule(mod->moduleId());
-
+            const auto* moduleUsed = deserializationMap.resolveLogicObject<LuaModuleImpl>(mod->moduleId());
             if (!moduleUsed)
             {
                 errorReporting.add(fmt::format("Fatal error during loading of LuaModule '{}' module data: could not resolve dependent module with id={}!", name, mod->moduleId()), nullptr, EErrorType::BinaryVersionMismatch);
                 return nullptr;
             }
 
-            modulesUsed.emplace(mod->name()->str(), moduleUsed);
+            modulesUsed.emplace(mod->name()->str(), moduleUsed->getLogicObject().as<LuaModule>());
         }
 
         std::string source = (featureLevel == EFeatureLevel_01 ? module.source()->str() : "");
diff --git a/lib/impl/LuaScriptImpl.cpp b/lib/impl/LuaScriptImpl.cpp
@@ -197,15 +197,14 @@ namespace rlogic::internal
                 errorReporting.add(fmt::format("Fatal error during loading of LuaScript '{}' module data: missing name!", name), nullptr, EErrorType::BinaryVersionMismatch);
                 return nullptr;
             }
-            const LuaModule* moduleUsed = deserializationMap.resolveLuaModule(module->moduleId());
-
+            const auto* moduleUsed = deserializationMap.resolveLogicObject<LuaModuleImpl>(module->moduleId());
             if (!moduleUsed)
             {
                 errorReporting.add(fmt::format("Fatal error during loading of LuaScript '{}' module data: could not resolve dependent module with id={}!", name, module->moduleId()), nullptr, EErrorType::BinaryVersionMismatch);
                 return nullptr;
             }
 
-            userModules.emplace(module->name()->str(), moduleUsed);
+            userModules.emplace(module->name()->str(), moduleUsed->getLogicObject().as<LuaModule>());
         }
 
         if (!luaScript.standardModules())
diff --git a/lib/internals/ApiObjects.cpp b/lib/internals/ApiObjects.cpp
@@ -1136,7 +1136,7 @@ namespace rlogic::internal
             LuaModule*                 luaModule = up.get();
             deserialized->m_luaModules.push_back(luaModule);
             deserialized->registerLogicObject(std::move(up));
-            deserializationMap.storeLuaModule(luaModule->getId(), *deserialized->m_luaModules.back());
+            deserializationMap.storeLogicObject(luaModule->getId(), deserialized->m_luaModules.back()->m_impl);
         }
 
         const auto& luascripts = *apiObjects.luaScripts();
@@ -1208,7 +1208,7 @@ namespace rlogic::internal
                 RamsesNodeBinding* nodeBinding = up.get();
                 deserialized->m_ramsesNodeBindings.push_back(nodeBinding);
                 deserialized->registerLogicObject(std::move(up));
-                deserializationMap.storeNodeBinding(nodeBinding->getId(), nodeBinding->m_nodeBinding);
+                deserializationMap.storeLogicObject(nodeBinding->getId(), nodeBinding->m_nodeBinding);
             }
             else
             {
@@ -1251,7 +1251,7 @@ namespace rlogic::internal
                 RamsesCameraBinding*                 camBinding = up.get();
                 deserialized->m_ramsesCameraBindings.push_back(camBinding);
                 deserialized->registerLogicObject(std::move(up));
-                deserializationMap.storeCameraBinding(camBinding->getId(), camBinding->m_cameraBinding);
+                deserializationMap.storeLogicObject(camBinding->getId(), camBinding->m_cameraBinding);
             }
             else
             {
diff --git a/lib/internals/DeserializationMap.h b/lib/internals/DeserializationMap.h
@@ -19,14 +19,12 @@ namespace rlogic_serialization
 namespace rlogic
 {
     class DataArray;
-    class LuaModule;
 }
 
 namespace rlogic::internal
 {
     class PropertyImpl;
-    class RamsesNodeBindingImpl;
-    class RamsesCameraBindingImpl;
+    class LogicObjectImpl;
 
     // Remembers flatbuffers pointers to deserialized objects temporarily during deserialization
     class DeserializationMap
@@ -52,34 +50,21 @@ namespace rlogic::internal
             return *Get(&flatbufferObject, m_dataArrays);
         }
 
-        void storeLuaModule(uint64_t luaModuleId, const LuaModule& luaModule)
+        void storeLogicObject(uint64_t id, LogicObjectImpl& obj)
         {
-            Store(luaModuleId, &luaModule, m_luaModules);
+            Store(id, &obj, m_logicObjects);
         }
 
-        const LuaModule* resolveLuaModule(uint64_t luaModuleId) const
+        template <typename ImplT>
+        ImplT* resolveLogicObject(uint64_t id) const
         {
-            return Get(luaModuleId, m_luaModules);
-        }
-
-        void storeNodeBinding(uint64_t id, RamsesNodeBindingImpl& nodeBinding)
-        {
-            Store(id, &nodeBinding, m_nodeBindings);
-        }
+            // fail queries using IDs gracefully if given ID not found
+            // file can be OK on flatbuffer schema level but might still contain corrupted ID value
+            const auto it = m_logicObjects.find(id);
+            if (it != m_logicObjects.cend())
+                return dynamic_cast<ImplT*>(it->second);
 
-        RamsesNodeBindingImpl* resolveNodeBinding(uint64_t id) const
-        {
-            return Get(id, m_nodeBindings);
-        }
-
-        void storeCameraBinding(uint64_t id, RamsesCameraBindingImpl& cameraBinding)
-        {
-            Store(id, &cameraBinding, m_cameraBindings);
-        }
-
-        RamsesCameraBindingImpl* resolveCameraBinding(uint64_t id) const
-        {
-            return Get(id, m_cameraBindings);
+            return nullptr;
         }
 
     private:
@@ -99,20 +84,9 @@ namespace rlogic::internal
             return it->second;
         }
 
-        // fail queries using IDs gracefully if given ID not found
-        // file can be OK on flatbuffer schema level but might still contain corrupted value
-        template <typename Value>
-        [[nodiscard]] static Value Get(uint64_t key, const std::unordered_map<uint64_t, Value>& container)
-        {
-            const auto it = container.find(key);
-            return (it == container.cend()) ? nullptr : it->second;
-        }
-
         std::unordered_map<const rlogic_serialization::Property*, PropertyImpl*> m_properties;
         std::unordered_map<const rlogic_serialization::DataArray*, const DataArray*> m_dataArrays;
-        std::unordered_map<uint64_t, const LuaModule*> m_luaModules;
-        std::unordered_map<uint64_t, RamsesNodeBindingImpl*> m_nodeBindings;
-        std::unordered_map<uint64_t, RamsesCameraBindingImpl*> m_cameraBindings;
+        std::unordered_map<uint64_t, LogicObjectImpl*> m_logicObjects;
     };
 
 }
diff --git a/unittests/api/AnchorPointTest.cpp b/unittests/api/AnchorPointTest.cpp
@@ -15,6 +15,8 @@
 #include "impl/LogicEngineImpl.h"
 #include "impl/AnchorPointImpl.h"
 #include "impl/PropertyImpl.h"
+#include "impl/RamsesNodeBindingImpl.h"
+#include "impl/RamsesCameraBindingImpl.h"
 #include "generated/AnchorPointGen.h"
 
 #include "ramses-logic/AnchorPoint.h"
@@ -119,9 +121,9 @@ namespace rlogic::internal
             }
 
             if (issue != ESerializationIssue::CannotResolveNodeBinding)
-                m_deserializationMap.storeNodeBinding(m_nodeBinding.getId(), m_nodeBinding.m_nodeBinding);
+                m_deserializationMap.storeLogicObject(m_nodeBinding.getId(), m_nodeBinding.m_nodeBinding);
             if (issue != ESerializationIssue::CannotResolveCameraBinding)
-                m_deserializationMap.storeCameraBinding(m_cameraBinding.getId(), m_cameraBinding.m_cameraBinding);
+                m_deserializationMap.storeLogicObject(m_cameraBinding.getId(), m_cameraBinding.m_cameraBinding);
 
             const auto& serialized = *flatbuffers::GetRoot<rlogic_serialization::AnchorPoint>(m_flatBufferBuilder.GetBufferPointer());
             return AnchorPointImpl::Deserialize(serialized, m_errorReporting, m_deserializationMap);
@@ -142,8 +144,8 @@ namespace rlogic::internal
         }
         const auto& serialized = *flatbuffers::GetRoot<rlogic_serialization::AnchorPoint>(m_flatBufferBuilder.GetBufferPointer());
 
-        m_deserializationMap.storeNodeBinding(m_nodeBinding.getId(), m_nodeBinding.m_nodeBinding);
-        m_deserializationMap.storeCameraBinding(m_cameraBinding.getId(), m_cameraBinding.m_cameraBinding);
+        m_deserializationMap.storeLogicObject(m_nodeBinding.getId(), m_nodeBinding.m_nodeBinding);
+        m_deserializationMap.storeLogicObject(m_cameraBinding.getId(), m_cameraBinding.m_cameraBinding);
 
         std::unique_ptr<AnchorPointImpl> deserialized = AnchorPointImpl::Deserialize(serialized, m_errorReporting, m_deserializationMap);
         ASSERT_TRUE(deserialized);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Race in swrast_dri lib`
	`2`	`+race:ramses_internal::Context_EGL::~Context_EGL`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,8 @@ namespace rlogic::internal`
`101`	`101`	`return nullptr;`
`102`	`102`	`}`
`103`	`103`
`104`		`- RamsesNodeBindingImpl* nodeBinding = deserializationMap.resolveNodeBinding(anchorPoint.nodeBindingId());`
`105`		`- RamsesCameraBindingImpl* cameraBinding = deserializationMap.resolveCameraBinding(anchorPoint.cameraBindingId());`
	`104`	`+ auto* nodeBinding = deserializationMap.resolveLogicObject<RamsesNodeBindingImpl>(anchorPoint.nodeBindingId());`
	`105`	`+ auto* cameraBinding = deserializationMap.resolveLogicObject<RamsesCameraBindingImpl>(anchorPoint.cameraBindingId());`
`106`	`106`	`if (!nodeBinding \|\| !cameraBinding)`
`107`	`107`	`{`
`108`	`108`	`errorReporting.add("Fatal error during loading of AnchorPoint: could not resolve NodeBinding and/or CameraBinding!", nullptr, EErrorType::BinaryVersionMismatch);`
Original file line number	Diff line number	Diff line change
`@@ -150,15 +150,14 @@ namespace rlogic::internal`
`150`	`150`	`errorReporting.add(fmt::format("Fatal error during loading of LuaModule '{}' module data: missing name!", name), nullptr, EErrorType::BinaryVersionMismatch);`
`151`	`151`	`return nullptr;`
`152`	`152`	`}`
`153`		`- const LuaModule* moduleUsed = deserializationMap.resolveLuaModule(mod->moduleId());`
`154`		`-`
	`153`	`+ const auto* moduleUsed = deserializationMap.resolveLogicObject<LuaModuleImpl>(mod->moduleId());`
`155`	`154`	`if (!moduleUsed)`
`156`	`155`	`{`
`157`	`156`	`errorReporting.add(fmt::format("Fatal error during loading of LuaModule '{}' module data: could not resolve dependent module with id={}!", name, mod->moduleId()), nullptr, EErrorType::BinaryVersionMismatch);`
`158`	`157`	`return nullptr;`
`159`	`158`	`}`
`160`	`159`
`161`		`- modulesUsed.emplace(mod->name()->str(), moduleUsed);`
	`160`	`+ modulesUsed.emplace(mod->name()->str(), moduleUsed->getLogicObject().as<LuaModule>());`
`162`	`161`	`}`
`163`	`162`
`164`	`163`	`std::string source = (featureLevel == EFeatureLevel_01 ? module.source()->str() : "");`
Original file line number	Diff line number	Diff line change
`@@ -197,15 +197,14 @@ namespace rlogic::internal`
`197`	`197`	`errorReporting.add(fmt::format("Fatal error during loading of LuaScript '{}' module data: missing name!", name), nullptr, EErrorType::BinaryVersionMismatch);`
`198`	`198`	`return nullptr;`
`199`	`199`	`}`
`200`		`- const LuaModule* moduleUsed = deserializationMap.resolveLuaModule(module->moduleId());`
`201`		`-`
	`200`	`+ const auto* moduleUsed = deserializationMap.resolveLogicObject<LuaModuleImpl>(module->moduleId());`
`202`	`201`	`if (!moduleUsed)`
`203`	`202`	`{`
`204`	`203`	`errorReporting.add(fmt::format("Fatal error during loading of LuaScript '{}' module data: could not resolve dependent module with id={}!", name, module->moduleId()), nullptr, EErrorType::BinaryVersionMismatch);`
`205`	`204`	`return nullptr;`
`206`	`205`	`}`
`207`	`206`
`208`		`- userModules.emplace(module->name()->str(), moduleUsed);`
	`207`	`+ userModules.emplace(module->name()->str(), moduleUsed->getLogicObject().as<LuaModule>());`
`209`	`208`	`}`
`210`	`209`
`211`	`210`	`if (!luaScript.standardModules())`
Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,7 @@ namespace rlogic::internal`
`1136`	`1136`	`LuaModule* luaModule = up.get();`
`1137`	`1137`	`deserialized->m_luaModules.push_back(luaModule);`
`1138`	`1138`	`deserialized->registerLogicObject(std::move(up));`
`1139`		`- deserializationMap.storeLuaModule(luaModule->getId(), *deserialized->m_luaModules.back());`
	`1139`	`+ deserializationMap.storeLogicObject(luaModule->getId(), deserialized->m_luaModules.back()->m_impl);`
`1140`	`1140`	`}`
`1141`	`1141`
`1142`	`1142`	`const auto& luascripts = *apiObjects.luaScripts();`
`@@ -1208,7 +1208,7 @@ namespace rlogic::internal`
`1208`	`1208`	`RamsesNodeBinding* nodeBinding = up.get();`
`1209`	`1209`	`deserialized->m_ramsesNodeBindings.push_back(nodeBinding);`
`1210`	`1210`	`deserialized->registerLogicObject(std::move(up));`
`1211`		`- deserializationMap.storeNodeBinding(nodeBinding->getId(), nodeBinding->m_nodeBinding);`
	`1211`	`+ deserializationMap.storeLogicObject(nodeBinding->getId(), nodeBinding->m_nodeBinding);`
`1212`	`1212`	`}`
`1213`	`1213`	`else`
`1214`	`1214`	`{`
`@@ -1251,7 +1251,7 @@ namespace rlogic::internal`
`1251`	`1251`	`RamsesCameraBinding* camBinding = up.get();`
`1252`	`1252`	`deserialized->m_ramsesCameraBindings.push_back(camBinding);`
`1253`	`1253`	`deserialized->registerLogicObject(std::move(up));`
`1254`		`- deserializationMap.storeCameraBinding(camBinding->getId(), camBinding->m_cameraBinding);`
	`1254`	`+ deserializationMap.storeLogicObject(camBinding->getId(), camBinding->m_cameraBinding);`
`1255`	`1255`	`}`
`1256`	`1256`	`else`
`1257`	`1257`	`{`