From 904811f60d3e8b900d24c7b074d7e79ed466f81d Mon Sep 17 00:00:00 2001
From: Emil Axelsson <emil.axelsson@liu.se>
Date: Tue, 13 Aug 2019 11:28:33 +0200
Subject: [PATCH] Small cleanup

---
 include/openspace/rendering/renderer.h              |  2 +-
 .../atmosphere/rendering/renderableatmosphere.cpp   |  7 +++----
 modules/base/rendering/renderabletrail.cpp          |  1 -
 modules/base/shaders/renderabletrail_fs.glsl        | 13 +------------
 shaders/fragment.glsl                               |  1 -
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/include/openspace/rendering/renderer.h b/include/openspace/rendering/renderer.h
index 92f2857428..b17e0f613b 100644
--- a/include/openspace/rendering/renderer.h
+++ b/include/openspace/rendering/renderer.h
@@ -41,7 +41,7 @@ class RenderableVolume;
 class Camera;
 class Scene;
 
-class Renderer {    
+class Renderer {
 public:
     virtual ~Renderer() = default;
 
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index 232a70b011..fd931c251f 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -406,15 +406,14 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         }
         
         if (atmosphereDictionary.hasKey(SunIntensityInfo.identifier)) {
-            _sunRadianceIntensity = atmosphereDictionary.value<float>(
-                                                               SunIntensityInfo.identifier
-                                                              );
+            _sunRadianceIntensity =
+                atmosphereDictionary.value<float>(SunIntensityInfo.identifier);
         }
         
         if (atmosphereDictionary.hasKey(MieScatteringExtinctionPropCoeffInfo.identifier)) {
             _mieScattExtPropCoefProp = atmosphereDictionary.value<float>(
                 MieScatteringExtinctionPropCoeffInfo.identifier
-                );
+            );
         }
 
         if (!atmosphereDictionary.getValue(
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 25eac54d6e..0ef5160223 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -181,7 +181,6 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
 
     setRenderBin(RenderBin::Transparent);
     addProperty(_opacity);
-    //registerUpdateRenderBinFromOpacity();
 
     _translation = Translation::createFromDictionary(
         dictionary.value<ghoul::Dictionary>(KeyTranslation)
diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl
index 6dc1eef809..4482761a7e 100644
--- a/modules/base/shaders/renderabletrail_fs.glsl
+++ b/modules/base/shaders/renderabletrail_fs.glsl
@@ -46,8 +46,6 @@ Fragment getFragment() {
     frag.depth = vs_positionScreenSpace.w;
     frag.blend = BLEND_MODE_ADDITIVE;
 
-    vec4 depthCorrection = vec4(0.0, 0.0, 100.0, 0.0);
-
     if (renderPhase == RenderPhasePoints) {
         // Use the length of the vector (dot(circCoord, circCoord)) as factor in the
         // smoothstep to gradually decrease the alpha on the edges of the point
@@ -62,19 +60,10 @@ Fragment getFragment() {
         frag.color.a = transparencyCorrection;
     }
 
-    if (frag.color.a < 0.2f)
-        discard;
-    
-    // G-Buffer
-    // JCC: The depthCorrection here is a temporary tweak
-    // to fix precision problems.
-    frag.gPosition = vs_gPosition + depthCorrection;
+    frag.gPosition = vs_gPosition;
 
     // There is no normal here
     frag.gNormal = vec4(0.0, 0.0, -1.0, 1.0);
 
-    // Bloom filter
-    frag.filterFlag = 1;
-
     return frag;
 }
diff --git a/shaders/fragment.glsl b/shaders/fragment.glsl
index a4f4c9bf5a..6e5c67a9e0 100644
--- a/shaders/fragment.glsl
+++ b/shaders/fragment.glsl
@@ -32,7 +32,6 @@ struct Fragment {
     vec4 color;
     vec4 gPosition;
     vec4 gNormal;
-    uint filterFlag;
     float depth;
     uint blend;
     bool forceFboRendering;