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

Code review changes

Browse Source
This commit is contained in:
GPayne
2021-10-07 00:26:29 -06:00
parent 990835d7cd
commit c36ea36a43
3 changed files with 81 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ enum class PropertyValueType {
Table,
Nil
};
typedef std::variant<bool, float, std::string, ghoul::lua::nil_t> ProfilePropertyLua;
using ProfilePropertyLua = std::variant<bool, float, std::string, ghoul::lua::nil_t>;
class SceneInitializer;
@@ -263,7 +263,7 @@ private:
* \param L the lua state to push value to
* \param value string representation of the value with which to set property
*/
void propertyPushProfileValueToLua(ghoul::lua::LuaState& L, std::string& value);
void propertyPushProfileValueToLua(ghoul::lua::LuaState& L, const std::string& value);
/**
* Accepts string version of a property value from a profile, and processes it
@@ -276,7 +276,8 @@ private:
* has already been pushed to the lua stack
* \return The ProfilePropertyLua variant type translated from string representation
*/
ProfilePropertyLua propertyProcessValue(ghoul::lua::LuaState& L, std::string& value);
ProfilePropertyLua propertyProcessValue(ghoul::lua::LuaState& L,
const std::string& value);
/**
* Accepts string version of a property value from a profile, and returns the
@@ -285,7 +286,7 @@ private:
*
* \param value string representation of the value with which to set property
*/
PropertyValueType getPropertyValueType(std::string& value);
PropertyValueType propertyValueType(const std::string& value);
/**
* Accepts string version of a property value from a profile, and adds it to a vector
@@ -296,8 +297,8 @@ private:
* \param table the std::vector container which has elements of type T for a lua table
*/
template <typename T>
void processPropertyValueTableEntries(ghoul::lua::LuaState& L, std::string& value,
std::vector<T>& table);
void processPropertyValueTableEntries(ghoul::lua::LuaState& L,
const std::string& value, std::vector<T>& table);
/**
* Handles a lua table entry, creating a vector of the correct variable type based
@@ -306,7 +307,7 @@ private:
* \param L the lua state to (eventually) push to
* \param value string representation of the value with which to set property
*/
void handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, std::string& value);
void handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::string& value);
/**
* Update dependencies.

145
src/scene/scene.cpp
View File

@@ -638,114 +638,107 @@ void Scene::setPropertiesFromProfile(const Profile& p) {
}
}
void Scene::propertyPushProfileValueToLua(ghoul::lua::LuaState& L, std::string& value)
void Scene::propertyPushProfileValueToLua(ghoul::lua::LuaState& L,
const std::string& value)
{
_valueIsTable = false;
ProfilePropertyLua elem = propertyProcessValue(L, value);
if (!_valueIsTable) {
std::visit(overloaded{
[&L](const bool& value) {
[&L](const bool value) {
ghoul::lua::push(L, value);
},
[&L](const float& value) {
[&L](const float value) {
ghoul::lua::push(L, value);
},
[&L](const std::string& value) {
[&L](const std::string value) {
ghoul::lua::push(L, value);
},
[&L](const ghoul::lua::nil_t& nilValue) {
[&L](const ghoul::lua::nil_t nilValue) {
ghoul::lua::push(L, nilValue);
}
}, elem);
}
}
ProfilePropertyLua Scene::propertyProcessValue(ghoul::lua::LuaState& L,std::string& value)
ProfilePropertyLua Scene::propertyProcessValue(ghoul::lua::LuaState& L,
const std::string& value)
{
ProfilePropertyLua result;
PropertyValueType pType = getPropertyValueType(value);
PropertyValueType pType = propertyValueType(value);
switch (pType) {
case PropertyValueType::Boolean:
result = (value == "true") ? true : false;
break;
case PropertyValueType::Float:
result = std::stof(value);
break;
case PropertyValueType::Nil:
ghoul::lua::nil_t n;
result = n;
break;
case PropertyValueType::Table:
trimSurroundingCharacters(value, '{');
trimSurroundingCharacters(value, '}');
handlePropertyLuaTableEntry(L, value);
_valueIsTable = true;
break;
case PropertyValueType::String:
default:
trimSurroundingCharacters(value, '\"');
trimSurroundingCharacters(value, '[');
trimSurroundingCharacters(value, ']');
result = value;
break;
case PropertyValueType::Boolean:
result = (value == "true") ? true : false;
break;
case PropertyValueType::Float:
result = std::stof(value);
break;
case PropertyValueType::Nil:
result = ghoul::lua::nil_t();
break;
case PropertyValueType::Table:
trimSurroundingCharacters(const_cast<std::string&>(value), '{');
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), ']');
result = value;
break;
}
return result;
}
void Scene::handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, std::string& value) {
std::string firstValue;
size_t commaPos = 0;
commaPos = value.find(',', commaPos);
void Scene::handlePropertyLuaTableEntry(ghoul::lua::LuaState& L, const std::string& value)
{
PropertyValueType enclosedType;
size_t commaPos = value.find(',', 0);
if (commaPos != std::string::npos) {
firstValue = value.substr(0, commaPos);
enclosedType = propertyValueType(value.substr(0, commaPos));
}
else {
firstValue = value;
enclosedType = propertyValueType(value);
}
PropertyValueType enclosedType = getPropertyValueType(firstValue);
switch (enclosedType) {
case PropertyValueType::Boolean:
LERROR(fmt::format(
"A lua table of bool values is not supported. (processing property {})",
_profilePropertyName)
);
break;
case PropertyValueType::Float:
{
std::vector<float> valsF;
processPropertyValueTableEntries(L, value, valsF);
ghoul::lua::push(L, valsF);
}
break;
case PropertyValueType::String:
{
std::vector<std::string> valsS;
processPropertyValueTableEntries(L, value, valsS);
ghoul::lua::push(L, valsS);
}
break;
case PropertyValueType::Table:
default:
LERROR(fmt::format(
"Table-within-a-table values are not supported for profile a "
"property (processing property {})", _profilePropertyName)
);
break;
case PropertyValueType::Boolean:
LERROR(fmt::format(
"A lua table of bool values is not supported. (processing property {})",
_profilePropertyName)
);
break;
case PropertyValueType::Float:
{
std::vector<float> valsF;
processPropertyValueTableEntries(L, value, valsF);
ghoul::lua::push(L, valsF);
}
break;
case PropertyValueType::String:
{
std::vector<std::string> valsS;
processPropertyValueTableEntries(L, value, valsS);
ghoul::lua::push(L, valsS);
}
break;
case PropertyValueType::Table:
default:
LERROR(fmt::format(
"Table-within-a-table values are not supported for profile a "
"property (processing property {})", _profilePropertyName
));
break;
}
}
template <typename T>
void Scene::processPropertyValueTableEntries(ghoul::lua::LuaState& L, std::string& value,
std::vector<T>& table)
void Scene::processPropertyValueTableEntries(ghoul::lua::LuaState& L,
const std::string& value, std::vector<T>& table)
{
size_t commaPos = 0;
size_t prevPos = 0;
@@ -767,13 +760,13 @@ void Scene::processPropertyValueTableEntries(ghoul::lua::LuaState& L, std::strin
catch (std::bad_variant_access& e) {
LERROR(fmt::format(
"Error attempting to parse profile property setting for "
"{} using value = {}", _profilePropertyName, value)
);
"{} using value = {}", _profilePropertyName, value
));
}
}
}
PropertyValueType Scene::getPropertyValueType(std::string& value) {
PropertyValueType Scene::propertyValueType(const std::string& value) {
if (luascriptfunctions::isBoolValue(value)) {
return PropertyValueType::Boolean;
}

13
src/scene/scene_lua.inl
View File

@@ -904,7 +904,7 @@ int worldRotation(lua_State* L) {
* isBoolValue(const std::string& s):
* Used to check if a string is a lua bool type. Returns false if not a valid bool string.
*/
bool isBoolValue(const std::string& s) {
bool isBoolValue(std::string_view s) {
return (s == "true" || s == "false");
}
@@ -917,12 +917,7 @@ bool isFloatValue(const std::string& s) {
try {
float converted = std::numeric_limits<float>::min();
converted = std::stof(s);
if (converted != std::numeric_limits<float>::min()) {
return true;
}
else {
return false;
}
return (converted != std::numeric_limits<float>::min());
}
catch (...) {
return false;
@@ -934,7 +929,7 @@ bool isFloatValue(const std::string& s) {
* isNilValue(const std::string& s):
* Used to check if a string is a lua 'nil' value. Returns false if not.
*/
bool isNilValue(const std::string& s) {
bool isNilValue(std::string_view s) {
return (s == "nil");
}
@@ -944,7 +939,7 @@ bool isNilValue(const std::string& s) {
* Used to check if a string contains a lua table rather than an individual value.
* Returns false if not.
*/
bool isTableValue(const std::string& s) {
bool isTableValue(std::string_view s) {
return ((s.front() == '{') && (s.back() == '}'));
}