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

Address comments on PR

Browse Source
This commit is contained in:
Ylva Selling
2023-04-14 14:20:38 -04:00
parent 7c97142840
commit 24b828b4eb
5 changed files with 104 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/scripting/scriptengine.cpp
View File

@@ -82,14 +82,25 @@ namespace {
}
void sortJson(nlohmann::json& json) {
std::sort(json.begin(), json.end(), []
(const nlohmann::json& lhs, const nlohmann::json& rhs) {
std::sort(
json.begin(),
json.end(),
[](const nlohmann::json& lhs, const nlohmann::json& rhs) {
std::string lhsString = lhs["Name"];
std::string rhsString = rhs["Name"];
std::transform(lhsString.begin(), lhsString.end(), lhsString.begin(),
[](unsigned char c) { return std::tolower(c); });
std::transform(rhsString.begin(), rhsString.end(), rhsString.begin(),
[](unsigned char c) { return std::tolower(c); });
std::transform(
lhsString.begin(),
lhsString.end(),
lhsString.begin(),
[](unsigned char c) { return std::tolower(c); }
);
std::transform(
rhsString.begin(),
rhsString.end(),
rhsString.begin(),
[](unsigned char c) { return std::tolower(c); }
);
return rhsString > lhsString;
});
}
@@ -476,7 +487,7 @@ nlohmann::json ScriptEngine::generateJsonJson() const {
using namespace openspace::scripting;
nlohmann::json library;
std::string libraryName = l.name == "" ? "openspace" : "openspace." + l.name;
std::string libraryName = l.name.empty() ? "openspace" : "openspace." + l.name;
library["Name"] = libraryName;
for (const LuaLibrary::Function& f : l.functions) {