mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 21:09:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts with master

Browse Source
This commit is contained in:
GPayne
2021-05-20 19:55:49 -06:00
parent 3f9ae245c7 b9a8ec93de
commit e374eef72d
928 changed files with 31104 additions and 35653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/server/include/serverinterface.h
View File

@@ -27,8 +27,8 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/stringlistproperty.h>
#include <openspace/properties/optionproperty.h>
#include <openspace/properties/list/stringlistproperty.h>
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/intproperty.h>

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

@@ -78,6 +78,10 @@ namespace {
return std::to_string(value.get<double>());
}
else if (value.is_array()) {
if (value.empty()) {
return "{}";
}
std::string literal = "{";
for (nlohmann::json::iterator it = value.begin(); it != value.end(); ++it) {
literal += luaLiteralFromJson(it.value()) += ",";
@@ -87,6 +91,10 @@ namespace {
return literal;
}
else if (value.is_object()) {
if (value.empty()) {
return "{}";
}
std::string literal = "{";
for (nlohmann::json::iterator it = value.begin(); it != value.end(); ++it) {
literal += it.key() + "=" + luaLiteralFromJson(it.value()) += ",";