From 3d3db47d76015c403e3ea3e886a5476aa776758b Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Fri, 12 Nov 2021 14:07:07 +0100 Subject: [PATCH] Small include updates to adapt to inputstate changes --- include/openspace/navigation/orbitalnavigator.h | 4 ++-- modules/server/include/topics/flightcontrollertopic.h | 1 - modules/server/src/topics/flightcontrollertopic.cpp | 1 - src/navigation/orbitalnavigator.cpp | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h index c0cdada814..977f6ed74b 100644 --- a/include/openspace/navigation/orbitalnavigator.h +++ b/include/openspace/navigation/orbitalnavigator.h @@ -41,7 +41,6 @@ #include #include #include - #include namespace openspace { @@ -53,7 +52,8 @@ namespace openspace { namespace openspace::interaction { -class InputState; +class MouseInputState; +class KeyboardInputState; class OrbitalNavigator : public properties::PropertyOwner { public: diff --git a/modules/server/include/topics/flightcontrollertopic.h b/modules/server/include/topics/flightcontrollertopic.h index a6aa91bca4..418acfe038 100644 --- a/modules/server/include/topics/flightcontrollertopic.h +++ b/modules/server/include/topics/flightcontrollertopic.h @@ -30,7 +30,6 @@ #include namespace openspace::interaction { - struct WebsocketInputStates; struct WebsocketInputState; } diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp index bdc139e7dc..684e2be7be 100644 --- a/modules/server/src/topics/flightcontrollertopic.cpp +++ b/modules/server/src/topics/flightcontrollertopic.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp index 49009d083f..a971dc029e 100644 --- a/src/navigation/orbitalnavigator.cpp +++ b/src/navigation/orbitalnavigator.cpp @@ -23,6 +23,8 @@ ****************************************************************************************/ #include +#include +#include #include #include #include