Merge pull request #58 from bmwcarit/v1.4.2-0481019d

Oss release v1.4.2 created 2023-01-26-18-00

Author: violinyanev

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 # Unreleased
 
+# v1.4.2
+
+**CHANGED**
+
+* Upgrade ramses from 27.0.128 to 27.0.130 (patchfix)
+
+**FIXED**
+
+* Compiles on GCC9 (Ubuntu 22.04 standard compiler)
+
 # v1.4.1
 
 **CHANGED**

CMakeLists.txt

@@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(RLOGIC_VERSION_MAJOR 1)
 set(RLOGIC_VERSION_MINOR 4)
-set(RLOGIC_VERSION_PATCH 1)
+set(RLOGIC_VERSION_PATCH 2)
 
 set(RLOGIC_VERSION ${RLOGIC_VERSION_MAJOR}.${RLOGIC_VERSION_MINOR}.${RLOGIC_VERSION_PATCH})
 set(ramses-logic_VERSION "${RLOGIC_VERSION}" CACHE STRING "Ramses Logic version" FORCE)

README.md

@@ -40,6 +40,7 @@ existing files exported with Logic Engine version **W** or newer (Binary file co
 
 |Logic     | Included Ramses version       | Minimum required Ramses version    | Binary file compatibility    |
 |----------|-------------------------------|------------------------------------|------------------------------|
+|v1.4.2    | 27.0.130                      | 27.0.102                           | >= 1.0.0, F-Levels 01 - 05   |
 |v1.4.1    | 27.0.128                      | 27.0.102                           | >= 1.0.0, F-Levels 01 - 05   |
 |v1.4.0    | 27.0.126                      | 27.0.102                           | >= 1.0.0, F-Levels 01 - 05   |
 |v1.3.0    | 27.0.126                      | 27.0.102                           | >= 1.0.0, F-Levels 01 - 04   |

doc/sphinx/api.rst

@@ -699,7 +699,7 @@ It's possible to reduce the file size of the exported LogicEngine data by storin
 Lua scripts and modules, instead of the source code. This might sound very attractive, but it has two
 major caveats:
 
-* Lua bytecode is notnriously vulnerable to malicious attacks
+* Lua bytecode is notoriously vulnerable to malicious attacks
 * Bytecode is architecture-specific, i.e. you can't run ARM bytecode on a x86 processor
 
 In order to provide a good mix between flexibility and performance, the LogicEngine allows choosing what

doc/sphinx/requirements.txt

@@ -10,7 +10,7 @@ alabaster==0.7.12
 attrs==21.2.0
 Babel==2.9.1
 breathe==4.18.1
-certifi==2022.12.7
+certifi==2020.12.5
 chardet==4.0.0
 docutils==0.16
 idna==2.10

external/ramses

@@ -25,16 +25,16 @@ namespace rlogic
      *    2. One or more new features are requested and implemented. If the features only add new API and additional
      *       data to be serialized, these are candidates for a new feature level - a collection of new features
      *       not accessible in the base 01 level.
-     *       - Note that breaking API or file format will always require a new major release,
-     *         but in this case these features can be released under a new feature level (e.g. EFeatureLevel_1).
+     *       - Note that breaking API (and in some cases file format) will always require a new major release,
+     *         but in this example these features can be released under a new feature level (e.g. EFeatureLevel_02).
      *       - Even though in the context of RamsesLogic the new features are fully backward compatible,
      *         they can quickly break assets compatibility when exported in case some of the editors/tools/applications
      *         use RamsesLogic with and some without the new features. Normally this would have to be solved
      *         by waiting for the next major RamsesLogic release to be fully integrated into the whole pipeline.
      *    3. Now new RamsesLogic can be deployed to any part of the asset pipeline without any risk of breaking asset
      *       compatibility because the new features will not be activated. The new features can be tested
      *       and even assets using them exported (e.g. to prototype new use cases) by activating them, while being able
-     *       to switch back to the earlier feature level at any time using this constructor, all that using same RamsesLogic library.
+     *       to switch back to the earlier feature level at any time, all that using same RamsesLogic library.
      *
      * A feature level always includes previous feature level(s) if any, e.g. a feature level released after base level will contain
      * all features from base 01 level, however base 01 level will include only base 01 level features and none from a newer feature level
@@ -68,6 +68,7 @@ namespace rlogic
         /// Released with version 1.4.0
         /// Added features:
         /// - RamsesMeshNodeBinding
+        /// - AnimationNode can animate DataArray containing arrays of floats as elements
         EFeatureLevel_05 = 5,
 
         /// Equals to the latest feature level

include/ramses-logic/EFeatureLevel.h

@@ -48,6 +48,7 @@ namespace rlogic::internal
         case ramses::EEffectInputDataType::EEffectInputDataType_TextureSampler3D:
         case ramses::EEffectInputDataType::EEffectInputDataType_TextureSamplerCube:
         case ramses::EEffectInputDataType::EEffectInputDataType_TextureSampler2DMS:
+        case ramses::EEffectInputDataType::EEffectInputDataType_TextureSamplerExternal:
             return std::nullopt;
         }
         return std::nullopt;

lib/internals/RamsesHelper.h

@@ -26,6 +26,8 @@ __pragma(warning(push))
 __pragma(warning(disable: 4100))
 #endif
 
+// TODO (Violin) Workaround for a compiler issue fixed in newer sol. Remove once upgraded
+#include <limits>
 #include "sol/sol.hpp"
 
 #ifndef _MSC_VER

lib/internals/SolWrapper.h

@@ -31,5 +31,6 @@ namespace rlogic::internal
         EXPECT_EQ(std::nullopt, ConvertRamsesUniformTypeToPropertyType(ramses::EEffectInputDataType_TextureSampler2D));
         EXPECT_EQ(std::nullopt, ConvertRamsesUniformTypeToPropertyType(ramses::EEffectInputDataType_TextureSampler3D));
         EXPECT_EQ(std::nullopt, ConvertRamsesUniformTypeToPropertyType(ramses::EEffectInputDataType_TextureSamplerCube));
+        EXPECT_EQ(std::nullopt, ConvertRamsesUniformTypeToPropertyType(ramses::EEffectInputDataType_TextureSamplerExternal));
     }
 }