mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenSpace/OpenSpace

Browse Source
This commit is contained in:
Emil Axelsson
2018-11-06 14:58:50 -05:00
parent c58ae52735 7a3a8a5cf6
commit e206099c4f
34 changed files with 400 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/server/src/topics/setpropertytopic.cpp
View File

@@ -30,6 +30,7 @@
#include <openspace/query/query.h>
#include <openspace/util/timemanager.h>
#include <openspace/util/time.h>
#include <ghoul/fmt.h>
#include <ghoul/logging/logmanager.h>
namespace {
@@ -97,7 +98,9 @@ void SetPropertyTopic::handleJson(const nlohmann::json& json) {
std::string literal = luaLiteralFromJson(value);
global::scriptEngine.queueScript(
"openspace.setPropertyValueSingle(\"" + propertyKey + "\", " + literal + ")",
fmt::format(
"openspace.setPropertyValueSingle(\"{}\", {})", propertyKey, literal
),
scripting::ScriptEngine::RemoteScripting::Yes
);
}