mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

General code cleanup

Browse Source
This commit is contained in:
Alexander Bock
2020-04-14 15:48:58 +02:00
parent 660533e840
commit f1fe2f197b
54 changed files with 339 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/server/src/topics/flightcontrollertopic.cpp
+14 -7
View File
@@ -89,7 +89,8 @@ namespace {
// Friction JSON Keys
constexpr const char* FrictionEngagedKey = "engaged";
constexpr const char* FrictionPropertyUri = "NavigationHandler.OrbitalNavigator.Friction";
constexpr const char* FrictionPropertyUri =
"NavigationHandler.OrbitalNavigator.Friction";
constexpr const char* FrictionRotationKey = "rotation";
constexpr const char* FrictionZoomKey = "zoom";
constexpr const char* FrictionRollKey = "roll";
@@ -179,7 +180,9 @@ bool FlightControllerTopic::isDone() const {
void FlightControllerTopic::handleJson(const nlohmann::json& json) {
auto it = CommandMap.find(json[TypeKey]);
if (it == CommandMap.end()) {
LWARNING(fmt::format("Poorly formatted JSON command: no '{}' in payload", TypeKey));
LWARNING(
fmt::format("Poorly formatted JSON command: no '{}' in payload", TypeKey)
);
return;
}
@@ -290,10 +293,12 @@ void FlightControllerTopic::updateView(const nlohmann::json& json) const {
void FlightControllerTopic::changeFocus(const nlohmann::json& json) const {
if (json[FocusKey].find(SceneNodeName) == json[FocusKey].end()) {
const std::string j = json;
LWARNING(fmt::format("Could not find {} key in JSON. JSON was:\n{}", FocusKey, j));
LWARNING(
fmt::format("Could not find {} key in JSON. JSON was:\n{}", FocusKey, j)
);
return;
}
const std::string focus = json[FocusKey][SceneNodeName];
const SceneGraphNode* node = global::renderEngine.scene()->sceneGraphNode(focus);
if (node) {
@@ -308,7 +313,9 @@ void FlightControllerTopic::changeFocus(const nlohmann::json& json) const {
void FlightControllerTopic::setRenderableEnabled(const nlohmann::json& json) const {
if (json[RenderableKey].find(SceneNodeName) == json[RenderableKey].end()) {
const std::string j = json;
LWARNING(fmt::format("Could not find {} key in JSON. JSON was:\n{}", FocusKey, j));
LWARNING(
fmt::format("Could not find {} key in JSON. JSON was:\n{}", FocusKey, j)
);
return;
}
@@ -426,7 +433,7 @@ void FlightControllerTopic::processInputState(const nlohmann::json& json) {
_inputState.axes[std::distance(AxisIndexMap.begin(), mapIt)] = float(it.value());
}
}
void FlightControllerTopic::processLua(const nlohmann::json &json) {
const std::string script = json[LuaScript];
global::scriptEngine.queueScript(
@@ -434,5 +441,5 @@ void FlightControllerTopic::processLua(const nlohmann::json &json) {
openspace::scripting::ScriptEngine::RemoteScripting::Yes
);
}
} // namespace openspace