From 86fbde2af8f5939155672ca1dad913b7d6508f4c Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylvse560@student.liu.se>
Date: Wed, 9 Jun 2021 09:28:34 +0200
Subject: [PATCH] Bugfix and better destruction of WWTDataHandler in module

---
 modules/skybrowser/shaders/target_fs.glsl       | 6 +++---
 modules/skybrowser/skybrowsermodule.cpp         | 5 ++++-
 modules/skybrowser/skybrowsermodule.h           | 2 +-
 modules/skybrowser/src/screenspaceskytarget.cpp | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/skybrowser/shaders/target_fs.glsl b/modules/skybrowser/shaders/target_fs.glsl
index 10e66f13f7..94929fe378 100644
--- a/modules/skybrowser/shaders/target_fs.glsl
+++ b/modules/skybrowser/shaders/target_fs.glsl
@@ -1,4 +1,4 @@
-uniform sampler2D texture1;
+uniform sampler2D texture;
 uniform float borderWidth;
 uniform vec2 targetDimensions;
 uniform bool showCrosshair;
@@ -34,8 +34,8 @@ Fragment getFragment() {
     float border_crosshair_bl = step(borderWidth*ratio*4, vs_st.x) * step(borderWidth*ratio*4, (1.0)-vs_st.x);
     float border_crosshair_tr = step(borderWidth*4, vs_st.y) * step(borderWidth*4, (1.0)-vs_st.y);
     vec3 crosshair_small = vec3(border_crosshair_bl*border_crosshair_tr);
-    
-    vec3 crosshair_inside_border = vec3(crossLine(crosshair_small.x * crosshair_border_linewidth, (vs_st).x) 
+
+    vec3 crosshair_inside_border = vec3(crossLine(crosshair_small.x * crosshair_border_linewidth, (vs_st).x)
     + crossLine(crosshair_small.y * crosshair_border_linewidth, (vs_st).y));
     vec3 crosshair_and_border =  (1.0 - border) + crosshair_inside_border;
 
diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp
index 8d9a9b2516..5a91cfda63 100644
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -474,10 +474,13 @@ SkyBrowserModule::SkyBrowserModule()
     });
 } 
 
-void SkyBrowserModule::internalDeinitialize() {
+SkyBrowserModule::~SkyBrowserModule() {
     delete dataHandler;
 }
 
+void SkyBrowserModule::internalDeinitialize() {
+}
+
 void SkyBrowserModule::internalInitialize(const ghoul::Dictionary& dict) {
     
     const Parameters p = codegen::bake<Parameters>(dict);
diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h
index a71be0b5ae..756319f7f8 100644
--- a/modules/skybrowser/skybrowsermodule.h
+++ b/modules/skybrowser/skybrowsermodule.h
@@ -55,7 +55,7 @@ public:
     constexpr static const int FROM_URL = 1;
 
     SkyBrowserModule();
-    virtual ~SkyBrowserModule() = default;
+    virtual ~SkyBrowserModule();
     glm::vec2 getMousePositionInScreenSpaceCoords(glm::vec2& mousePos);
     void addRenderable(ScreenSpaceRenderable* object);
     WWTDataHandler* getWWTDataHandler();
diff --git a/modules/skybrowser/src/screenspaceskytarget.cpp b/modules/skybrowser/src/screenspaceskytarget.cpp
index 74043e378a..ec8f0f0841 100644
--- a/modules/skybrowser/src/screenspaceskytarget.cpp
+++ b/modules/skybrowser/src/screenspaceskytarget.cpp
@@ -39,7 +39,7 @@ namespace {
     };
 
     constexpr const std::array<const char*, 8> UniformNames = {
-        "ModelTransform", "ViewProjectionMatrix", "texture1", "showCrosshair", "showCrosshairInTarget", "borderWidth", "targetDimensions", "borderColor"
+        "ModelTransform", "ViewProjectionMatrix", "texture", "showCrosshair", "showCrosshairInTarget", "borderWidth", "targetDimensions", "borderColor"
     };
 
     constexpr const openspace::properties::Property::PropertyInfo BrowserIDInfo =