Update Ghoul repository

Adapt to changes in Ghoul
This commit is contained in:
Alexander Bock
2020-02-12 00:01:24 +01:00
parent fde307ead9
commit 81fda6c8db
16 changed files with 34 additions and 40 deletions
+3 -3
View File
@@ -411,7 +411,8 @@ void NavigationHandler::saveNavigationState(const std::string& filepath,
return;
}
state = navigationState(*referenceFrame).dictionary();
} else {
}
else {
state = navigationState().dictionary();
}
@@ -419,9 +420,8 @@ void NavigationHandler::saveNavigationState(const std::string& filepath,
std::string absolutePath = absPath(filepath);
LINFO(fmt::format("Saving camera position: {}", absolutePath));
ghoul::DictionaryLuaFormatter formatter;
std::ofstream ofs(absolutePath.c_str());
ofs << "return " << formatter.format(state.dictionary());
ofs << "return " << ghoul::formatLua(state.dictionary());
ofs.close();
}
}
+4 -4
View File
@@ -133,15 +133,15 @@ std::string Property::fullyQualifiedIdentifier() const {
return identifier;
}
ghoul::any Property::get() const {
return ghoul::any();
std::any Property::get() const {
return std::any();
}
bool Property::getLuaValue(lua_State*) const {
return false;
}
void Property::set(ghoul::any) {} // NOLINT
void Property::set(std::any) {} // NOLINT
bool Property::setLuaValue(lua_State*) {
return false;
@@ -365,7 +365,7 @@ std::string Property::generateAdditionalJsonDescription() const {
return "{}";
}
void Property::setInterpolationTarget(ghoul::any) {} // NOLINT
void Property::setInterpolationTarget(std::any) {} // NOLINT
void Property::setLuaInterpolationTarget(lua_State*) {}
void Property::setStringInterpolationTarget(std::string) {} // NOLINT
void Property::interpolateValue(float, ghoul::EasingFunc<float>) {}
+1 -1
View File
@@ -39,7 +39,7 @@ bool TriggerProperty::setLuaValue(lua_State*) {
return true;
}
void TriggerProperty::set(ghoul::any) {
void TriggerProperty::set(std::any) {
notifyChangeListeners();
}