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

Second linting pass and adding .clang_tidy file (#3128)

Browse Source
This commit is contained in:
Alexander Bock
2024-03-18 22:46:17 +01:00
committed by GitHub
parent 8e49847a47
commit 534f92c485
80 changed files with 291 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/server/src/jsonconverters.cpp
View File

@@ -70,37 +70,37 @@ void to_json(json& j, const PropertyOwner* p) {
namespace ghoul {
void to_json(json& j, const Dictionary& dictionary) {
void to_json(json& j, const Dictionary& d) {
json object;
for (const std::string_view k : dictionary.keys()) {
for (const std::string_view k : d.keys()) {
const std::string key = std::string(k);
if (dictionary.hasValue<glm::dvec4>(key)) {
const glm::dvec4 v = dictionary.value<glm::dvec4>(key);
if (d.hasValue<glm::dvec4>(key)) {
const glm::dvec4 v = d.value<glm::dvec4>(key);
object[key] = json::array({ v[0], v[1], v[2], v[3] });
}
else if (dictionary.hasValue<glm::dvec3>(key)) {
const glm::dvec3 v = dictionary.value<glm::dvec3>(key);
else if (d.hasValue<glm::dvec3>(key)) {
const glm::dvec3 v = d.value<glm::dvec3>(key);
object[key] = json::array({ v[0], v[1], v[2] });
}
else if (dictionary.hasValue<glm::dvec2>(key)) {
const glm::dvec2 v = dictionary.value<glm::dvec2>(key);
else if (d.hasValue<glm::dvec2>(key)) {
const glm::dvec2 v = d.value<glm::dvec2>(key);
object[key] = json::array({ v[0], v[1] });
}
else if (dictionary.hasValue<double>(key)) {
object[key] = dictionary.value<double>(key);
else if (d.hasValue<double>(key)) {
object[key] = d.value<double>(key);
}
else if (dictionary.hasValue<int>(key)) {
object[key] = dictionary.value<int>(key);
else if (d.hasValue<int>(key)) {
object[key] = d.value<int>(key);
}
else if (dictionary.hasValue<std::string>(key)) {
object[key] = dictionary.value<std::string>(key);
else if (d.hasValue<std::string>(key)) {
object[key] = d.value<std::string>(key);
}
else if (dictionary.hasValue<bool>(key)) {
object[key] = dictionary.value<bool>(key);
else if (d.hasValue<bool>(key)) {
object[key] = d.value<bool>(key);
}
else if (dictionary.hasValue<Dictionary>(key)) {
else if (d.hasValue<Dictionary>(key)) {
json child;
to_json(child, dictionary.value<Dictionary>(key));
to_json(child, d.value<Dictionary>(key));
object[key] = child;
}
else {
@@ -167,4 +167,4 @@ void to_json(json& j, const dvec3& v) {
};
}
} // namepsace glm
} // namespace glm

3
modules/server/src/serverinterface.cpp
View File

@@ -297,5 +297,4 @@ ghoul::io::SocketServer* ServerInterface::server() {
return _socketServer.get();
}
}
} // namespace openspace