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

Rewrite factorymanager to use nlohmann::json

Browse Source
This commit is contained in:
Ylva Selling
2023-01-10 12:38:44 -05:00
parent 007d49bdd0
commit 424eb256b0
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/util/factorymanager.cpp
View File

@@ -24,6 +24,7 @@
#include <openspace/util/factorymanager.h>
#include <openspace/json.h>
#include <openspace/rendering/dashboarditem.h>
#include <openspace/rendering/renderable.h>
#include <openspace/scene/lightsource.h>
@@ -89,33 +90,22 @@ FactoryManager& FactoryManager::ref() {
}
std::string FactoryManager::generateJson() const {
std::stringstream json;
nlohmann::json json;
json << "[";
for (const FactoryInfo& factoryInfo : _factories) {
json << "{";
json << "\"name\": \"" << factoryInfo.name << "\",";
json << "\"classes\": [";
nlohmann::json factory;
factory["name"] = factoryInfo.name;
ghoul::TemplateFactoryBase* f = factoryInfo.factory.get();
const std::vector<std::string>& registeredClasses = f->registeredClasses();
for (const std::string& c : registeredClasses) {
json << "\"" << c << "\"";
if (&c != &registeredClasses.back()) {
json << ",";
}
}
json << "]}";
if (&factoryInfo != &_factories.back()) {
json << ",";
json["classes"].push_back(c);
}
json.push_back(factory);
}
json << "]";
// I did not check the output of this for correctness ---abock
return json.str();
return json.dump();
}
} // namespace openspace