From 696ee7f7e7fa1b8501a691db3b5dab432263851d Mon Sep 17 00:00:00 2001
From: sylvass <ys5140@nyu.edu>
Date: Wed, 1 Dec 2021 14:40:31 -0500
Subject: [PATCH] Clean up includes

---
 modules/skybrowser/include/screenspaceskytarget.h |  3 +--
 modules/skybrowser/include/wwtcommunicator.h      |  5 -----
 modules/skybrowser/include/wwtdatahandler.h       |  9 ---------
 modules/skybrowser/skybrowsermodule.cpp           | 12 +++++++++---
 modules/skybrowser/skybrowsermodule.h             | 13 +++++--------
 modules/skybrowser/skybrowsermodule_lua.inl       |  1 -
 modules/skybrowser/src/wwtdatahandler.cpp         |  2 +-
 7 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/modules/skybrowser/include/screenspaceskytarget.h b/modules/skybrowser/include/screenspaceskytarget.h
index b4fec5e27c..7c76816f3f 100644
--- a/modules/skybrowser/include/screenspaceskytarget.h
+++ b/modules/skybrowser/include/screenspaceskytarget.h
@@ -1,11 +1,10 @@
 #ifndef __OPENSPACE_MODULE_SKYBROWSER___SCREENSPACESKYTARGET___H__
 #define __OPENSPACE_MODULE_SKYBROWSER___SCREENSPACESKYTARGET___H__
 
+#include <openspace/rendering/screenspacerenderable.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/doubleproperty.h>
-#include <openspace/properties/stringproperty.h>
-#include <openspace/rendering/screenspacerenderable.h>
 
 namespace openspace::documentation { struct Documentation; }
 
diff --git a/modules/skybrowser/include/wwtcommunicator.h b/modules/skybrowser/include/wwtcommunicator.h
index d47d7372c6..96237b1e40 100644
--- a/modules/skybrowser/include/wwtcommunicator.h
+++ b/modules/skybrowser/include/wwtcommunicator.h
@@ -31,16 +31,12 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/documentation/documentation.h>
 #include <deque>
-#include <thread>
 
 namespace openspace {
 
-class ImageData;
-
 class WwtCommunicator : public Browser {
 
 public:
-
     WwtCommunicator(const ghoul::Dictionary& dictionary);
     WwtCommunicator(WwtCommunicator const&) = default;
     virtual ~WwtCommunicator();
@@ -80,7 +76,6 @@ protected:
     properties::DVec2Property _equatorialAim;
     properties::FloatProperty _verticalFov;
     properties::IVec3Property _borderColor;
-    
 
     std::deque<int> _selectedImages;
     bool _hasLoadedImages{ false };
diff --git a/modules/skybrowser/include/wwtdatahandler.h b/modules/skybrowser/include/wwtdatahandler.h
index ab765087ed..974ded0923 100644
--- a/modules/skybrowser/include/wwtdatahandler.h
+++ b/modules/skybrowser/include/wwtdatahandler.h
@@ -6,12 +6,6 @@
 #include <openspace/documentation/documentation.h>
 #include <unordered_map>
 
-// For speck loading
-#include <ghoul/glm.h>
-#include <ghoul/misc/boolean.h>
-#include <filesystem>
-#include <optional>
-
 namespace openspace::documentation { struct Documentation; }
 
 namespace openspace::wwt {
@@ -52,7 +46,6 @@ namespace openspace {
 	class WwtDataHandler {
 	
 	public:
-        // Constructor and destructor
 		WwtDataHandler() = default;
 		~WwtDataHandler();
 
@@ -62,7 +55,6 @@ namespace openspace {
         const ImageData& getImage(int i) const;
 
 	private:
-
         void saveImageFromNode(tinyxml2::XMLElement* node, std::string collection);
         void saveImagesFromXml(tinyxml2::XMLElement* root, std::string collection);
 
@@ -73,7 +65,6 @@ namespace openspace {
 
 		// 3D position data loaded from speck files
 		std::unordered_map<std::string, glm::dvec3> _3dPositions;
-        
 	};
 }
 
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index 02e2d62e12..736548efc8 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -27,7 +27,13 @@
 
 #include <modules/skybrowser/include/renderableskybrowser.h>
 #include <modules/skybrowser/include/screenspaceskybrowser.h>
+#include <modules/skybrowser/include/pair.h>
+#include <modules/skybrowser/include/screenspaceskytarget.h>
+#include <modules/skybrowser/include/wwtdatahandler.h>
+#include <modules/base/rendering/screenspaceimagelocal.h>
 #include "skybrowsermodule_lua.inl"
+#include <openspace/scene/scene.h>
+#include <openspace/scene/scenegraphnode.h>
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/navigation/navigationhandler.h>
@@ -710,9 +716,9 @@ void SkyBrowserModule::lookAt3dBrowser() {
 void SkyBrowserModule::place3dBrowser(const ImageData& image, const int i)
 {
     // If the image has a 3D position, add it to the scene graph
-    if (image.has3dCoords && get3dBrowser()) {
-        get3dBrowser()->displayImage(image.imageUrl, i);
-        get3dBrowser()->placeAt3dPosition(image.position3d, image.fov);
+    if (image.has3dCoords && _browser3d) {
+        _browser3d->displayImage(image.imageUrl, i);
+        _browser3d->placeAt3dPosition(image.position3d, image.fov);
     }
     else {
         LINFO("Image has no 3D coordinate!");
diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h
index 9764582b95..243682dbba 100644
--- a/modules/skybrowser/skybrowsermodule.h
+++ b/modules/skybrowser/skybrowsermodule.h
@@ -25,13 +25,7 @@
 #ifndef __OPENSPACE_MODULE_SKYBROWSER___SKYBROWSERMODULE___H__
 #define __OPENSPACE_MODULE_SKYBROWSER___SKYBROWSERMODULE___H__
 
-
-#include <modules/skybrowser/include/pair.h>
-#include <modules/skybrowser/include/screenspaceskytarget.h>
-#include <modules/skybrowser/include/wwtdatahandler.h>
-#include <modules/base/rendering/screenspaceimagelocal.h>
 #include <openspace/documentation/documentation.h>
-#include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/openspacemodule.h>
 #include <openspace/util/distanceconstants.h>
 #include <fstream>
@@ -39,6 +33,11 @@
 namespace openspace {
 
 class RenderableSkyBrowser;
+class ScreenSpaceImageLocal;
+class WwtDataHandler;
+class Pair;
+class SceneGraphNode;
+class ImageData;
 
 enum class Transparency {
     Transparent,
@@ -105,8 +104,6 @@ protected:
     void internalDeinitialize() override;
 
 private:
-
-    
     // The browsers and targets
     std::vector<std::unique_ptr<Pair>> _targetsBrowsers;
     Pair* _mouseOnPair{ nullptr };
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index 56ab2b2479..220741f15c 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -5,7 +5,6 @@
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/scene/scene.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index b8bf7e5516..91fceae7dc 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -1,7 +1,7 @@
 #include <modules/skybrowser/include/wwtdatahandler.h>
 
 #include <modules/skybrowser/include/utility.h>
-
+#include <modules/space/speckloader.h>
 #include <openspace/util/httprequest.h> // For downloading files from url
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>