Skip to content

Commit

Permalink
Release v1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
AchimStremplat committed Jun 17, 2022
1 parent 86acb79 commit a6af107
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ If a copy of the MPL was not distributed with this file, You can obtain one at h
-->

## [1.0.1] Fix export differences between RaCoHeadless and Ramses Composer GUI

### Fixes
* Ensure correct export in RaCoHeadless application by flushing the ramses scene before export.
* Remove warning for "time_ms" Lua input parameter.

## [1.0.0] ramses-logic 1.x, Python API, timer, new animations
* **File version number has changed. Files saved with RaCo 1.0.0 cannot be opened by previous versions.**
* rca files saved with this version will be much smaller than files saved with previous versions.
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.0.0)
project(RaCoOS VERSION 1.0.1)

SET(RACO_RELEASE_DIRECTORY ${CMAKE_BINARY_DIR}/release)

Expand Down
3 changes: 3 additions & 0 deletions components/libApplication/src/RaCoApplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ void RaCoApplication::switchActiveRaCoProject(const QString& file, bool createDe
}

bool RaCoApplication::exportProject(const std::string& ramsesExport, const std::string& logicExport, bool compress, std::string& outError, bool forceExportWithErrors) const {
// Flushing the scene prevents inconsistent states being saved which could lead to unexpected bevahiour after loading the scene:
scenesBackend_->flush();

// we currently only support export of active project currently
if (activeRaCoProject().errors()->hasError(raco::core::ErrorLevel::ERROR)) {
outError = "Export failed: scene contains Composer errors";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
"racoVersion": [
1,
0,
0
1
],
"rootObjectIDs": [
"lua_script_id",
Expand Down
14 changes: 2 additions & 12 deletions datamodel/libUserTypes/src/LuaScript.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,8 @@ void LuaScript::syncLuaScript(BaseContext& context, bool syncModules) {
success = context.engineInterface().parseLuaScript(luaScript, objectName(), *luaModules_, inputs, outputs, error);
}

if (success) {
if (std::find_if(inputs.begin(), inputs.end(), [](const PropertyInterface& intf) { return intf.type == EnginePrimitive::Int32 && intf.name == "time_ms"; }) != inputs.end()) {
auto infoText =
"Dear Animator,\n\n"
"this LuaScript uses the 'time_ms'-based runtime hack which will be deprecated in a future version of Ramses Composer.\n"
"Please prepare to transfer your timer-based animations to our new user types Animation and AnimationChannel.";
context.errors().addError(raco::core::ErrorCategory::GENERAL, raco::core::ErrorLevel::WARNING, shared_from_this(), infoText);
}
} else {
if (!error.empty()) {
context.errors().addError(ErrorCategory::PARSE_ERROR, ErrorLevel::ERROR, shared_from_this(), error);
}
if (!success && !error.empty()) {
context.errors().addError(ErrorCategory::PARSE_ERROR, ErrorLevel::ERROR, shared_from_this(), error);
}
}

Expand Down

0 comments on commit a6af107

Please sign in to comment.