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

Fix issue preventing from setting multiple vector properties through a lua script

Browse Source
This commit is contained in:
Alexander Bock
2019-01-08 13:57:09 +01:00
parent 0c6b5e95c6
commit ebf55f3029
16 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/openspace/properties/numericalproperty.inl
View File

@@ -308,8 +308,9 @@ bool NumericalProperty<T>::setLuaValue(lua_State* state) {
T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
state, success
);
if (success)
if (success) {
TemplateProperty<T>::setValue(std::move(value));
}
return success;
}
@@ -340,8 +341,9 @@ bool NumericalProperty<T>::setStringValue(std::string value) {
T thisValue = PropertyDelegate<NumericalProperty<T>>::template fromString<T>(
value, success
);
if (success)
if (success) {
TemplateProperty<T>::set(ghoul::any(std::move(thisValue)));
}
return success;
}
@@ -402,7 +404,7 @@ std::string NumericalProperty<T>::generateAdditionalJsonDescription() const {
template <typename T>
std::string NumericalProperty<T>::luaToJson(std::string luaValue) const {
if(luaValue[0] == '{') {
if (luaValue[0] == '{') {
luaValue.replace(0, 1, "[");
}
if (luaValue[luaValue.size() - 1] == '}') {