diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h index aadbb731b2..62ea47e478 100644 --- a/include/openspace/engine/openspaceengine.h +++ b/include/openspace/engine/openspaceengine.h @@ -69,7 +69,7 @@ namespace network { namespace properties { class PropertyOwner; } - + class OpenSpaceEngine { public: static bool create(int argc, char** argv, WindowWrapper* windowWrapper, std::vector& sgctArguments); diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 5c5c00aa6f..4fb5c67ee5 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -39,7 +39,6 @@ #include #include -#include #define _USE_MATH_DEFINES #include diff --git a/modules/base/rendering/renderableplanet.cpp b/modules/base/rendering/renderableplanet.cpp index ff5fc0228b..19f03e4c37 100644 --- a/modules/base/rendering/renderableplanet.cpp +++ b/modules/base/rendering/renderableplanet.cpp @@ -39,8 +39,6 @@ #include #include -#include - namespace { const std::string _loggerCat = "RenderablePlanet"; diff --git a/modules/newhorizons/rendering/renderablemodelprojection.cpp b/modules/newhorizons/rendering/renderablemodelprojection.cpp index 573cff0d7e..2214121792 100644 --- a/modules/newhorizons/rendering/renderablemodelprojection.cpp +++ b/modules/newhorizons/rendering/renderablemodelprojection.cpp @@ -34,7 +34,6 @@ #include #include -#include #include "imgui.h" #define _USE_MATH_DEFINES diff --git a/modules/newhorizons/rendering/renderableplanetprojection.cpp b/modules/newhorizons/rendering/renderableplanetprojection.cpp index 4c9cb3018e..7f3ee36aa1 100644 --- a/modules/newhorizons/rendering/renderableplanetprojection.cpp +++ b/modules/newhorizons/rendering/renderableplanetprojection.cpp @@ -40,7 +40,6 @@ #include #include -#include #include #include #include diff --git a/modules/onscreengui/src/gui.cpp b/modules/onscreengui/src/gui.cpp index ddcd52079d..ae6d7453aa 100644 --- a/modules/onscreengui/src/gui.cpp +++ b/modules/onscreengui/src/gui.cpp @@ -26,9 +26,7 @@ #include -// This needs to be included first due to Windows.h / winsock2.h complications -#define SGCT_WINDOWS_INCLUDE -#include +#include #include @@ -168,23 +166,23 @@ void GUI::initialize() { //io.IniSavingRate = 5.f; io.DeltaTime = 1.f / 60.f; //io.PixelCenterOffset = 0.5f; - io.KeyMap[ImGuiKey_Tab] = SGCT_KEY_TAB; // Keyboard mapping. ImGui will use those indices to peek into the io.KeyDown[] array. - io.KeyMap[ImGuiKey_LeftArrow] = SGCT_KEY_LEFT; - io.KeyMap[ImGuiKey_RightArrow] = SGCT_KEY_RIGHT; - io.KeyMap[ImGuiKey_UpArrow] = SGCT_KEY_UP; - io.KeyMap[ImGuiKey_DownArrow] = SGCT_KEY_DOWN; - io.KeyMap[ImGuiKey_Home] = SGCT_KEY_HOME; - io.KeyMap[ImGuiKey_End] = SGCT_KEY_END; - io.KeyMap[ImGuiKey_Delete] = SGCT_KEY_DELETE; - io.KeyMap[ImGuiKey_Backspace] = SGCT_KEY_BACKSPACE; - io.KeyMap[ImGuiKey_Enter] = SGCT_KEY_ENTER; - io.KeyMap[ImGuiKey_Escape] = SGCT_KEY_ESCAPE; - io.KeyMap[ImGuiKey_A] = SGCT_KEY_A; - io.KeyMap[ImGuiKey_C] = SGCT_KEY_C; - io.KeyMap[ImGuiKey_V] = SGCT_KEY_V; - io.KeyMap[ImGuiKey_X] = SGCT_KEY_X; - io.KeyMap[ImGuiKey_Y] = SGCT_KEY_Y; - io.KeyMap[ImGuiKey_Z] = SGCT_KEY_Z; + io.KeyMap[ImGuiKey_Tab] = static_cast(Key::Tab); + io.KeyMap[ImGuiKey_LeftArrow] = static_cast(Key::Left); + io.KeyMap[ImGuiKey_RightArrow] = static_cast(Key::Right); + io.KeyMap[ImGuiKey_UpArrow] = static_cast(Key::Up); + io.KeyMap[ImGuiKey_DownArrow] = static_cast(Key::Down); + io.KeyMap[ImGuiKey_Home] = static_cast(Key::Home); + io.KeyMap[ImGuiKey_End] = static_cast(Key::End); + io.KeyMap[ImGuiKey_Delete] = static_cast(Key::Delete); + io.KeyMap[ImGuiKey_Backspace] = static_cast(Key::BackSpace); + io.KeyMap[ImGuiKey_Enter] = static_cast(Key::Enter); + io.KeyMap[ImGuiKey_Escape] = static_cast(Key::Escape); + io.KeyMap[ImGuiKey_A] = static_cast(Key::A); + io.KeyMap[ImGuiKey_C] = static_cast(Key::C); + io.KeyMap[ImGuiKey_V] = static_cast(Key::V); + io.KeyMap[ImGuiKey_X] = static_cast(Key::X); + io.KeyMap[ImGuiKey_Y] = static_cast(Key::Y); + io.KeyMap[ImGuiKey_Z] = static_cast(Key::Z); io.RenderDrawListsFn = ImImpl_RenderDrawLists; //io.SetClipboardTextFn = ImImpl_SetClipboardTextFn; // @TODO implement? ---abock diff --git a/src/abuffer/abuffer.cpp b/src/abuffer/abuffer.cpp index cd9933edd7..9af9eda690 100644 --- a/src/abuffer/abuffer.cpp +++ b/src/abuffer/abuffer.cpp @@ -31,8 +31,6 @@ #include #include -#include - #include #include #include diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index f8d1bdbf19..aaffd14cae 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -26,8 +26,6 @@ #include -#define SGCT_WINDOWS_INCLUDE -#include #include #include diff --git a/src/interaction/deviceidentifier.cpp b/src/interaction/deviceidentifier.cpp index 6743dc4e57..a6d16cb42a 100644 --- a/src/interaction/deviceidentifier.cpp +++ b/src/interaction/deviceidentifier.cpp @@ -2,9 +2,6 @@ // open space includes #include -// sgct includes -//#include "sgct.h" - #include namespace openspace { diff --git a/src/network/networkengine.cpp b/src/network/networkengine.cpp index 322927dc65..83265ec2be 100644 --- a/src/network/networkengine.cpp +++ b/src/network/networkengine.cpp @@ -33,8 +33,6 @@ #include -#include "sgct.h" - namespace { const std::string _loggerCat = "NetworkEngine"; diff --git a/src/util/camera.cpp b/src/util/camera.cpp index b4d108076d..c67170f5b3 100644 --- a/src/util/camera.cpp +++ b/src/util/camera.cpp @@ -26,15 +26,10 @@ #include #include -// sgct includes -#include "sgct.h" - #include #include - namespace openspace { - Camera::Camera() : _maxFov(0.f)