Release v2.2.0

Author: webermm

CHANGELOG.md

@@ -24,6 +24,16 @@ If a copy of the MPL was not distributed with this file, You can obtain one at h
 
 -->
 
+## [2.2.0] Ramses 28.2 update
+* **File version number has changed. Files saved with RaCo 2.2.0 cannot be opened by previous versions.**
+* **Export now supports Ramses feature levels up to 2. Scenes exported with feature level 2 can't be opened with Ramses before v2.2.0.**
+
+### Changes
+* Updated Ramses from v28.0.0 to v28.2.0.
+* Scenes exported with feature level 2 can be merged in Ramses. The `ramses-viewer` is now able to load and merge several exported files.
+* Starting at feature level 2 uniform buffers objects with predefined semantics are supported as specified in the documentation.
+
+
 ## [2.1.0] Render View, Python Console, Performance Table, Misc Improvements and Bugfixes
 * **File version number has changed. Files saved with RaCo 2.1.0 cannot be opened by previous versions.**
 

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.19)
 
 SET(CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebInfo")
 
-project(RaCoOS VERSION 2.1.0)
+project(RaCoOS VERSION 2.2.0)
 
 SET(RACO_RELEASE_DIRECTORY ${CMAKE_BINARY_DIR}/release)
 

EditorApp/CMakeLists.txt

@@ -43,7 +43,6 @@ set_target_properties(RaCoEditor PROPERTIES OUTPUT_NAME "RamsesComposer" RUNTIME
 set(RACO_RELEASE_ROOT_FILES
 	${CMAKE_SOURCE_DIR}/README.md
 	${CMAKE_SOURCE_DIR}/CHANGELOG.md
-	${CMAKE_SOURCE_DIR}/third_party/ramses-logic/tools/migrate/migrate_to_v1_0.py
 )
 
 create_folder_structure("${RACO_RELEASE_ROOT_FILES}" ${RACO_RELEASE_DIRECTORY} RaCoPrepareReleaseFolder)

HeadlessApp/tests/CMakeLists.txt

@@ -22,6 +22,9 @@ set_tests_properties(RaCoHeadless_load_no_such_file PROPERTIES WILL_FAIL True)
 add_racocommand_test(RaCoHeadless_load_future_version "${CMAKE_CURRENT_BINARY_DIR}" "-p" "${CMAKE_SOURCE_DIR}/resources/future-version.rca")
 set_tests_properties(RaCoHeadless_load_future_version PROPERTIES WILL_FAIL True)
 
+add_racocommand_test(RaCoHeadless_load_future_feature_level "${CMAKE_CURRENT_BINARY_DIR}" "-p" "${CMAKE_SOURCE_DIR}/resources/future-feature-level.rca")
+set_tests_properties(RaCoHeadless_load_future_feature_level PROPERTIES WILL_FAIL True)
+
 add_racocommand_test(RaCoHeadless_load_no_json "${CMAKE_CURRENT_BINARY_DIR}" "-p" "${CMAKE_SOURCE_DIR}/resources/no-json.rca")
 set_tests_properties(RaCoHeadless_load_no_json PROPERTIES WILL_FAIL True)
 

PyAPITests/pyt_general.py

@@ -101,8 +101,15 @@ def test_load_raco_2x_feature_levels(self):
         raco.load(self.cwd() + "/../resources/empty-raco-2x-fl1.rca", raco.maxFeatureLevel())
         self.assertEqual(raco.projectFeatureLevel(), raco.maxFeatureLevel())
 
-        # TODO check that feature level downgrade is not possible:
-        # currently can't be tested since max feature level is 1
+        raco.load(self.cwd() + "/../resources/empty-raco-2x-fl2.rca")
+        self.assertEqual(raco.projectFeatureLevel(), 2)
+
+        # Feature level downgrade fails:
+        with self.assertRaises(RuntimeError):
+            raco.load(self.cwd() + "/../resources/empty-raco-2x-fl2.rca", 1)
+        
+        raco.load(self.cwd() + "/../resources/empty-raco-2x-fl2.rca", raco.maxFeatureLevel())
+        self.assertEqual(raco.projectFeatureLevel(), raco.maxFeatureLevel())
 
     def test_save_check_object_id(self):
         objectInitID = self.findObjectByType("ProjectSettings").objectID()

components/libApplication/src/RaCoApplication.cpp

@@ -156,6 +156,12 @@ void RaCoApplication::switchActiveRaCoProject(const QString& file, std::function
 		activeProject_ = RaCoProject::createNew(this, createDefaultScene, newFeatureLevel);
 	} else {
 		auto fileFeatureLevel = RaCoProject::preloadFeatureLevel(file, featureLevel);
+
+		// We run into this case when there is a feature level upgrade without a file version upgrade:
+		if (fileFeatureLevel < ramses_base::BaseEngineBackend::minFeatureLevel || fileFeatureLevel > ramses_base::BaseEngineBackend::maxFeatureLevel) {
+			throw std::runtime_error(fmt::format("Project feature level {} outside valid range ({} ... {})", fileFeatureLevel, static_cast<int>(ramses_base::BaseEngineBackend::minFeatureLevel), static_cast<int>(ramses_base::BaseEngineBackend::maxFeatureLevel)));
+		}
+
 		engine_->setFeatureLevel(static_cast<ramses::EFeatureLevel>(fileFeatureLevel));
 		activeProject_ = RaCoProject::loadFromFile(file, this, loadContext, false, featureLevel, generateNewObjectIDs);
 	}

components/libApplication/src/RaCoProject.cpp

@@ -413,6 +413,12 @@ std::unique_ptr<RaCoProject> RaCoProject::loadFromFile(const QString& filename,
 		auto absPath = utils::u8path(info.path).normalizedAbsolutePath(p.currentFolder());
 		p.addExternalProjectMapping(id, absPath.string(), info.name);
 	}
+
+	// We run into this case when there is a feature level upgrade without a file version upgrade:
+	if (p.featureLevel() < ramses_base::BaseEngineBackend::minFeatureLevel || p.featureLevel() > ramses_base::BaseEngineBackend::maxFeatureLevel) {
+		throw std::runtime_error(fmt::format("Project feature level {} outside valid range ({} ... {})", p.featureLevel(), static_cast<int>(ramses_base::BaseEngineBackend::minFeatureLevel), static_cast<int>(ramses_base::BaseEngineBackend::maxFeatureLevel)));
+	}
+
 	if (featureLevel != -1) {
 		if (featureLevel >= p.featureLevel() && featureLevel <= static_cast<int>(ramses_base::BaseEngineBackend::maxFeatureLevel)) {
 			p.setFeatureLevel(featureLevel);

components/libRamsesBase/src/ramses_adaptor/SceneAdaptor.cpp

@@ -47,7 +47,7 @@ SceneAdaptor::SceneAdaptor(ramses::RamsesClient* client, ramses::sceneId_t id, P
 	: client_{client},
 	  project_(project),
 	  scene_{ramsesScene(id, client_)},
-	  logicEngine_{ramses_base::BaseEngineBackend::UniqueLogicEngine(scene_->createLogicEngine(), [this](ramses::LogicEngine* logicEngine) { scene_->destroy(*logicEngine); })},
+	  logicEngine_{ramses_base::BaseEngineBackend::UniqueLogicEngine(scene_->createLogicEngine("LogicEngine_" + project->projectName()), [this](ramses::LogicEngine* logicEngine) { scene_->destroy(*logicEngine); })},
 	  subscription_{dispatcher->registerOnObjectsLifeCycle([this](SEditorObject obj) { createAdaptor(obj); }, [this](SEditorObject obj) { removeAdaptor(obj); })},
 	  childrenSubscription_(dispatcher->registerOnPropertyChange("children", [this](core::ValueHandle handle) {
 		  adaptorStatusDirty_ = true;

components/libRamsesBase/src/ramses_adaptor/SceneBackend.cpp

@@ -103,9 +103,6 @@ bool SceneBackend::discardRamsesMessage(std::string_view message) {
 	if (message.find("has no outgoing links! Node should be deleted or properly linked!") != std::string::npos) {
 		return true;
 	}
-	if (message.find("rendergroup does not contain any meshes") != std::string::npos) {
-		return true;
-	}
 	if (message.find("Unused [uniform]") != std::string::npos ||
 		message.find("Unused [in]") != std::string::npos ||
 		message.find("Unused [out]") != std::string::npos) {

components/libRamsesBase/src/ramses_base/BaseEngineBackend.cpp

@@ -20,10 +20,12 @@ const ramses::EFeatureLevel BaseEngineBackend::minFeatureLevel = ramses::EFeatur
 // - feature level downgrade tests
 //   - python api: in pyt_general.py -> test_load_raco_2x_feature_levels
 
-const ramses::EFeatureLevel BaseEngineBackend::maxFeatureLevel = ramses::EFeatureLevel::EFeatureLevel_01;
+const ramses::EFeatureLevel BaseEngineBackend::maxFeatureLevel = ramses::EFeatureLevel::EFeatureLevel_02;
 
 const std::string BaseEngineBackend::featureLevelDescriptions =
 R"(1 - Ramses v28.0.0
+2 - Ramses v28.2.0
+    - scene merging
 )";