From 90a48934f3c8fb0e8145e5056be744db671f7a9f Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Wed, 17 Dec 2025 11:08:04 +0100 Subject: [PATCH] Move files related to orbital navigation to one place (`navigation/orbitalnavigator/`) --- .../openspace/navigation/navigationhandler.h | 4 +-- .../camerainteractionstates.h | 2 +- .../orbitalnavigator}/delayedvariable.h | 0 .../orbitalnavigator}/delayedvariable.inl | 0 .../orbitalnavigator}/joystickcamerastates.h | 2 +- .../orbitalnavigator}/mousecamerastates.h | 2 +- .../orbitalinputhandler.h | 8 ++--- .../{ => orbitalnavigator}/orbitalnavigator.h | 2 +- .../orbitalnavigator}/scriptcamerastates.h | 2 +- .../orbitalnavigator}/websocketcamerastates.h | 2 +- modules/base/dashboard/dashboarditemangle.cpp | 2 +- .../base/dashboard/dashboarditemdistance.cpp | 2 +- modules/base/rendering/renderablenodeline.cpp | 2 +- modules/globebrowsing/globebrowsingmodule.cpp | 2 +- .../imgui/src/guiglobebrowsingcomponent.cpp | 2 +- .../src/topics/flightcontrollertopic.cpp | 4 +-- modules/touch/src/touchinteraction.cpp | 2 +- src/CMakeLists.txt | 33 +++++++++---------- src/documentation/core_registration.cpp | 2 +- src/engine/openspaceengine.cpp | 2 +- .../camerainteractionstates.cpp | 2 +- .../joystickcamerastates.cpp | 2 +- .../orbitalnavigator}/mousecamerastates.cpp | 2 +- .../orbitalinputhandler.cpp | 4 +-- .../orbitalnavigator.cpp | 2 +- .../orbitalnavigator_lua.inl | 0 .../orbitalnavigator}/scriptcamerastates.cpp | 2 +- .../websocketcamerastates.cpp | 2 +- src/network/messagestructureshelper.cpp | 2 +- src/network/parallelpeer.cpp | 2 +- src/rendering/renderengine.cpp | 2 +- 31 files changed, 47 insertions(+), 52 deletions(-) rename include/openspace/{interaction => navigation/orbitalnavigator}/camerainteractionstates.h (98%) rename include/openspace/{interaction => navigation/orbitalnavigator}/delayedvariable.h (100%) rename include/openspace/{interaction => navigation/orbitalnavigator}/delayedvariable.inl (100%) rename include/openspace/{interaction => navigation/orbitalnavigator}/joystickcamerastates.h (99%) rename include/openspace/{interaction => navigation/orbitalnavigator}/mousecamerastates.h (97%) rename include/openspace/navigation/{ => orbitalnavigator}/orbitalinputhandler.h (93%) rename include/openspace/navigation/{ => orbitalnavigator}/orbitalnavigator.h (99%) rename include/openspace/{interaction => navigation/orbitalnavigator}/scriptcamerastates.h (97%) rename include/openspace/{interaction => navigation/orbitalnavigator}/websocketcamerastates.h (98%) rename src/{interaction => navigation/orbitalnavigator}/camerainteractionstates.cpp (98%) rename src/{interaction => navigation/orbitalnavigator}/joystickcamerastates.cpp (99%) rename src/{interaction => navigation/orbitalnavigator}/mousecamerastates.cpp (99%) rename src/navigation/{ => orbitalnavigator}/orbitalinputhandler.cpp (98%) rename src/navigation/{ => orbitalnavigator}/orbitalnavigator.cpp (99%) rename src/navigation/{ => orbitalnavigator}/orbitalnavigator_lua.inl (100%) rename src/{interaction => navigation/orbitalnavigator}/scriptcamerastates.cpp (98%) rename src/{interaction => navigation/orbitalnavigator}/websocketcamerastates.cpp (99%) diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h index 071f257f4d..07d7bfab3e 100644 --- a/include/openspace/navigation/navigationhandler.h +++ b/include/openspace/navigation/navigationhandler.h @@ -27,14 +27,12 @@ #include -#include #include #include #include -#include #include #include -#include +#include #include #include #include diff --git a/include/openspace/interaction/camerainteractionstates.h b/include/openspace/navigation/orbitalnavigator/camerainteractionstates.h similarity index 98% rename from include/openspace/interaction/camerainteractionstates.h rename to include/openspace/navigation/orbitalnavigator/camerainteractionstates.h index 4a4dc2c744..9390138fc5 100644 --- a/include/openspace/interaction/camerainteractionstates.h +++ b/include/openspace/navigation/orbitalnavigator/camerainteractionstates.h @@ -25,7 +25,7 @@ #ifndef __OPENSPACE_CORE___CAMERAINTERACTIONSTATES___H__ #define __OPENSPACE_CORE___CAMERAINTERACTIONSTATES___H__ -#include +#include #include namespace openspace::interaction { diff --git a/include/openspace/interaction/delayedvariable.h b/include/openspace/navigation/orbitalnavigator/delayedvariable.h similarity index 100% rename from include/openspace/interaction/delayedvariable.h rename to include/openspace/navigation/orbitalnavigator/delayedvariable.h diff --git a/include/openspace/interaction/delayedvariable.inl b/include/openspace/navigation/orbitalnavigator/delayedvariable.inl similarity index 100% rename from include/openspace/interaction/delayedvariable.inl rename to include/openspace/navigation/orbitalnavigator/delayedvariable.inl diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/navigation/orbitalnavigator/joystickcamerastates.h similarity index 99% rename from include/openspace/interaction/joystickcamerastates.h rename to include/openspace/navigation/orbitalnavigator/joystickcamerastates.h index 980a5cc2c3..2ec4561837 100644 --- a/include/openspace/interaction/joystickcamerastates.h +++ b/include/openspace/navigation/orbitalnavigator/joystickcamerastates.h @@ -25,7 +25,7 @@ #ifndef __OPENSPACE_CORE___JOYSTICKCAMERASTATES___H__ #define __OPENSPACE_CORE___JOYSTICKCAMERASTATES___H__ -#include +#include #include #include diff --git a/include/openspace/interaction/mousecamerastates.h b/include/openspace/navigation/orbitalnavigator/mousecamerastates.h similarity index 97% rename from include/openspace/interaction/mousecamerastates.h rename to include/openspace/navigation/orbitalnavigator/mousecamerastates.h index 36d0d786e7..b55aa24c47 100644 --- a/include/openspace/interaction/mousecamerastates.h +++ b/include/openspace/navigation/orbitalnavigator/mousecamerastates.h @@ -25,7 +25,7 @@ #ifndef __OPENSPACE_CORE___MOUSECAMERASTATES___H__ #define __OPENSPACE_CORE___MOUSECAMERASTATES___H__ -#include +#include namespace openspace::interaction { diff --git a/include/openspace/navigation/orbitalinputhandler.h b/include/openspace/navigation/orbitalnavigator/orbitalinputhandler.h similarity index 93% rename from include/openspace/navigation/orbitalinputhandler.h rename to include/openspace/navigation/orbitalnavigator/orbitalinputhandler.h index 433dbab8a5..c3e00c2f1b 100644 --- a/include/openspace/navigation/orbitalinputhandler.h +++ b/include/openspace/navigation/orbitalnavigator/orbitalinputhandler.h @@ -27,10 +27,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator/orbitalnavigator.h similarity index 99% rename from include/openspace/navigation/orbitalnavigator.h rename to include/openspace/navigation/orbitalnavigator/orbitalnavigator.h index e5b961d15c..5ad44a5516 100644 --- a/include/openspace/navigation/orbitalnavigator.h +++ b/include/openspace/navigation/orbitalnavigator/orbitalnavigator.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/openspace/interaction/scriptcamerastates.h b/include/openspace/navigation/orbitalnavigator/scriptcamerastates.h similarity index 97% rename from include/openspace/interaction/scriptcamerastates.h rename to include/openspace/navigation/orbitalnavigator/scriptcamerastates.h index 342f736d87..bdabd49e2a 100644 --- a/include/openspace/interaction/scriptcamerastates.h +++ b/include/openspace/navigation/orbitalnavigator/scriptcamerastates.h @@ -25,7 +25,7 @@ #ifndef __OPENSPACE_CORE___SCRIPTCAMERASTATES___H__ #define __OPENSPACE_CORE___SCRIPTCAMERASTATES___H__ -#include +#include #include diff --git a/include/openspace/interaction/websocketcamerastates.h b/include/openspace/navigation/orbitalnavigator/websocketcamerastates.h similarity index 98% rename from include/openspace/interaction/websocketcamerastates.h rename to include/openspace/navigation/orbitalnavigator/websocketcamerastates.h index 79d0bb4cc8..f4d70343bc 100644 --- a/include/openspace/interaction/websocketcamerastates.h +++ b/include/openspace/navigation/orbitalnavigator/websocketcamerastates.h @@ -25,7 +25,7 @@ #ifndef __OPENSPACE_CORE___WEBSOCKETCAMERASTATES___H__ #define __OPENSPACE_CORE___WEBSOCKETCAMERASTATES___H__ -#include +#include #include #include diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp index 038a6e26a8..45d5349575 100644 --- a/modules/base/dashboard/dashboarditemangle.cpp +++ b/modules/base/dashboard/dashboarditemangle.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp index 1f0eeb6aee..36cd025efb 100644 --- a/modules/base/dashboard/dashboarditemdistance.cpp +++ b/modules/base/dashboard/dashboarditemdistance.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp index b0fd5a8133..8e15c0eb11 100644 --- a/modules/base/rendering/renderablenodeline.cpp +++ b/modules/base/rendering/renderablenodeline.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index 6c77bf1d89..987f3b448d 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp index fe22014708..26faa79072 100644 --- a/modules/imgui/src/guiglobebrowsingcomponent.cpp +++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp index b3681a0f8d..cb90cb07cd 100644 --- a/modules/server/src/topics/flightcontrollertopic.cpp +++ b/modules/server/src/topics/flightcontrollertopic.cpp @@ -26,10 +26,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 55e519dde4..3baa389dd6 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79d1b3d57e..6d45cc05a2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,23 +51,18 @@ set(OPENSPACE_SOURCE events/eventengine_lua.inl interaction/actionmanager.cpp interaction/actionmanager_lua.inl - interaction/camerainteractionstates.cpp interaction/interactionmonitor.cpp interaction/mouseinputstate.cpp interaction/joystickinputstate.cpp - interaction/joystickcamerastates.cpp interaction/keybindingmanager.cpp interaction/keybindingmanager_lua.inl interaction/keyframerecordinghandler.cpp interaction/keyframerecordinghandler_lua.inl interaction/keyboardinputstate.cpp - interaction/mousecamerastates.cpp - interaction/scriptcamerastates.cpp interaction/sessionrecording.cpp interaction/sessionrecordinghandler.cpp interaction/sessionrecordinghandler_lua.inl interaction/websocketinputstate.cpp - interaction/websocketcamerastates.cpp interaction/tasks/convertrecformattask.cpp mission/mission.cpp mission/missionmanager.cpp @@ -78,9 +73,14 @@ set(OPENSPACE_SOURCE navigation/navigationhandler.cpp navigation/navigationhandler_lua.inl navigation/navigationstate.cpp - navigation/orbitalinputhandler.cpp - navigation/orbitalnavigator.cpp - navigation/orbitalnavigator_lua.inl + navigation/orbitalnavigator/camerainteractionstates.cpp + navigation/orbitalnavigator/joystickcamerastates.cpp + navigation/orbitalnavigator/mousecamerastates.cpp + navigation/orbitalnavigator/orbitalinputhandler.cpp + navigation/orbitalnavigator/orbitalnavigator.cpp + navigation/orbitalnavigator/orbitalnavigator_lua.inl + navigation/orbitalnavigator/scriptcamerastates.cpp + navigation/orbitalnavigator/websocketcamerastates.cpp navigation/path.cpp navigation/pathcurve.cpp navigation/pathnavigator.cpp @@ -251,24 +251,17 @@ set(OPENSPACE_HEADER ${PROJECT_SOURCE_DIR}/include/openspace/events/eventengine.inl ${PROJECT_SOURCE_DIR}/include/openspace/interaction/action.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/actionmanager.h - ${PROJECT_SOURCE_DIR}/include/openspace/interaction/delayedvariable.h - ${PROJECT_SOURCE_DIR}/include/openspace/interaction/delayedvariable.inl - ${PROJECT_SOURCE_DIR}/include/openspace/interaction/camerainteractionstates.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/mouseinputstate.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interactionmonitor.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interpolator.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interpolator.inl ${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickinputstate.h - ${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickcamerastates.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keybindingmanager.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyboardinputstate.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyframerecordinghandler.h - ${PROJECT_SOURCE_DIR}/include/openspace/interaction/mousecamerastates.h - ${PROJECT_SOURCE_DIR}/include/openspace/interaction/scriptcamerastates.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecording.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecordinghandler.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/websocketinputstate.h - ${PROJECT_SOURCE_DIR}/include/openspace/interaction/websocketcamerastates.h ${PROJECT_SOURCE_DIR}/include/openspace/interaction/tasks/convertrecformattask.h ${PROJECT_SOURCE_DIR}/include/openspace/mission/mission.h ${PROJECT_SOURCE_DIR}/include/openspace/mission/missionmanager.h @@ -277,8 +270,14 @@ set(OPENSPACE_HEADER ${PROJECT_SOURCE_DIR}/include/openspace/navigation/keyframenavigator.h ${PROJECT_SOURCE_DIR}/include/openspace/navigation/navigationhandler.h ${PROJECT_SOURCE_DIR}/include/openspace/navigation/navigationstate.h - ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalinputhandler.h - ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator.h + ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator/delayedvariable.h + ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator/delayedvariable.inl + ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator/camerainteractionstates.h + ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator/joystickcamerastates.h + ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator/mousecamerastates.h + ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator/orbitalinputhandler.h + ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator/orbitalnavigator.h + ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator/websocketcamerastates.h ${PROJECT_SOURCE_DIR}/include/openspace/navigation/path.h ${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathcurve.h ${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathnavigator.h diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp index 0fc4c019e0..a4e0433e8e 100644 --- a/src/documentation/core_registration.cpp +++ b/src/documentation/core_registration.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index fa9afb165c..7dc524a326 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/interaction/camerainteractionstates.cpp b/src/navigation/orbitalnavigator/camerainteractionstates.cpp similarity index 98% rename from src/interaction/camerainteractionstates.cpp rename to src/navigation/orbitalnavigator/camerainteractionstates.cpp index 9dea4f2a37..0abfff471d 100644 --- a/src/interaction/camerainteractionstates.cpp +++ b/src/navigation/orbitalnavigator/camerainteractionstates.cpp @@ -22,7 +22,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include namespace openspace::interaction { diff --git a/src/interaction/joystickcamerastates.cpp b/src/navigation/orbitalnavigator/joystickcamerastates.cpp similarity index 99% rename from src/interaction/joystickcamerastates.cpp rename to src/navigation/orbitalnavigator/joystickcamerastates.cpp index 786e61005f..d23e97906e 100644 --- a/src/interaction/joystickcamerastates.cpp +++ b/src/navigation/orbitalnavigator/joystickcamerastates.cpp @@ -22,7 +22,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include #include #include diff --git a/src/interaction/mousecamerastates.cpp b/src/navigation/orbitalnavigator/mousecamerastates.cpp similarity index 99% rename from src/interaction/mousecamerastates.cpp rename to src/navigation/orbitalnavigator/mousecamerastates.cpp index 86e9338735..f526896824 100644 --- a/src/interaction/mousecamerastates.cpp +++ b/src/navigation/orbitalnavigator/mousecamerastates.cpp @@ -22,7 +22,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include #include #include diff --git a/src/navigation/orbitalinputhandler.cpp b/src/navigation/orbitalnavigator/orbitalinputhandler.cpp similarity index 98% rename from src/navigation/orbitalinputhandler.cpp rename to src/navigation/orbitalnavigator/orbitalinputhandler.cpp index b1dfd92647..818ceca486 100644 --- a/src/navigation/orbitalinputhandler.cpp +++ b/src/navigation/orbitalnavigator/orbitalinputhandler.cpp @@ -22,13 +22,11 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include #include namespace { - constexpr std::string_view _loggerCat = "OrbitalInputHandler"; - constexpr openspace::properties::Property::PropertyInfo MouseSensitivityInfo = { "MouseSensitivity", "Mouse sensitivity", diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator/orbitalnavigator.cpp similarity index 99% rename from src/navigation/orbitalnavigator.cpp rename to src/navigation/orbitalnavigator/orbitalnavigator.cpp index b3f4ff0e2a..ec4aeb91e9 100644 --- a/src/navigation/orbitalnavigator.cpp +++ b/src/navigation/orbitalnavigator/orbitalnavigator.cpp @@ -22,7 +22,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include #include #include diff --git a/src/navigation/orbitalnavigator_lua.inl b/src/navigation/orbitalnavigator/orbitalnavigator_lua.inl similarity index 100% rename from src/navigation/orbitalnavigator_lua.inl rename to src/navigation/orbitalnavigator/orbitalnavigator_lua.inl diff --git a/src/interaction/scriptcamerastates.cpp b/src/navigation/orbitalnavigator/scriptcamerastates.cpp similarity index 98% rename from src/interaction/scriptcamerastates.cpp rename to src/navigation/orbitalnavigator/scriptcamerastates.cpp index 0a1d31b4e0..98ad2281d2 100644 --- a/src/interaction/scriptcamerastates.cpp +++ b/src/navigation/orbitalnavigator/scriptcamerastates.cpp @@ -22,7 +22,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include namespace openspace::interaction { diff --git a/src/interaction/websocketcamerastates.cpp b/src/navigation/orbitalnavigator/websocketcamerastates.cpp similarity index 99% rename from src/interaction/websocketcamerastates.cpp rename to src/navigation/orbitalnavigator/websocketcamerastates.cpp index a1afdc4dbd..d4a7b992f0 100644 --- a/src/interaction/websocketcamerastates.cpp +++ b/src/navigation/orbitalnavigator/websocketcamerastates.cpp @@ -22,7 +22,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include #include #include diff --git a/src/network/messagestructureshelper.cpp b/src/network/messagestructureshelper.cpp index 3a79ab6ecb..1c94daf0c2 100644 --- a/src/network/messagestructureshelper.cpp +++ b/src/network/messagestructureshelper.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp index 39726b705b..fc632ac977 100644 --- a/src/network/parallelpeer.cpp +++ b/src/network/parallelpeer.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 039921f653..1b0ef94556 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include