mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-12 14:29:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move files related to orbital navigation to one place (navigation/orbitalnavigator/)

Browse Source
This commit is contained in:
Emma Broman
2025-12-17 11:08:04 +01:00
parent 0c19f651d8
commit 90a48934f3
31 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/navigation/navigationhandler.h
+1 -3
View File
@@ -27,14 +27,12 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/interaction/joystickcamerastates.h>
#include <openspace/interaction/joystickinputstate.h>
#include <openspace/interaction/keyboardinputstate.h>
#include <openspace/interaction/mouseinputstate.h>
#include <openspace/interaction/websocketcamerastates.h>
#include <openspace/navigation/keyframenavigator.h>
#include <openspace/navigation/navigationstate.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/navigation/pathnavigator.h>
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/floatproperty.h>
include/openspace/interaction/camerainteractionstates.h → include/openspace/navigation/orbitalnavigator/camerainteractionstates.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __OPENSPACE_CORE___CAMERAINTERACTIONSTATES___H__
#define __OPENSPACE_CORE___CAMERAINTERACTIONSTATES___H__
#include <openspace/interaction/delayedvariable.h>
#include <openspace/navigation/orbitalnavigator/delayedvariable.h>
#include <ghoul/glm.h>
namespace openspace::interaction {
include/openspace/interaction/delayedvariable.h → include/openspace/navigation/orbitalnavigator/delayedvariable.h
View File
include/openspace/interaction/delayedvariable.inl → include/openspace/navigation/orbitalnavigator/delayedvariable.inl
View File
include/openspace/interaction/joystickcamerastates.h → include/openspace/navigation/orbitalnavigator/joystickcamerastates.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __OPENSPACE_CORE___JOYSTICKCAMERASTATES___H__
#define __OPENSPACE_CORE___JOYSTICKCAMERASTATES___H__
#include <openspace/interaction/camerainteractionstates.h>
#include <openspace/navigation/orbitalnavigator/camerainteractionstates.h>
#include <openspace/interaction/joystickinputstate.h>
#include <ghoul/format.h>
include/openspace/interaction/mousecamerastates.h → include/openspace/navigation/orbitalnavigator/mousecamerastates.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __OPENSPACE_CORE___MOUSECAMERASTATES___H__
#define __OPENSPACE_CORE___MOUSECAMERASTATES___H__
#include <openspace/interaction/camerainteractionstates.h>
#include <openspace/navigation/orbitalnavigator/camerainteractionstates.h>
namespace openspace::interaction {
include/openspace/navigation/orbitalinputhandler.h → include/openspace/navigation/orbitalnavigator/orbitalinputhandler.h
+4 -4
View File
@@ -27,10 +27,10 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/interaction/joystickcamerastates.h>
#include <openspace/interaction/mousecamerastates.h>
#include <openspace/interaction/scriptcamerastates.h>
#include <openspace/interaction/websocketcamerastates.h>
#include <openspace/navigation/orbitalnavigator/joystickcamerastates.h>
#include <openspace/navigation/orbitalnavigator/mousecamerastates.h>
#include <openspace/navigation/orbitalnavigator/scriptcamerastates.h>
#include <openspace/navigation/orbitalnavigator/websocketcamerastates.h>
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/floatproperty.h>
include/openspace/navigation/orbitalnavigator.h → include/openspace/navigation/orbitalnavigator/orbitalnavigator.h
+1 -1
View File
@@ -28,7 +28,7 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/interaction/interpolator.h>
#include <openspace/navigation/orbitalinputhandler.h>
#include <openspace/navigation/orbitalnavigator/orbitalinputhandler.h>
#include <openspace/properties/misc/optionproperty.h>
#include <openspace/properties/misc/stringproperty.h>
#include <openspace/properties/misc/triggerproperty.h>
include/openspace/interaction/scriptcamerastates.h → include/openspace/navigation/orbitalnavigator/scriptcamerastates.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __OPENSPACE_CORE___SCRIPTCAMERASTATES___H__
#define __OPENSPACE_CORE___SCRIPTCAMERASTATES___H__
#include <openspace/interaction/camerainteractionstates.h>
#include <openspace/navigation/orbitalnavigator/camerainteractionstates.h>
#include <ghoul/glm.h>
include/openspace/interaction/websocketcamerastates.h → include/openspace/navigation/orbitalnavigator/websocketcamerastates.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __OPENSPACE_CORE___WEBSOCKETCAMERASTATES___H__
#define __OPENSPACE_CORE___WEBSOCKETCAMERASTATES___H__
#include <openspace/interaction/camerainteractionstates.h>
#include <openspace/navigation/orbitalnavigator/camerainteractionstates.h>
#include <openspace/interaction/websocketinputstate.h>
#include <ghoul/misc/boolean.h>
modules/base/dashboard/dashboarditemangle.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <openspace/documentation/documentation.h>
#include <openspace/engine/globals.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scene.h>
#include <openspace/scene/scenegraphnode.h>
modules/base/dashboard/dashboarditemdistance.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <openspace/documentation/documentation.h>
#include <openspace/engine/globals.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scene.h>
#include <openspace/scene/scenegraphnode.h>
modules/base/rendering/renderablenodeline.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <openspace/documentation/documentation.h>
#include <openspace/engine/globals.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scene.h>
#include <openspace/util/updatestructures.h>
modules/globebrowsing/globebrowsingmodule.cpp
+1 -1
View File
@@ -53,7 +53,7 @@
#include <openspace/engine/globals.h>
#include <openspace/engine/globalscallbacks.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/rendering/dashboarditem.h>
#include <openspace/rendering/renderable.h>
#include <openspace/scene/scenegraphnode.h>
modules/imgui/src/guiglobebrowsingcomponent.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
#include <openspace/engine/globals.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/rendering/renderable.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scene.h>
modules/server/src/topics/flightcontrollertopic.cpp
+2 -2
View File
@@ -26,10 +26,10 @@
#include <modules/server/include/connection.h>
#include <openspace/engine/globals.h>
#include <openspace/interaction/websocketcamerastates.h>
#include <openspace/interaction/websocketinputstate.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/websocketcamerastates.h>
#include <openspace/rendering/renderable.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scenegraphnode.h>
modules/touch/src/touchinteraction.cpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include <openspace/engine/moduleengine.h>
#include <openspace/engine/windowdelegate.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/rendering/renderable.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/query/query.h>
src/CMakeLists.txt
+16 -17
View File
@@ -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
src/documentation/core_registration.cpp
+1 -1
View File
@@ -38,7 +38,7 @@
#include <openspace/mission/missionmanager.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/navigationstate.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/navigation/path.h>
#include <openspace/navigation/pathnavigator.h>
#include <openspace/network/parallelpeer.h>
src/engine/openspaceengine.cpp
+1 -1
View File
@@ -46,7 +46,7 @@
#include <openspace/interaction/sessionrecordinghandler.h>
#include <openspace/interaction/tasks/convertrecformattask.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/navigation/waypoint.h>
#include <openspace/network/parallelconnection.h>
#include <openspace/network/parallelpeer.h>
src/interaction/camerainteractionstates.cpp → src/navigation/orbitalnavigator/camerainteractionstates.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/interaction/camerainteractionstates.h>
#include <openspace/navigation/orbitalnavigator/camerainteractionstates.h>
namespace openspace::interaction {
src/interaction/joystickcamerastates.cpp → src/navigation/orbitalnavigator/joystickcamerastates.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/interaction/joystickcamerastates.h>
#include <openspace/navigation/orbitalnavigator/joystickcamerastates.h>
#include <openspace/engine/globals.h>
#include <openspace/engine/openspaceengine.h>
src/interaction/mousecamerastates.cpp → src/navigation/orbitalnavigator/mousecamerastates.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/interaction/mousecamerastates.h>
#include <openspace/navigation/orbitalnavigator/mousecamerastates.h>
#include <openspace/interaction/mouseinputstate.h>
#include <openspace/interaction/keyboardinputstate.h>
src/navigation/orbitalinputhandler.cpp → src/navigation/orbitalnavigator/orbitalinputhandler.cpp
+1 -3
View File
@@ -22,13 +22,11 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/navigation/orbitalinputhandler.h>
#include <openspace/navigation/orbitalnavigator/orbitalinputhandler.h>
#include <openspace/engine/globals.h>
namespace {
constexpr std::string_view _loggerCat = "OrbitalInputHandler";
constexpr openspace::properties::Property::PropertyInfo MouseSensitivityInfo = {
"MouseSensitivity",
"Mouse sensitivity",
src/navigation/orbitalnavigator.cpp → src/navigation/orbitalnavigator/orbitalnavigator.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/camera/camera.h>
#include <openspace/camera/camerapose.h>
src/navigation/orbitalnavigator_lua.inl → src/navigation/orbitalnavigator/orbitalnavigator_lua.inl
View File
src/interaction/scriptcamerastates.cpp → src/navigation/orbitalnavigator/scriptcamerastates.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/interaction/scriptcamerastates.h>
#include <openspace/navigation/orbitalnavigator/scriptcamerastates.h>
namespace openspace::interaction {
src/interaction/websocketcamerastates.cpp → src/navigation/orbitalnavigator/websocketcamerastates.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/interaction/websocketcamerastates.h>
#include <openspace/navigation/orbitalnavigator/websocketcamerastates.h>
#include <ghoul/misc/assert.h>
#include <cmath>
src/network/messagestructureshelper.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <openspace/engine/globals.h>
#include <openspace/engine/windowdelegate.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/network/messagestructures.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/util/time.h>
src/network/parallelpeer.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
#include <openspace/events/eventengine.h>
#include <openspace/navigation/keyframenavigator.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/network/messagestructures.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/scripting/lualibrary.h>
src/rendering/renderengine.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/windowdelegate.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/navigation/orbitalnavigator/orbitalnavigator.h>
#include <openspace/rendering/dashboard.h>
#include <openspace/rendering/helper.h>
#include <openspace/rendering/framebufferrenderer.h>