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

Moved string bracket trim function to ghoul library

Browse Source
This commit is contained in:
GPayne
2021-10-07 16:10:00 -06:00
parent c36ea36a43
commit a2a8f93ba5
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: 4b64684acd...4a17b2a165

2
include/openspace/scene/scene.h
View File

@@ -343,8 +343,6 @@ private:
ghoul::MemoryPool<4096> _memoryPool;
};
void trimSurroundingCharacters(std::string& valueString, const char c);
} // namespace openspace
#endif // __OPENSPACE_CORE___SCENE___H__

24
src/scene/scene.cpp
View File

@@ -39,6 +39,7 @@
#include <openspace/util/updatestructures.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/misc/misc.h>
#include <ghoul/misc/profiling.h>
#include <string>
#include <stack>
@@ -621,7 +622,7 @@ void Scene::setPropertiesFromProfile(const Profile& p) {
ghoul::lua::push(L, 0.0);
std::string workingValue = prop.value;
trimSurroundingCharacters(workingValue, ' ');
ghoul::trimSurroundingCharacters(workingValue, ' ');
// Later functions expect the value to be at the last position on the stack
propertyPushProfileValueToLua(L, workingValue);
@@ -678,16 +679,16 @@ ProfilePropertyLua Scene::propertyProcessValue(ghoul::lua::LuaState& L,
result = ghoul::lua::nil_t();
break;
case PropertyValueType::Table:
trimSurroundingCharacters(const_cast<std::string&>(value), '{');
trimSurroundingCharacters(const_cast<std::string&>(value), '}');
ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), '{');
ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), '}');
handlePropertyLuaTableEntry(L, value);
_valueIsTable = true;
break;
case PropertyValueType::String:
default:
trimSurroundingCharacters(const_cast<std::string&>(value), '\"');
trimSurroundingCharacters(const_cast<std::string&>(value), '[');
trimSurroundingCharacters(const_cast<std::string&>(value), ']');
ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), '\"');
ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), '[');
ghoul::trimSurroundingCharacters(const_cast<std::string&>(value), ']');
result = value;
break;
}
@@ -752,7 +753,7 @@ void Scene::processPropertyValueTableEntries(ghoul::lua::LuaState& L,
else {
nextValue = value.substr(prevPos);
}
trimSurroundingCharacters(nextValue, ' ');
ghoul::trimSurroundingCharacters(nextValue, ' ');
ProfilePropertyLua tableElement = propertyProcessValue(L, nextValue);
try {
table.push_back(std::get<T>(tableElement));
@@ -784,15 +785,6 @@ PropertyValueType Scene::propertyValueType(const std::string& value) {
}
}
void trimSurroundingCharacters(std::string& valueString, const char c) {
while (valueString.front() == c) {
valueString.erase(0, 1);
}
while (valueString.back() == c) {
valueString.pop_back();
}
}
scripting::LuaLibrary Scene::luaLibrary() {
return {
"",