From 34be850afbbacb0e283410b1eb084116dc95dca1 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Mon, 28 Jun 2021 21:06:54 -0600
Subject: [PATCH 01/47] Potential fix for pause during
 playback-with-screenshots

---
 src/interaction/sessionrecording.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 052f10c90c..5ae52a2bbb 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -1773,12 +1773,10 @@ void SessionRecording::moveAheadInTime() {
             global::navigationHandler->orbitalNavigator().anchorNode();
         const Renderable* focusRenderable = focusNode->renderable();
         if (!focusRenderable || focusRenderable->renderedWithDesiredData()) {
-            if (!paused) {
-                _saveRenderingCurrentRecordedTime_interpolation +=
-                    _saveRenderingDeltaTime_interpolation_usec;
-               _saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
-                global::renderEngine->takeScreenshot();
-            }
+            _saveRenderingCurrentRecordedTime_interpolation +=
+                _saveRenderingDeltaTime_interpolation_usec;
+            saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
+            global::renderEngine->takeScreenshot();
         }
     }
 }

From 24b48734c861997d37343f3a1071173683aadf40 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Tue, 29 Jun 2021 08:44:52 -0600
Subject: [PATCH 02/47] Fixed a typo that slipped in

---
 src/interaction/sessionrecording.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 5ae52a2bbb..12db50a73f 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -1775,7 +1775,7 @@ void SessionRecording::moveAheadInTime() {
         if (!focusRenderable || focusRenderable->renderedWithDesiredData()) {
             _saveRenderingCurrentRecordedTime_interpolation +=
                 _saveRenderingDeltaTime_interpolation_usec;
-            saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
+            _saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
             global::renderEngine->takeScreenshot();
         }
     }

From 8226c9d8d005fdfd1ac0c164d52b7f48b30df723 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Tue, 6 Jul 2021 19:24:27 -0600
Subject: [PATCH 03/47] Added code from Emma to allow pausing during
 playback-with-frames

---
 src/interaction/sessionrecording.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 5a3ceb57cb..6a0a80064f 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -1771,7 +1771,8 @@ void SessionRecording::moveAheadInTime() {
     using namespace std::chrono;
 
     bool paused = global::timeManager->isPaused();
-    if (_state == SessionState::PlaybackPaused) {
+    bool playbackPaused = (_state == SessionState::PlaybackPaused);
+    if (playbackPaused) {
         _playbackPauseOffset
             += global::windowDelegate->applicationTime() - _previousTime;
     }
@@ -1793,10 +1794,12 @@ void SessionRecording::moveAheadInTime() {
             global::navigationHandler->orbitalNavigator().anchorNode();
         const Renderable* focusRenderable = focusNode->renderable();
         if (!focusRenderable || focusRenderable->renderedWithDesiredData()) {
-            _saveRenderingCurrentRecordedTime_interpolation +=
-                _saveRenderingDeltaTime_interpolation_usec;
-            _saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
-            global::renderEngine->takeScreenshot();
+            if (!playbackPaused) {
+                _saveRenderingCurrentRecordedTime_interpolation +=
+                    _saveRenderingDeltaTime_interpolation_usec;
+                _saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
+                global::renderEngine->takeScreenshot();
+            }
         }
     }
 }

From 14af0e5a93ac37d69b7b5be72889fd313aa555a6 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Sun, 11 Jul 2021 14:43:54 -0600
Subject: [PATCH 04/47] Time manager uses simulated application time during
 playback-with-frames

---
 .../openspace/interaction/sessionrecording.h  | 14 +++++++++++
 include/openspace/scene/scene.h               |  2 +-
 include/openspace/util/timemanager.h          |  1 +
 src/interaction/sessionrecording.cpp          |  9 +++++++
 src/scene/scene.cpp                           | 24 +++++++++----------
 src/util/timemanager.cpp                      | 21 ++++++++++++----
 6 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 6e7167e8b3..bc3adea797 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -145,6 +145,19 @@ public:
      */
     std::chrono::steady_clock::time_point currentPlaybackInterpolationTime() const;
 
+    /**
+     * Returns the simulated application time. This simulated application time is only
+     * used when playback is set to be in the mode where a screenshot is captured with
+     * every rendered frame (enableTakeScreenShotDuringPlayback() is used to enable this
+     * mode). At the start of playback, this timer is set to the value of the current
+     * applicationTime function provided by the window delegate (used during normal
+     * mode or playback). However, during playback it is incremented by the fixed
+     * framerate of the playback rather than the actual clock value.
+     *
+     * \returns application time in seconds, for use in playback-with-frames mode
+     */
+    double currentApplicationInterpolationTime() const;
+
     /**
      * Starts a recording session, which will save data to the provided filename
      * according to the data format specified, and will continue until recording is
@@ -719,6 +732,7 @@ protected:
     double _saveRenderingCurrentRecordedTime;
     std::chrono::steady_clock::duration _saveRenderingDeltaTime_interpolation_usec;
     std::chrono::steady_clock::time_point _saveRenderingCurrentRecordedTime_interpolation;
+    double _saveRenderingCurrentApplicationTime_interpolation;
     long long _saveRenderingClockInterpolation_countsPerSec;
     bool _saveRendering_isFirstFrame = true;
 
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index fc22f6d1e2..f1a03be8e5 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -238,7 +238,7 @@ private:
      * Update dependencies.
      */
     void updateNodeRegistry();
-
+    std::chrono::steady_clock::time_point currentTimeForInterpolation();
     void sortTopologically();
 
     std::unique_ptr<Camera> _camera;
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index d7500939c6..a67bcef09b 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -127,6 +127,7 @@ private:
 
     void addDeltaTimesKeybindings();
     void clearDeltaTimesKeybindings();
+    double currentApplicationTimeForInterpolation() const;
 
     Timeline<TimeKeyframeData> _timeline;
     SyncData<Time> _currentTime;
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 6a0a80064f..8dd838f449 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -472,6 +472,8 @@ void SessionRecording::initializePlayback_time(double now) {
     _timestampPlaybackStarted_simulation = global::timeManager->time().j2000Seconds();
     _timestampApplicationStarted_simulation = _timestampPlaybackStarted_simulation - now;
     _saveRenderingCurrentRecordedTime_interpolation = steady_clock::now();
+    _saveRenderingCurrentApplicationTime_interpolation =
+        global::windowDelegate->applicationTime();
     _saveRenderingClockInterpolation_countsPerSec =
         system_clock::duration::period::den / system_clock::duration::period::num;
     _playbackPauseOffset = 0.0;
@@ -1181,6 +1183,11 @@ SessionRecording::currentPlaybackInterpolationTime() const
     return _saveRenderingCurrentRecordedTime_interpolation;
 }
 
+double SessionRecording::currentApplicationInterpolationTime() const
+{
+    return _saveRenderingCurrentApplicationTime_interpolation;
+}
+
 bool SessionRecording::playbackCamera() {
     Timestamps times;
     datamessagestructures::CameraKeyframe kf;
@@ -1798,6 +1805,8 @@ void SessionRecording::moveAheadInTime() {
                 _saveRenderingCurrentRecordedTime_interpolation +=
                     _saveRenderingDeltaTime_interpolation_usec;
                 _saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
+                _saveRenderingCurrentApplicationTime_interpolation +=
+                    _saveRenderingDeltaTime;
                 global::renderEngine->takeScreenshot();
             }
         }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index d39208d1a1..786b652d67 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -474,6 +474,16 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
     return rawNodePointer;
 }
 
+std::chrono::steady_clock::time_point Scene::currentTimeForInterpolation()
+{
+    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
+        return global::sessionRecording->currentPlaybackInterpolationTime();
+    }
+    else {
+        return std::chrono::steady_clock::now();
+    }
+}
+
 void Scene::addPropertyInterpolation(properties::Property* prop, float durationSeconds,
                              ghoul::EasingFunction easingFunction)
 {
@@ -496,11 +506,7 @@ void Scene::addPropertyInterpolation(properties::Property* prop, float durationS
         ghoul::easingFunction<float>(easingFunction);
 
     // First check if the current property already has an interpolation information
-    std::chrono::steady_clock::time_point now = (
-        global::sessionRecording->isSavingFramesDuringPlayback()     ?
-        global::sessionRecording->currentPlaybackInterpolationTime() :
-        std::chrono::steady_clock::now()
-    );
+    std::chrono::steady_clock::time_point now = currentTimeForInterpolation();
     for (PropertyInterpolationInfo& info : _propertyInterpolationInfos) {
         if (info.prop == prop) {
             info.beginTime = now;
@@ -550,13 +556,7 @@ void Scene::updateInterpolations() {
 
     using namespace std::chrono;
 
-    steady_clock::time_point now;
-    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
-        now = global::sessionRecording->currentPlaybackInterpolationTime();
-    }
-    else {
-        now = steady_clock::now();
-    }
+    steady_clock::time_point now = currentTimeForInterpolation();
     // First, let's update the properties
     for (PropertyInterpolationInfo& i : _propertyInterpolationInfos) {
         long long usPassed = duration_cast<std::chrono::microseconds>(
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 52189d09d7..1bf1047163 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -27,6 +27,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/keybindingmanager.h>
+#include <openspace/interaction/sessionrecording.h>
 #include <openspace/network/parallelpeer.h>
 #include <openspace/util/keys.h>
 #include <openspace/util/timeline.h>
@@ -112,7 +113,7 @@ TimeManager::TimeManager()
 void TimeManager::interpolateTime(double targetTime, double durationSeconds) {
     ghoul_precondition(durationSeconds > 0.f, "durationSeconds must be positive");
 
-    const double now = global::windowDelegate->applicationTime();
+    const double now = currentApplicationTimeForInterpolation();
     const bool pause = isPaused();
 
     const TimeKeyframeData current = { time(), deltaTime(), false, false };
@@ -129,7 +130,7 @@ void TimeManager::interpolateTimeRelative(double delta, double durationSeconds)
     const float duration = global::timeManager->defaultTimeInterpolationDuration();
 
     const TimeKeyframeData predictedTime = interpolate(
-        global::windowDelegate->applicationTime() + duration
+        currentApplicationTimeForInterpolation() + duration
     );
     const double targetTime = predictedTime.time.j2000Seconds() + delta;
     interpolateTime(targetTime, durationSeconds);
@@ -262,7 +263,7 @@ void TimeManager::progressTime(double dt) {
         return;
     }
 
-    const double now = global::windowDelegate->applicationTime();
+    const double now = currentApplicationTimeForInterpolation();
     const std::deque<Keyframe<TimeKeyframeData>>& keyframes = _timeline.keyframes();
 
     auto firstFutureKeyframe = std::lower_bound(
@@ -713,7 +714,7 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
         return;
     }
 
-    const double now = global::windowDelegate->applicationTime();
+    const double now = currentApplicationTimeForInterpolation();
     Time newTime(
         time().j2000Seconds() + (_deltaTime + newDeltaTime) * 0.5 * interpolationDuration
     );
@@ -809,7 +810,7 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
         return;
     }
 
-    const double now = global::windowDelegate->applicationTime();
+    const double now = currentApplicationTimeForInterpolation();
     double targetDelta = pause ? 0.0 : _targetDeltaTime;
     Time newTime(
         time().j2000Seconds() + (_deltaTime + targetDelta) * 0.5 * interpolationDuration
@@ -826,4 +827,14 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
     addKeyframe(now + interpolationDuration, futureKeyframe);
 }
 
+double TimeManager::currentApplicationTimeForInterpolation() const
+{
+    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
+        return global::sessionRecording->currentApplicationInterpolationTime();
+    }
+    else {
+        return global::windowDelegate->applicationTime();
+    }
+}
+
 } // namespace openspace

From 7461303aa5e2072a090a2145a4d2ff3d06f3a496 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Tue, 13 Jul 2021 09:03:49 +0200
Subject: [PATCH 05/47] Fix to make slide deck work with new strict Lua

---
 data/assets/examples/slidedeck.asset | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/assets/examples/slidedeck.asset b/data/assets/examples/slidedeck.asset
index fdd3756450..7d054dd2c1 100644
--- a/data/assets/examples/slidedeck.asset
+++ b/data/assets/examples/slidedeck.asset
@@ -15,17 +15,18 @@ asset.onInitialize(function ()
 
   local interpolationDuration = 0.5
 
-  function nextSlide()
-    helper.goToNextSlide(deck, interpolationDuration)
-  end
+  -- Add global functions for controlling slide deck and bind to keys
+  rawset(_G, "nextSlide", function()
+    helper.goToNextSlide(deck, interpolationDuration) 
+  end)
 
-  function previousSlide()
+  rawset(_G, "previousSlide", function()
     helper.goToPreviousSlide(deck, interpolationDuration)
-  end
+  end)
 
-  function toggleSlides()
+  rawset(_G, "toggleSlides", function()
     helper.toggleSlides(deck, interpolationDuration)
-  end
+  end)
 
   helper.setCurrentSlide(deck, 1)
   openspace.bindKey("KP_6", "nextSlide()", "Next slide", "Next slide", "/Slides")

From 3069457d674b71497b5fe1e361c3850672650e44 Mon Sep 17 00:00:00 2001
From: Micah <micahnyc@gmail.com>
Date: Wed, 14 Jul 2021 11:48:50 -0400
Subject: [PATCH 06/47] added new launcher images for v17

---
 data/assets/util/launcher_images.asset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/assets/util/launcher_images.asset b/data/assets/util/launcher_images.asset
index 32098b0c64..d2fd2efe90 100644
--- a/data/assets/util/launcher_images.asset
+++ b/data/assets/util/launcher_images.asset
@@ -2,6 +2,6 @@ local DataPath = asset.syncedResource({
   Name = "Launcher Images",
   Type = "HttpSynchronization",
   Identifier = "launcher_images",
-  Version = 1
+  Version = 2
 })
 asset.export("DataPath", DataPath)

From 3025fbc200ffdd8cf80f95c5f251d0daf793fbdf Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 15 Jul 2021 16:18:45 +0200
Subject: [PATCH 07/47] Initialize OpenGLCache to nullptr to prevent faulty
 memory access (thanks Marco S)

---
 include/openspace/rendering/renderengine.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 28cee7e43a..d32734712c 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -194,7 +194,7 @@ private:
     ghoul::Dictionary _resolveData;
     ScreenLog* _log = nullptr;
 
-    ghoul::opengl::OpenGLStateCache* _openglStateCache;
+    ghoul::opengl::OpenGLStateCache* _openglStateCache = nullptr;
 
     properties::BoolProperty _showOverlayOnSlaves;
     properties::BoolProperty _showLog;

From 58c216f45c42783253e43963489164bf47319a57 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Fri, 16 Jul 2021 14:18:10 +0200
Subject: [PATCH 08/47] Show an info message when asset is added by
 drag-and-drop

---
 scripts/drag_drop_handler.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua
index 7042333633..fc51b0935c 100644
--- a/scripts/drag_drop_handler.lua
+++ b/scripts/drag_drop_handler.lua
@@ -37,7 +37,8 @@ if is_image_file(extension) then
     TexturePath = "]] .. filename .. [["
   });]]
 elseif extension == ".asset" then
-  return [[openspace.asset.add("]] .. filename .. [[")]]
+  return [[openspace.printInfo("Adding asset: ']] .. filename .. [[' (drag-and-drop)");
+    openspace.asset.add("]] .. filename .. [[");]]
 elseif extension == ".osrec" or extension == ".osrectxt" then
   return [[openspace.sessionRecording.startPlayback("]] .. basename .. [[")]]
 end

From d8c5be734fb8043760839d0b6f970ae785a92f59 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 19 Jul 2021 14:01:14 +0200
Subject: [PATCH 09/47] Add a cropped version of the OpenSpace logo

---
 data/openspace-horiz-logo-crop.png | Bin 0 -> 62913 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 data/openspace-horiz-logo-crop.png

diff --git a/data/openspace-horiz-logo-crop.png b/data/openspace-horiz-logo-crop.png
new file mode 100644
index 0000000000000000000000000000000000000000..05ae6643e0070a33d0e1c4ddab7570874361e34e
GIT binary patch
literal 62913
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
XcI|n)n$TG$1pe6^wmVd4g}L#+SO6%r

literal 0
HcmV?d00001


From 7a9bcf476266935ee2e2cbfdf776ddb4fc462cf3 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 19 Jul 2021 14:59:41 +0200
Subject: [PATCH 10/47] Update README.md

---
 README.md | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 19d721dd2a..1e17b0e290 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,47 @@
-[OpenSpace](http://openspaceproject.com) is an open source, non-commercial, and freely available interactive data visualization software designed to visualize the entire known universe and portray our ongoing efforts to investigate the cosmos. Bringing the latest techniques from data visualization research to the general public, OpenSpace supports interactive presentation of dynamic data from observations, simulations, and space mission planning and operations. The software works on multiple operating systems (Windows, Linux, MacOS) with an extensible architecture powering high resolution tiled displays and planetarium domes, making use of the latest graphic card technologies for rapid data throughput. In addition, OpenSpace enables simultaneous connections across the globe creating opportunity for shared experiences among audiences worldwide.
+![OpenSpace Logo](/data/openspace-horiz-logo-crop.png)
+[OpenSpace](http://openspaceproject.com) is an open source, non-commercial, and freely available interactive data visualization software designed to visualize the entire known universe and portray our ongoing efforts to investigate the cosmos.  Bringing the latest techniques from data visualization research to the general public, OpenSpace supports interactive presentation of dynamic data from observations, simulations, and space mission planning and operations.  The software works on multiple operating systems (Windows, Linux, MacOS) with an extensible architecture capable of powering both personal computers and also high resolution tiled displays and planetarium domes.  In addition, OpenSpace enables simultaneous connections across the globe creating opportunity for shared experiences among audiences worldwide.  The target audience of the software reaches from the general public who wishes to explore our universe, enthusiasts interested in hacking the underlying components in OpenSpace to create unique experiences, informal science institutions wishing to create a low-cost, yet powerful exhibition piece, but also scientists desiring to visualize their datasets in a contextualized, powerful software.
 
-The project stems from the same academic collaboration between Sweden’s [Linköping University](https://www.liu.se) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH) that led to the creation of Uniview and its parent company [SCISS](http://sciss.se). Development of the software began several years ago through a close collaboration with NASA Goddard’s [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA’s New Horizons mission to Pluto and ESA’s Rosetta mission. This promising set of preliminary work provided a foundation for recent NASA funding, which has extended the collaboration to include the University of Utah’s [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)’s Tandon School of Engineering, multiple informal science institutions across the United States, and multiple, international vendors. Current areas of focus within OpenSpace include:
+[![License](https://img.shields.io/badge/License-MIT-purple.svg?style=flat-square)](LICENSE)
+[![Download](https://img.shields.io/github/v/tag/OpenSpace/OpenSpace?label=Version&color=maroon&style=flat-square)](https://www.openspaceproject.com/installation)
+![Size](https://img.shields.io/github/repo-size/OpenSpace/OpenSpace?style=flat-square&color=red)
 
-- Visualization of dynamic simulations via interactive volumetric rendering, as a priority for communicating research in astrophysics.
-- Utilization of NASA’s SPICE observational geometry system with its Planetary Data Service (PDS) to enable space mission visualizations that reveal how missions are designed to gather science.
-- Globe browsing techniques across spatial and temporal scales to examine scientific campaigns on multiple planets, including close up surface exploration.
+[![System Paper](https://img.shields.io/badge/System%20Paper-10.1109%2FTVCG.2019.2934259-blue?style=flat-square)](https://doi.org/10.1109/TVCG.2019.2934259)
+[![GlobeBrowsing Paper](https://img.shields.io/badge/GlobeBrowsing%20Paper-https%3A%2F%2Fdoi.org%2F10.1109%2FTVCG.2017.2743958-blue?style=flat-square)](https://doi.org/10.1109/TVCG.2017.2743958)
 
-OpenSpace requires graphics support for [OpenGL](https://www.opengl.org/) version 3.3.
+![Contributors](https://img.shields.io/github/contributors/OpenSpace/OpenSpace?style=flat-square)
+![Commits](https://img.shields.io/github/commit-activity/m/OpenSpace/OpenSpace?color=green&style=flat-square)
 
-This repository contains the source code and example scenes for OpenSpace, but does not contain any data. To build and install the client, we refer to the [OpenSpace Wiki](http://wiki.openspaceproject.com/), specifically [building](http://wiki.openspaceproject.com/docs/developers/compiling/general) for [Windows](http://wiki.openspaceproject.com/docs/developers/compiling/windows), [Linux (Ubuntu)](http://wiki.openspaceproject.com/docs/developers/compiling/ubuntu), and [MacOS](http://wiki.openspaceproject.com/docs/developers/compiling/macos). Required preexisting dependencies are: [Boost](http://www.boost.org/) and [Qt](http://www.qt.io/download). Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:alexander.bock@me.com?subject=OpenSpace:).
+![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/collection.jpg)
 
-Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-37niq6y9-T0JaCIk4UoFLI4VF5U9Vsw).
+# Background
+OpenSpace started as a collaboration between Sweden's [Linköping University](https://scivis.github.io) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH).  Development of the software began several years ago through a close collaboration with NASA Goddard's [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA's New Horizons mission to Pluto and ESA's Rosetta mission to 67P/Churyumov–Gerasimenko.  This promising set of preliminary work provided a foundation for continued funding from NASA, the Swedish eScience Research Centre, and the Knut and Alice Wallenberg foundation, which has extended the collaboration to include the University of Utah's [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)'s Tandon School of Engineering, multiple informal science institutions across the world, and multiple, international vendors.
+
+![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/presentation.jpg)
+
+# Features
+Some of the high-level features supported in OpenSpace are:
+ - AMNH's Digital Universe catalog of extrasolar datasets (stars, galaxies, quasars, ...)
+ - High-resolution planetary images for major objects in the solar system (Earth, Moon, Mars, Venus, ...)
+ - Animated 3D models representing space missions (ISS, New Horizons, JWST, ...)
+ - Support for custom profiles with arbitrary user-defined content
+ - Ability to drive any type of display environment (flat screen, multi-projector, planetariums, ...)
+ - Lua and JavaScript interface into the engine allowing highly customized controls
+ - Native support to export an interactive sessions as individual frames for video export
+ - much much more (see our [Changelog](http://wiki.openspaceproject.com/docs/general/releases))
+
+OpenSpace requires at least support for [OpenGL](https://www.opengl.org/) version 3.3, some custom components require at least version 4.2.
+
+![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/display-systems.jpg)
+
+# Getting Started
+This repository contains the source code and example profiles for OpenSpace, but does not contain any data.  To build and install the application, please check out the [OpenSpace Wiki](http://wiki.openspaceproject.com/).  Here, you will find two pages, a [build instruction](http://wiki.openspaceproject.com/docs/developers/compiling/general) for all operating systems and then additional instructions for [Windows](http://wiki.openspaceproject.com/docs/developers/compiling/windows), [Linux (Ubuntu)](http://wiki.openspaceproject.com/docs/developers/compiling/ubuntu), and [MacOS](http://wiki.openspaceproject.com/docs/developers/compiling/macos).
+
+Requirements for compiling are:
+ - CMake version 3.10 or above
+ - C++ compiler supporting C++17 (MSVC 16.10, GCC9, Clang10)
+ - [Boost](http://www.boost.org/)
+ - [Qt](http://www.qt.io/download)
+
+Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:openspace@amnh.org?subject=OpenSpace:).  Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-37niq6y9-T0JaCIk4UoFLI4VF5U9Vsw).
+
+![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/himalaya-nkpg-dome.jpg)

From 385bafeb3aba5d0d3c34c3c95226d8ed5eaa0df5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 19 Jul 2021 16:24:07 +0200
Subject: [PATCH 11/47] Clean up the language detection on GitHub

---
 .gitattributes | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 6f15cde045..e19106b7fe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,14 @@
 * text=auto
 
+# Correct GitHub's language detection shenanigans
+
+# Asset files are not Unity, but Lua instead
+*.asset linguist-language=Lua
+# We have some SPICE frame kernels that get misclassified as code
+.tf -linguist-detectable
+# We don't want to index the GDAL csv and xml files
+modules/globebrowsing/gdal_data/* linguist-vendored
+
 # GitHub files
 ATTRIBUTION text
 AUTHORS text

From ae339823e8e887212b581b7e8a9ed3c418343912 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 19 Jul 2021 16:26:31 +0200
Subject: [PATCH 12/47] Some refinement

---
 .gitattributes | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index e19106b7fe..1be02425ca 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,9 +5,13 @@
 # Asset files are not Unity, but Lua instead
 *.asset linguist-language=Lua
 # We have some SPICE frame kernels that get misclassified as code
-.tf -linguist-detectable
+*.tf -linguist-detectable
 # We don't want to index the GDAL csv and xml files
 modules/globebrowsing/gdal_data/* linguist-vendored
+# No need to index any external files
+*/ext/* linguist-vendored
+# No C allowed
+*.h linguist-language=C++
 
 # GitHub files
 ATTRIBUTION text

From 892adf62bfc225fca946613019b0bb0adeaa9b94 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Mon, 19 Jul 2021 23:33:10 -0600
Subject: [PATCH 13/47] Eliminate duplicate frames at time transitions when
 saving screenshot frames during playback

---
 include/openspace/util/timeline.h    | 10 +++++++
 include/openspace/util/timemanager.h |  4 ++-
 src/util/timeline.cpp                |  4 +++
 src/util/timemanager.cpp             | 41 ++++++++++++++++++++++++----
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index 60e71f25cc..1a9820d4be 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -95,6 +95,16 @@ bool compareTimeWithKeyframeTime(double a, const KeyframeBase& b);
 */
 bool compareKeyframeTimeWithTime(const KeyframeBase& a, double b);
 
+/**
+* Return true if the timestamp of a is smaller than or equal to b.
+* This is used only in the mode of saving render frames during session recording
+* playback. This was necessary to correct a small timing issue caused by fixing
+* the application time according to the playback framerate. In normal operation,
+* the application time at the instant the keyframes are evaluated is always a
+* little bit newer than the first keyframe in the timeline.
+*/
+bool compareKeyframeTimeWithTime_playbackWithFrames(const KeyframeBase& a, double b);
+
 } // namespace openspace
 
 #include "timeline.inl"
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index a67bcef09b..5914841073 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -121,13 +121,14 @@ public:
 
 private:
     void progressTime(double dt);
-    void applyKeyframeData(const TimeKeyframeData& keyframe);
+    void applyKeyframeData(const TimeKeyframeData& keyframe, double dt);
     TimeKeyframeData interpolate(const Keyframe<TimeKeyframeData>& past,
         const Keyframe<TimeKeyframeData>& future, double time);
 
     void addDeltaTimesKeybindings();
     void clearDeltaTimesKeybindings();
     double currentApplicationTimeForInterpolation() const;
+    double previousApplicationTimeForInterpolation() const;
 
     Timeline<TimeKeyframeData> _timeline;
     SyncData<Time> _currentTime;
@@ -140,6 +141,7 @@ private:
     bool _lastTimePaused = false;
     double _lastDeltaTime = 0.0;
     double _lastTargetDeltaTime = 0.0;
+    double _previousApplicationTime = 0.0;
 
     bool _deltaTimeStepsChanged = false;
     std::vector<double> _deltaTimeSteps;
diff --git a/src/util/timeline.cpp b/src/util/timeline.cpp
index 1ba5b61649..da8b05652b 100644
--- a/src/util/timeline.cpp
+++ b/src/util/timeline.cpp
@@ -38,4 +38,8 @@ bool compareKeyframeTimeWithTime(const KeyframeBase& a, double b) {
     return a.timestamp < b;
 }
 
+bool compareKeyframeTimeWithTime_playbackWithFrames(const KeyframeBase& a, double b) {
+    return a.timestamp <= b;
+}
+
 } // namespace
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 1bf1047163..ceb192313f 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -189,6 +189,7 @@ void TimeManager::preSynchronization(double dt) {
     _lastTimePaused = _timePaused;
     _deltaTimeStepsChanged = false;
     _timelineChanged = false;
+    _previousApplicationTime = currentApplicationTimeForInterpolation();
 }
 
 TimeKeyframeData TimeManager::interpolate(double applicationTime) {
@@ -266,11 +267,14 @@ void TimeManager::progressTime(double dt) {
     const double now = currentApplicationTimeForInterpolation();
     const std::deque<Keyframe<TimeKeyframeData>>& keyframes = _timeline.keyframes();
 
+    std::function<bool(const KeyframeBase&, double)> comparisonFunc =
+        (global::sessionRecording->isPlayingBack()) ?
+        &compareKeyframeTimeWithTime_playbackWithFrames : &compareKeyframeTimeWithTime;
     auto firstFutureKeyframe = std::lower_bound(
         keyframes.begin(),
         keyframes.end(),
         now,
-        &compareKeyframeTimeWithTime
+        comparisonFunc
     );
 
     const bool hasFutureKeyframes = firstFutureKeyframe != keyframes.end();
@@ -297,7 +301,7 @@ void TimeManager::progressTime(double dt) {
         _deltaTime = interpolated.delta;
     }
     else if (!hasConsumedLastPastKeyframe) {
-        applyKeyframeData(lastPastKeyframe->data);
+        applyKeyframeData(lastPastKeyframe->data, dt);
     }
     else if (!isPaused()) {
         // If there are no keyframes to consider
@@ -353,9 +357,15 @@ TimeKeyframeData TimeManager::interpolate(const Keyframe<TimeKeyframeData>& past
     return data;
 }
 
-void TimeManager::applyKeyframeData(const TimeKeyframeData& keyframeData) {
+void TimeManager::applyKeyframeData(const TimeKeyframeData& keyframeData, double dt) {
     const Time& currentTime = keyframeData.time;
-    _currentTime.data().setTime(currentTime.j2000Seconds());
+    _deltaTime = _timePaused ? 0.0 : _targetDeltaTime;
+    if (global::sessionRecording->isPlayingBack()) {
+        _currentTime.data().advanceTime(dt * _deltaTime);
+    }
+    else {
+        _currentTime.data().setTime(currentTime.j2000Seconds());
+    }
     _timePaused = keyframeData.pause;
     _targetDeltaTime = keyframeData.delta;
     _deltaTime = _timePaused ? 0.0 : _targetDeltaTime;
@@ -714,7 +724,7 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
         return;
     }
 
-    const double now = currentApplicationTimeForInterpolation();
+    double now = currentApplicationTimeForInterpolation();
     Time newTime(
         time().j2000Seconds() + (_deltaTime + newDeltaTime) * 0.5 * interpolationDuration
     );
@@ -724,6 +734,9 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
 
     _targetDeltaTime = newDeltaTime;
 
+    if (global::sessionRecording->isPlayingBack()) {
+        now = previousApplicationTimeForInterpolation();
+    }
     addKeyframe(now, currentKeyframe);
     addKeyframe(now + interpolationDuration, futureKeyframe);
 }
@@ -810,7 +823,7 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
         return;
     }
 
-    const double now = currentApplicationTimeForInterpolation();
+    double now = currentApplicationTimeForInterpolation();
     double targetDelta = pause ? 0.0 : _targetDeltaTime;
     Time newTime(
         time().j2000Seconds() + (_deltaTime + targetDelta) * 0.5 * interpolationDuration
@@ -820,6 +833,9 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
     TimeKeyframeData futureKeyframe = { newTime, _targetDeltaTime, pause, false };
     _timePaused = pause;
 
+    if (global::sessionRecording->isPlayingBack()) {
+        now = previousApplicationTimeForInterpolation();
+    }
     clearKeyframes();
     if (interpolationDuration > 0) {
         addKeyframe(now, currentKeyframe);
@@ -837,4 +853,17 @@ double TimeManager::currentApplicationTimeForInterpolation() const
     }
 }
 
+double TimeManager::previousApplicationTimeForInterpolation() const
+{
+    //If playing back with frames, this function needs to be called when a time rate
+    // interpolation (either speed change or pause) begins and ends. If the application
+    // time of the interpolation keyframe timestamp (when it was added to timeline) is
+    // exactly the same as when it is evaluated, then the interpolation math fails and
+    // two identical frames are generated at the begin & end. This only happens when the
+    // application time is forced to discrete intervals for a fixed rendering framerate.
+    // Using the previous frame render time fixes this problem. This doesn't adversely
+    // affect playback without frames.
+    return _previousApplicationTime;
+}
+
 } // namespace openspace

From e994e900ee3c8e6f018da3f2f4ec4778b57593c2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 22 Jul 2021 20:42:21 +0200
Subject: [PATCH 14/47] Feature/intel atmosphere (#1691)

* Add object names to atmosphere textures
* Fix for rendering atmospheres on Intel chips
* General cleanup of the atmosphere rendering code to make a it more modular
---
 .../solarsystem/planets/mars/atmosphere.asset |    1 -
 .../planets/venus/atmosphere.asset            |    1 -
 include/openspace/rendering/deferredcaster.h  |    2 -
 .../rendering/atmospheredeferredcaster.cpp    | 1808 +++++++----------
 .../rendering/atmospheredeferredcaster.h      |  124 +-
 .../rendering/renderableatmosphere.cpp        |   84 +-
 .../rendering/renderableatmosphere.h          |    6 +-
 .../atmosphere/shaders/atmosphere_common.glsl |  163 +-
 .../shaders/atmosphere_deferred_fs.glsl       |  153 +-
 .../atmosphere/shaders/calculation_vs.glsl    |    4 +-
 .../atmosphere/shaders/deltaE_calc_fs.glsl    |    2 -
 .../atmosphere/shaders/deltaJ_calc_fs.glsl    |   58 +-
 .../atmosphere/shaders/deltaS_calc_fs.glsl    |    4 +
 .../shaders/deltaS_sup_calc_fs.glsl           |   11 +-
 .../shaders/inScattering_calc_fs.glsl         |   25 +-
 .../shaders/inScattering_sup_calc_fs.glsl     |   18 +-
 .../shaders/irradiance_calc_fs.glsl           |   24 +-
 .../shaders/irradiance_final_fs.glsl          |    3 +-
 .../shaders/irradiance_sup_calc_fs.glsl       |   44 +-
 .../shaders/transmittance_calc_fs.glsl        |   21 +-
 src/rendering/framebufferrenderer.cpp         |   10 +-
 21 files changed, 1124 insertions(+), 1442 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
index a3f30d278d..e76b1afd57 100644
--- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
@@ -42,7 +42,6 @@ local Atmosphere = {
         G = 0.85
       },
       Debug = {
-        -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....)
         PreCalculatedTextureScale = 1.0,
         SaveCalculatedTextures = false
       }
diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
index a8d28ff7e4..7e39382692 100644
--- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
@@ -42,7 +42,6 @@ local Atmosphere = {
       G = 0.85
     },
     Debug = {
-      -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....)
       PreCalculatedTextureScale = 1.0,
       SaveCalculatedTextures = false
     }
diff --git a/include/openspace/rendering/deferredcaster.h b/include/openspace/rendering/deferredcaster.h
index 3d9f476848..c0b2f12d1e 100644
--- a/include/openspace/rendering/deferredcaster.h
+++ b/include/openspace/rendering/deferredcaster.h
@@ -51,8 +51,6 @@ public:
         const DeferredcastData& /*deferredData*/,
         ghoul::opengl::ProgramObject& /*program*/) {};
 
-    virtual std::filesystem::path deferredcastPath() const = 0;
-
     virtual std::filesystem::path deferredcastVSPath() const = 0;
 
     virtual std::filesystem::path deferredcastFSPath() const = 0;
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 1cf0fc71ce..90b8cb0f83 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -83,57 +83,39 @@ namespace {
     constexpr const float ATM_EPS = 2000.f;
     constexpr const float KM_TO_M = 1000.f;
 
-    void createRenderQuad(GLuint* vao, GLuint* vbo, GLfloat size) {
+    void createRenderQuad(GLuint* vao, GLuint* vbo) {
         glGenVertexArrays(1, vao);
-        glGenBuffers(1, vbo);
         glBindVertexArray(*vao);
+        glGenBuffers(1, vbo);
         glBindBuffer(GL_ARRAY_BUFFER, *vbo);
 
         const GLfloat VertexData[] = {
-            //  x      y    z    w
-            -size, -size, 0.f, 1.f,
-             size,  size, 0.f, 1.f,
-            -size,  size, 0.f, 1.f,
-            -size, -size, 0.f, 1.f,
-             size, -size, 0.f, 1.f,
-             size,  size, 0.f, 1.f
+            //  x      y    z
+            -1.f, -1.f,
+             1.f,  1.f,
+            -1.f,  1.f,
+            -1.f, -1.f,
+             1.f, -1.f,
+             1.f,  1.f,
         };
 
         glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData, GL_STATIC_DRAW);
-        glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
         glEnableVertexAttribArray(0);
+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
         glBindVertexArray(0);
     }
 
-    void saveTextureFile(GLenum colorBufferAttachment,
-                         const std::filesystem::path& fileName, const glm::ivec2& size)
-    {
-        std::fstream ppmFile;
-        ppmFile.open(fileName, std::fstream::out);
+    template <GLenum colorBufferAttachment = GL_COLOR_ATTACHMENT0>
+    void saveTextureFile(const std::filesystem::path& fileName, const glm::ivec2& size) {
+        std::ofstream ppmFile(fileName);
         if (!ppmFile.is_open()) {
             return;
         }
 
-        std::vector<unsigned char> px(
-            size.x * size.y * 3,
-            static_cast<unsigned char>(255)
-        );
+        std::vector<unsigned char> px(size.x * size.y * 3, unsigned char(255));
 
-        if (colorBufferAttachment != GL_DEPTH_ATTACHMENT) {
-            glReadBuffer(colorBufferAttachment);
-            glReadPixels(0, 0, size.x, size.y, GL_RGB, GL_UNSIGNED_BYTE, px.data());
-        }
-        else {
-            glReadPixels(
-                0,
-                0,
-                size.x,
-                size.y,
-                GL_DEPTH_COMPONENT,
-                GL_UNSIGNED_BYTE,
-                px.data()
-            );
-        }
+        glReadBuffer(colorBufferAttachment);
+        glReadPixels(0, 0, size.x, size.y, GL_RGB, GL_UNSIGNED_BYTE, px.data());
 
         ppmFile << "P3" << '\n' << size.x << " " << size.y << '\n' << "255" << '\n';
 
@@ -208,63 +190,119 @@ namespace {
         return true;
     }
 
-    void renderQuadForCalc(GLuint vao, GLsizei numberOfVertices) {
+    void renderQuadForCalc(GLuint vao) {
         glBindVertexArray(vao);
-        glDrawArrays(GL_TRIANGLES, 0, numberOfVertices);
+        glDrawArrays(GL_TRIANGLES, 0, 6);
         glBindVertexArray(0);
     }
+
+    GLuint createTexture(const glm::ivec2& size, std::string_view name) {
+        GLuint t;
+        glGenTextures(1, &t);
+        glBindTexture(GL_TEXTURE_2D, t);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
+        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+        glTexImage2D(
+            GL_TEXTURE_2D,
+            0,
+            GL_RGB32F,
+            size.x,
+            size.y,
+            0,
+            GL_RGB,
+            GL_FLOAT,
+            nullptr
+        );
+        if (glbinding::Binding::ObjectLabel.isResolved()) {
+            glObjectLabel(GL_TEXTURE, t, static_cast<GLsizei>(name.size()), name.data());
+        }
+        return t;
+    }
+
+    GLuint createTexture(const glm::ivec3& size, std::string_view name, int components) {
+        ghoul_assert(components == 3 || components == 4, "Only 3-4 components supported");
+
+        GLuint texture;
+        glGenTextures(1, &texture);
+        glBindTexture(GL_TEXTURE_3D, texture);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+        // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
+        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+        glTexImage3D(
+            GL_TEXTURE_3D,
+            0,
+            (components == 3) ? GL_RGB32F : GL_RGBA32F,
+            size.x,
+            size.y,
+            size.z,
+            0,
+            GL_RGB,
+            GL_FLOAT,
+            nullptr
+        );
+        if (glbinding::Binding::ObjectLabel.isResolved()) {
+            glObjectLabel(GL_TEXTURE, texture, name.size(), name.data());
+        }
+        return texture;
+    }
 } // namespace
 
 namespace openspace {
 
+AtmosphereDeferredcaster::AtmosphereDeferredcaster(float textureScale,
+                                       std::vector<ShadowConfiguration> shadowConfigArray,
+                                                              bool saveCalculatedTextures)
+    : _transmittanceTableSize(glm::ivec2(256 * textureScale, 64 * textureScale) )
+    , _irradianceTableSize(glm::ivec2(64 * textureScale, 16 * textureScale))
+    , _deltaETableSize(glm::ivec2(64 * textureScale, 16 * textureScale))
+    , _muSSamples(static_cast<int>(32 * textureScale))
+    , _nuSamples(static_cast<int>(8 * textureScale))
+    , _muSamples(static_cast<int>(128 * textureScale))
+    , _rSamples(static_cast<int>(32 * textureScale))
+    , _shadowConfArray(std::move(shadowConfigArray))
+    , _saveCalculationTextures(saveCalculatedTextures)
+    , _textureSize(_muSSamples * _nuSamples, _muSamples, _rSamples)
+{
+    std::memset(_uniformNameBuffer, '\0', sizeof(_uniformNameBuffer));
+    std::strcpy(_uniformNameBuffer, "shadowDataArray[");
+    _shadowDataArrayCache.reserve(_shadowConfArray.size());
+}
+
 void AtmosphereDeferredcaster::initialize() {
     ZoneScoped
 
-    if (!_atmosphereCalculated) {
-        preCalculateAtmosphereParam();
-    }
-
-    std::memset(_uniformNameBuffer, 0, sizeof(_uniformNameBuffer));
-    std::strcpy(_uniformNameBuffer, "shadowDataArray[");
+    _transmittanceTableTexture = createTexture(_transmittanceTableSize, "Transmittance");
+    _irradianceTableTexture = createTexture(_irradianceTableSize, "Irradiance");
+    _inScatteringTableTexture = createTexture(_textureSize, "InScattering", 4);
+    calculateAtmosphereParameters();
 }
 
 void AtmosphereDeferredcaster::deinitialize() {
     ZoneScoped
 
-    _transmittanceProgramObject = nullptr;
-    _irradianceProgramObject = nullptr;
-    _irradianceSupTermsProgramObject = nullptr;
-    _inScatteringProgramObject = nullptr;
-    _inScatteringSupTermsProgramObject = nullptr;
-    _deltaEProgramObject = nullptr;
-    _deltaSProgramObject = nullptr;
-    _deltaSSupTermsProgramObject = nullptr;
-    _deltaJProgramObject = nullptr;
-
     glDeleteTextures(1, &_transmittanceTableTexture);
     glDeleteTextures(1, &_irradianceTableTexture);
     glDeleteTextures(1, &_inScatteringTableTexture);
-    glDeleteTextures(1, &_deltaETableTexture);
-    glDeleteTextures(1, &_deltaSRayleighTableTexture);
-    glDeleteTextures(1, &_deltaSMieTableTexture);
-    glDeleteTextures(1, &_deltaJTableTexture);
 }
 
-void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
-                                          const DeferredcastData&,
-                                          ghoul::opengl::ProgramObject& program)
+void AtmosphereDeferredcaster::update(const UpdateData&) {}
+
+void AtmosphereDeferredcaster::preRaycast(const RenderData& data, const DeferredcastData&,
+                                          ghoul::opengl::ProgramObject& prg)
 {
     ZoneScoped
 
     // Atmosphere Frustum Culling
-    glm::dvec3 tPlanetPosWorld = glm::dvec3(
-        _modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0)
-    );
-
-    const double distance = glm::distance(
-        tPlanetPosWorld,
-        renderData.camera.eyePositionVec3()
-    );
+    glm::dvec3 tPlanetPos = glm::dvec3(_modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0));
+    const double distance = glm::distance(tPlanetPos, data.camera.eyePositionVec3());
 
     // Radius is in KM
     const double scaledRadius = glm::length(
@@ -272,232 +310,180 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
     );
 
     // Number of planet radii to use as distance threshold for culling
-    const double DISTANCE_CULLING_RADII = 5000;
-    if (distance > scaledRadius * DISTANCE_CULLING_RADII) {
-        program.setUniform(_uniformCache.cullAtmosphere, 1);
-    }
-    else {
-        glm::dmat4 MV = glm::dmat4(renderData.camera.sgctInternal.projectionMatrix()) *
-                        renderData.camera.combinedViewMatrix();
+    prg.setUniform(_uniformCache.cullAtmosphere, 1);
 
-        const double totalAtmosphere = (scaledRadius + ATM_EPS);
-        if (!isAtmosphereInFrustum(MV, tPlanetPosWorld, totalAtmosphere)) {
-            program.setUniform(_uniformCache.cullAtmosphere, 1);
+    constexpr const double DistanceCullingRadii = 5000;
+    glm::dmat4 MV = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
+        data.camera.combinedViewMatrix();
+    if (distance <= scaledRadius * DistanceCullingRadii &&
+        isAtmosphereInFrustum(MV, tPlanetPos, scaledRadius + ATM_EPS))
+    {
+        prg.setUniform(_uniformCache.cullAtmosphere, 0);
+        prg.setUniform(_uniformCache.Rg, _atmospherePlanetRadius);
+        prg.setUniform(_uniformCache.Rt, _atmosphereRadius);
+        prg.setUniform(_uniformCache.groundRadianceEmission, _groundRadianceEmission);
+        prg.setUniform(_uniformCache.HR, _rayleighHeightScale);
+        prg.setUniform(_uniformCache.betaRayleigh, _rayleighScatteringCoeff);
+        prg.setUniform(_uniformCache.HM, _mieHeightScale);
+        prg.setUniform(_uniformCache.betaMieExtinction, _mieExtinctionCoeff);
+        prg.setUniform(_uniformCache.mieG, _miePhaseConstant);
+        prg.setUniform(_uniformCache.sunRadiance, _sunRadianceIntensity);
+        prg.setUniform(_uniformCache.ozoneLayerEnabled, _ozoneEnabled);
+        prg.setUniform(_uniformCache.HO, _ozoneHeightScale);
+        prg.setUniform(_uniformCache.betaOzoneExtinction, _ozoneExtinctionCoeff);
+        prg.setUniform(_uniformCache.SAMPLES_R, _rSamples);
+        prg.setUniform(_uniformCache.SAMPLES_MU, _muSamples);
+        prg.setUniform(_uniformCache.SAMPLES_MU_S, _muSSamples);
+        prg.setUniform(_uniformCache.SAMPLES_NU, _nuSamples);
+
+        // Object Space
+        glm::dmat4 invModelMatrix = glm::inverse(_modelTransform);
+        prg.setUniform(_uniformCache.inverseModelTransformMatrix, invModelMatrix);
+        prg.setUniform(_uniformCache.modelTransformMatrix, _modelTransform);
+
+        glm::dmat4 viewToWorldMatrix = glm::inverse(data.camera.combinedViewMatrix());
+
+        // Eye Space to World Space
+        prg.setUniform(_uniformCache.viewToWorldMatrix, viewToWorldMatrix);
+
+        // Projection to Eye Space
+        glm::dmat4 dInvProj = glm::inverse(glm::dmat4(data.camera.projectionMatrix()));
+
+        glm::dmat4 invWholePipeline = invModelMatrix * viewToWorldMatrix * dInvProj;
+
+        prg.setUniform(_uniformCache.projectionToModelTransform, invWholePipeline);
+
+        glm::dvec4 camPosObjCoords =
+            invModelMatrix * glm::dvec4(data.camera.eyePositionVec3(), 1.0);
+        prg.setUniform(_uniformCache.camPosObj, glm::dvec3(camPosObjCoords));
+
+        SceneGraphNode* node = sceneGraph()->sceneGraphNode("Sun");
+        glm::dvec3 sunPosWorld = node ? node->worldPosition() : glm::dvec3(0.0);
+
+        glm::dvec3 sunPosObj;
+        // Sun following camera position
+        if (_sunFollowingCameraEnabled) {
+            sunPosObj = invModelMatrix * glm::dvec4(data.camera.eyePositionVec3(), 1.0);
         }
         else {
-            program.setUniform(_uniformCache.cullAtmosphere, 0);
-            program.setUniform(_uniformCache.Rg, _atmospherePlanetRadius);
-            program.setUniform(_uniformCache.Rt, _atmosphereRadius);
-            program.setUniform(
-                _uniformCache.groundRadianceEmission,
-                _planetGroundRadianceEmission
-            );
-            program.setUniform(_uniformCache.HR, _rayleighHeightScale);
-            program.setUniform(_uniformCache.betaRayleigh, _rayleighScatteringCoeff);
-            program.setUniform(_uniformCache.HM, _mieHeightScale);
-            program.setUniform(_uniformCache.betaMieExtinction, _mieExtinctionCoeff);
-            program.setUniform(_uniformCache.mieG, _miePhaseConstant);
-            program.setUniform(_uniformCache.sunRadiance, _sunRadianceIntensity);
-            program.setUniform(_uniformCache.ozoneLayerEnabled, _ozoneEnabled);
-            program.setUniform(_uniformCache.HO, _ozoneHeightScale);
-            program.setUniform(_uniformCache.betaOzoneExtinction, _ozoneExtinctionCoeff);
-            program.setUniform(_uniformCache.SAMPLES_R, _r_samples);
-            program.setUniform(_uniformCache.SAMPLES_MU, _mu_samples);
-            program.setUniform(_uniformCache.SAMPLES_MU_S, _mu_s_samples);
-            program.setUniform(_uniformCache.SAMPLES_NU, _nu_samples);
-
-            // Object Space
-            glm::dmat4 inverseModelMatrix = glm::inverse(_modelTransform);
-            program.setUniform(
-                _uniformCache.inverseModelTransformMatrix, inverseModelMatrix
-            );
-            program.setUniform(_uniformCache.modelTransformMatrix, _modelTransform);
-
-            glm::dmat4 viewToWorldMatrix = glm::inverse(
-                renderData.camera.combinedViewMatrix()
-            );
-
-            // Eye Space to World Space
-            program.setUniform(_uniformCache.viewToWorldMatrix, viewToWorldMatrix);
-
-            // Projection to Eye Space
-            glm::dmat4 dInverseProjection = glm::inverse(
-                glm::dmat4(renderData.camera.projectionMatrix())
-            );
-
-            glm::dmat4 inverseWholeMatrixPipeline =
-                inverseModelMatrix * viewToWorldMatrix * dInverseProjection;
-
-            program.setUniform(
-                _uniformCache.projectionToModelTransformMatrix,
-                inverseWholeMatrixPipeline
-            );
-
-            glm::dvec4 camPosObjCoords =
-                inverseModelMatrix * glm::dvec4(renderData.camera.eyePositionVec3(), 1.0);
-            program.setUniform(_uniformCache.camPosObj, glm::dvec3(camPosObjCoords));
-
-            SceneGraphNode* node = sceneGraph()->sceneGraphNode("Sun");
-            glm::dvec3 sunPosWorld = node ? node->worldPosition() : glm::dvec3(0.0);
-
-            glm::dvec4 sunPosObj;
-            // Sun following camera position
-            if (_sunFollowingCameraEnabled) {
-                sunPosObj = inverseModelMatrix * glm::dvec4(
-                    renderData.camera.eyePositionVec3(),
-                    1.0
-                );
-            }
-            else {
-                sunPosObj = inverseModelMatrix *
-                    glm::dvec4(
-                        (sunPosWorld - renderData.modelTransform.translation) * 1000.0,
-                        1.0
-                    );
-            }
-
-            // Sun Position in Object Space
-            program.setUniform(
-                _uniformCache.sunDirectionObj,
-                glm::normalize(glm::dvec3(sunPosObj))
-            );
-
-            ghoul::opengl::updateUniformLocations(program, _uniformCache, UniformNames);
-
-            // Shadow calculations..
-            if (!_shadowConfArray.empty()) {
-                ZoneScopedN("Shadow Configuration")
-
-                _shadowDataArrayCache.clear();
-
-                for (const ShadowConfiguration& shadowConf : _shadowConfArray) {
-                    // TO REMEMBER: all distances and lengths in world coordinates are in
-                    // meters!!! We need to move this to view space...
-                    // Getting source and caster:
-                    double lt;
-                    glm::dvec3 sourcePos = SpiceManager::ref().targetPosition(
-                        shadowConf.source.first,
-                        "SSB",
-                        "GALACTIC",
-                        {},
-                        _time,
-                        lt
-                    );
-                    sourcePos *= KM_TO_M; // converting to meters
-                    glm::dvec3 casterPos = SpiceManager::ref().targetPosition(
-                        shadowConf.caster.first,
-                        "SSB",
-                        "GALACTIC",
-                        {},
-                        _time,
-                        lt
-                    );
-                    casterPos *= KM_TO_M; // converting to meters
-
-                    SceneGraphNode* sourceNode = sceneGraphNode(shadowConf.source.first);
-                    SceneGraphNode* casterNode = sceneGraphNode(shadowConf.caster.first);
-
-                    if ((sourceNode == nullptr) || (casterNode == nullptr)) {
-                        LERRORC(
-                            "AtmosphereDeferredcaster",
-                            "Invalid scenegraph node for the shadow's caster or shadow's "
-                            "receiver"
-                        );
-                        return;
-                    }
-
-                    const double sourceRadiusScale = std::max(
-                        glm::compMax(sourceNode->scale()),
-                        1.0
-                    );
-
-                    const double casterRadiusScale = std::max(
-                        glm::compMax(casterNode->scale()),
-                        1.0
-                    );
-
-                    // First we determine if the caster is shadowing the current planet
-                    // (all calculations in World Coordinates):
-                    glm::dvec3 planetCasterVec =
-                        casterPos - renderData.modelTransform.translation;
-                    glm::dvec3 sourceCasterVec = casterPos - sourcePos;
-                    double sc_length = glm::length(sourceCasterVec);
-                    glm::dvec3 planetCaster_proj = (
-                        glm::dot(planetCasterVec, sourceCasterVec) /
-                        (sc_length*sc_length)) * sourceCasterVec;
-                    double d_test = glm::length(planetCasterVec - planetCaster_proj);
-                    double xp_test = shadowConf.caster.second * casterRadiusScale *
-                        sc_length /
-                        (shadowConf.source.second * sourceRadiusScale +
-                         shadowConf.caster.second * casterRadiusScale);
-                    double rp_test = shadowConf.caster.second * casterRadiusScale *
-                        (glm::length(planetCaster_proj) + xp_test) / xp_test;
-
-                    double casterDistSun = glm::length(casterPos - sunPosWorld);
-                    double planetDistSun = glm::length(
-                        renderData.modelTransform.translation - sunPosWorld
-                    );
-
-                    ShadowRenderingStruct shadowData;
-                    shadowData.isShadowing = false;
-
-                    if (((d_test - rp_test) < (_atmospherePlanetRadius * KM_TO_M)) &&
-                        (casterDistSun < planetDistSun))
-                    {
-                        // The current caster is shadowing the current planet
-                        shadowData.isShadowing = true;
-                        shadowData.rs = shadowConf.source.second * sourceRadiusScale;
-                        shadowData.rc = shadowConf.caster.second * casterRadiusScale;
-                        shadowData.sourceCasterVec = glm::normalize(sourceCasterVec);
-                        shadowData.xp = xp_test;
-                        shadowData.xu =
-                            shadowData.rc * sc_length / (shadowData.rs - shadowData.rc);
-                        shadowData.casterPositionVec = casterPos;
-                    }
-                    _shadowDataArrayCache.push_back(shadowData);
-                }
-
-                // _uniformNameBuffer[0..15] = "shadowDataArray["
-                unsigned int counter = 0;
-                for (const ShadowRenderingStruct& sd : _shadowDataArrayCache) {
-                    // Add the counter
-                    char* bf = fmt::format_to(_uniformNameBuffer + 16, "{}", counter);
-
-                    std::strcpy(bf, "].isShadowing\0");
-                    program.setUniform(_uniformNameBuffer, sd.isShadowing);
-
-                    if (sd.isShadowing) {
-                        std::strcpy(bf, "].xp\0");
-                        program.setUniform(_uniformNameBuffer, sd.xp);
-                        std::strcpy(bf, "].xu\0");
-                        program.setUniform(_uniformNameBuffer, sd.xu);
-                        std::strcpy(bf, "].rc\0");
-                        program.setUniform(_uniformNameBuffer, sd.rc);
-                        std::strcpy(bf, "].sourceCasterVec\0");
-                        program.setUniform(_uniformNameBuffer, sd.sourceCasterVec);
-                        std::strcpy(bf, "].casterPositionVec\0");
-                        program.setUniform(_uniformNameBuffer, sd.casterPositionVec);
-                    }
-                    counter++;
-                }
-                program.setUniform(_uniformCache.hardShadows, _hardShadowsEnabled);
-            }
+            sunPosObj = invModelMatrix *
+                glm::dvec4((sunPosWorld - data.modelTransform.translation) * 1000.0, 1.0);
         }
+
+        // Sun Position in Object Space
+        prg.setUniform(_uniformCache.sunDirectionObj, glm::normalize(sunPosObj));
+
+        // Shadow calculations..
+        _shadowDataArrayCache.clear();
+        for (const ShadowConfiguration& shadowConf : _shadowConfArray) {
+            // TO REMEMBER: all distances and lengths in world coordinates are in
+            // meters!!! We need to move this to view space...
+            double lt;
+            glm::dvec3 sourcePos = SpiceManager::ref().targetPosition(
+                shadowConf.source.first,
+                "SSB",
+                "GALACTIC",
+                {},
+                data.time.j2000Seconds(),
+                lt
+            );
+            sourcePos *= KM_TO_M; // converting to meters
+            glm::dvec3 casterPos = SpiceManager::ref().targetPosition(
+                shadowConf.caster.first,
+                "SSB",
+                "GALACTIC",
+                {},
+                data.time.j2000Seconds(),
+                lt
+            );
+            casterPos *= KM_TO_M; // converting to meters
+
+            SceneGraphNode* sourceNode = sceneGraphNode(shadowConf.source.first);
+            SceneGraphNode* casterNode = sceneGraphNode(shadowConf.caster.first);
+
+            if (!sourceNode || !casterNode) {
+                LERROR("Invalid scenegraph node for the shadow's caster or receiver");
+                return;
+            }
+
+            const double sourceScale = std::max(glm::compMax(sourceNode->scale()), 1.0);
+            const double casterScale = std::max(glm::compMax(casterNode->scale()), 1.0);
+
+            // First we determine if the caster is shadowing the current planet
+            // (all calculations in World Coordinates):
+            glm::dvec3 planetCasterVec = casterPos - data.modelTransform.translation;
+            glm::dvec3 sourceCasterVec = casterPos - sourcePos;
+            double scLength = glm::length(sourceCasterVec);
+            glm::dvec3 planetCasterProj =
+                (glm::dot(planetCasterVec, sourceCasterVec) / (scLength * scLength)) *
+                sourceCasterVec;
+            double dTest = glm::length(planetCasterVec - planetCasterProj);
+            double xpTest = shadowConf.caster.second * casterScale *
+                scLength /
+                (shadowConf.source.second * sourceScale +
+                    shadowConf.caster.second * casterScale);
+            double rpTest = shadowConf.caster.second * casterScale *
+                (glm::length(planetCasterProj) + xpTest) / xpTest;
+
+            double casterDistSun = glm::length(casterPos - sunPosWorld);
+            double planetDistSun = glm::length(
+                data.modelTransform.translation - sunPosWorld
+            );
+
+            ShadowRenderingStruct shadow;
+            shadow.isShadowing = false;
+
+            if (((dTest - rpTest) < (_atmospherePlanetRadius * KM_TO_M)) &&
+                (casterDistSun < planetDistSun))
+            {
+                // The current caster is shadowing the current planet
+                shadow.isShadowing = true;
+                shadow.rs = shadowConf.source.second * sourceScale;
+                shadow.rc = shadowConf.caster.second * casterScale;
+                shadow.sourceCasterVec = glm::normalize(sourceCasterVec);
+                shadow.xp = xpTest;
+                shadow.xu = shadow.rc * scLength / (shadow.rs - shadow.rc);
+                shadow.casterPositionVec = casterPos;
+            }
+            _shadowDataArrayCache.push_back(shadow);
+        }
+
+        // _uniformNameBuffer[0..15] = "shadowDataArray["
+        unsigned int counter = 0;
+        for (const ShadowRenderingStruct& sd : _shadowDataArrayCache) {
+            // Add the counter
+            char* bf = fmt::format_to(_uniformNameBuffer + 16, "{}", counter);
+
+            std::strcpy(bf, "].isShadowing\0");
+            prg.setUniform(_uniformNameBuffer, sd.isShadowing);
+
+            if (sd.isShadowing) {
+                std::strcpy(bf, "].xp\0");
+                prg.setUniform(_uniformNameBuffer, sd.xp);
+                std::strcpy(bf, "].xu\0");
+                prg.setUniform(_uniformNameBuffer, sd.xu);
+                std::strcpy(bf, "].rc\0");
+                prg.setUniform(_uniformNameBuffer, sd.rc);
+                std::strcpy(bf, "].sourceCasterVec\0");
+                prg.setUniform(_uniformNameBuffer, sd.sourceCasterVec);
+                std::strcpy(bf, "].casterPositionVec\0");
+                prg.setUniform(_uniformNameBuffer, sd.casterPositionVec);
+            }
+            counter++;
+        }
+        prg.setUniform(_uniformCache.hardShadows, _hardShadowsEnabled);
     }
     _transmittanceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-    program.setUniform(
-        _uniformCache.transmittanceTexture,
-        _transmittanceTableTextureUnit
-    );
+    prg.setUniform(_uniformCache.transmittanceTexture, _transmittanceTableTextureUnit);
 
     _irradianceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _irradianceTableTexture);
-    program.setUniform(_uniformCache.irradianceTexture, _irradianceTableTextureUnit);
+    prg.setUniform(_uniformCache.irradianceTexture, _irradianceTableTextureUnit);
 
     _inScatteringTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_3D, _inScatteringTableTexture);
-    program.setUniform(_uniformCache.inscatterTexture, _inScatteringTableTextureUnit);
+    prg.setUniform(_uniformCache.inscatterTexture, _inScatteringTableTextureUnit);
 }
 
 void AtmosphereDeferredcaster::postRaycast(const RenderData&, const DeferredcastData&,
@@ -511,10 +497,6 @@ void AtmosphereDeferredcaster::postRaycast(const RenderData&, const Deferredcast
     _inScatteringTableTextureUnit.deactivate();
 }
 
-std::filesystem::path AtmosphereDeferredcaster::deferredcastPath() const {
-    return absPath("${MODULE_ATMOSPHERE}/shaders/atmosphere_deferred_fs.glsl");
-}
-
 std::filesystem::path AtmosphereDeferredcaster::deferredcastFSPath() const {
     return absPath("${MODULE_ATMOSPHERE}/shaders/atmosphere_deferred_fs.glsl");
 }
@@ -533,453 +515,44 @@ void AtmosphereDeferredcaster::initializeCachedVariables(
     ghoul::opengl::updateUniformLocations(program, _uniformCache, UniformNames);
 }
 
-void AtmosphereDeferredcaster::update(const UpdateData&) {}
-
 void AtmosphereDeferredcaster::setModelTransform(glm::dmat4 transform) {
     _modelTransform = std::move(transform);
 }
 
-void AtmosphereDeferredcaster::setTime(double time) {
-    _time = time;
-}
-
-void AtmosphereDeferredcaster::setAtmosphereRadius(float atmRadius) {
-    _atmosphereRadius = atmRadius;
-}
-
-void AtmosphereDeferredcaster::setPlanetRadius(float planetRadius) {
+void AtmosphereDeferredcaster::setParameters(float atmosphereRadius, float planetRadius,
+                                             float averageGroundReflectance,
+                                             float groundRadianceEmission,
+                                             float rayleighHeightScale, bool enableOzone,
+                                             float ozoneHeightScale, float mieHeightScale, 
+                                             float miePhaseConstant, float sunRadiance,
+                                             glm::vec3 rayScatteringCoefficients,
+                                             glm::vec3 ozoneExtinctionCoefficients,
+                                             glm::vec3 mieScatteringCoefficients,
+                                             glm::vec3 mieExtinctionCoefficients,
+                                             bool sunFollowing)
+{
+    _atmosphereRadius = atmosphereRadius;
     _atmospherePlanetRadius = planetRadius;
-}
-
-void AtmosphereDeferredcaster::setPlanetAverageGroundReflectance(
-                                                                float averageGReflectance)
-{
-    _planetAverageGroundReflectance = averageGReflectance;
-}
-
-void AtmosphereDeferredcaster::setPlanetGroundRadianceEmission(
-                                                             float groundRadianceEmission)
-{
-    _planetGroundRadianceEmission = groundRadianceEmission;
-}
-
-void AtmosphereDeferredcaster::setRayleighHeightScale(float rayleighHeightScale) {
+    _averageGroundReflectance = averageGroundReflectance;
+    _groundRadianceEmission = groundRadianceEmission;
     _rayleighHeightScale = rayleighHeightScale;
-}
-
-void AtmosphereDeferredcaster::enableOzone(bool enable) {
-    _ozoneEnabled = enable;
-}
-
-void AtmosphereDeferredcaster::setOzoneHeightScale(float ozoneHeightScale) {
+    _ozoneEnabled = enableOzone;
     _ozoneHeightScale = ozoneHeightScale;
-}
-
-void AtmosphereDeferredcaster::setMieHeightScale(float mieHeightScale) {
     _mieHeightScale = mieHeightScale;
-}
-
-void AtmosphereDeferredcaster::setMiePhaseConstant(float miePhaseConstant) {
     _miePhaseConstant = miePhaseConstant;
-}
-
-void AtmosphereDeferredcaster::setSunRadianceIntensity(float sunRadiance) {
     _sunRadianceIntensity = sunRadiance;
-}
-
-void AtmosphereDeferredcaster::setRayleighScatteringCoefficients(glm::vec3 rayScattCoeff)
-{
-    _rayleighScatteringCoeff = std::move(rayScattCoeff);
-}
-
-void AtmosphereDeferredcaster::setOzoneExtinctionCoefficients(glm::vec3 ozoneExtCoeff) {
-    _ozoneExtinctionCoeff = std::move(ozoneExtCoeff);
-}
-
-void AtmosphereDeferredcaster::setMieScatteringCoefficients(glm::vec3 mieScattCoeff) {
-    _mieScatteringCoeff = std::move(mieScattCoeff);
-}
-
-void AtmosphereDeferredcaster::setMieExtinctionCoefficients(glm::vec3 mieExtCoeff) {
-    _mieExtinctionCoeff = std::move(mieExtCoeff);
-}
-
-void AtmosphereDeferredcaster::setEllipsoidRadii(glm::dvec3 radii) {
-    _ellipsoidRadii = std::move(radii);
+    _rayleighScatteringCoeff = std::move(rayScatteringCoefficients);
+    _ozoneExtinctionCoeff = std::move(ozoneExtinctionCoefficients);
+    _mieScatteringCoeff = std::move(mieScatteringCoefficients);
+    _mieExtinctionCoeff = std::move(mieExtinctionCoefficients);
+    _sunFollowingCameraEnabled = sunFollowing;
 }
 
 void AtmosphereDeferredcaster::setHardShadows(bool enabled) {
     _hardShadowsEnabled = enabled;
 }
 
-void AtmosphereDeferredcaster::setShadowConfigArray(
-                                       std::vector<ShadowConfiguration> shadowConfigArray)
-{
-    _shadowConfArray = std::move(shadowConfigArray);
-
-    _shadowDataArrayCache.clear();
-    _shadowDataArrayCache.reserve(_shadowConfArray.size());
-}
-
-void AtmosphereDeferredcaster::enableSunFollowing(bool enable) {
-    _sunFollowingCameraEnabled = enable;
-}
-
-void AtmosphereDeferredcaster::setPrecalculationTextureScale(
-                                                         float preCalculatedTexturesScale)
-{
-    _transmittanceTableSize *= static_cast<unsigned int>(preCalculatedTexturesScale);
-    _irradianceTableSize *= static_cast<unsigned int>(preCalculatedTexturesScale);
-    _deltaETableSize *= static_cast<unsigned int>(preCalculatedTexturesScale);
-    _r_samples *= static_cast<unsigned int>(preCalculatedTexturesScale);
-    _mu_samples *= static_cast<unsigned int>(preCalculatedTexturesScale);
-    _mu_s_samples *= static_cast<unsigned int>(preCalculatedTexturesScale);
-    _nu_samples *= static_cast<unsigned int>(preCalculatedTexturesScale);
-}
-
-void AtmosphereDeferredcaster::enablePrecalculationTexturesSaving() {
-    _saveCalculationTextures = true;
-}
-
-void AtmosphereDeferredcaster::loadComputationPrograms() {
-    //
-    // Transmittance T
-    if (!_transmittanceProgramObject) {
-        _transmittanceProgramObject = ghoul::opengl::ProgramObject::Build(
-            "transmittanceCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/transmittance_calc_fs.glsl")
-        );
-    }
-    using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
-    _transmittanceProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    //
-    // Irradiance E
-    if (!_irradianceProgramObject) {
-        _irradianceProgramObject = ghoul::opengl::ProgramObject::Build(
-            "irradianceCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_calc_fs.glsl")
-        );
-    }
-    _irradianceProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    if (!_irradianceSupTermsProgramObject) {
-        _irradianceSupTermsProgramObject = ghoul::opengl::ProgramObject::Build(
-            "irradianceSupTermsCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_sup_calc_fs.glsl")
-        );
-    }
-    _irradianceSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    //
-    // InScattering S
-    if (!_inScatteringProgramObject) {
-        _inScatteringProgramObject = ghoul::opengl::ProgramObject::Build(
-            "inScatteringCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
-        );
-    }
-    _inScatteringProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    if (!_inScatteringSupTermsProgramObject) {
-        _inScatteringSupTermsProgramObject = ghoul::opengl::ProgramObject::Build(
-            "inScatteringSupTermsCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_sup_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
-        );
-    }
-    _inScatteringSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    //
-    // Delta E
-    if (!_deltaEProgramObject) {
-        _deltaEProgramObject = ghoul::opengl::ProgramObject::Build(
-            "deltaECalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaE_calc_fs.glsl")
-        );
-    }
-    _deltaEProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    //
-    // Irradiance finel E
-    if (!_irradianceFinalProgramObject) {
-        _irradianceFinalProgramObject = ghoul::opengl::ProgramObject::Build(
-            "irradianceEFinalProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_final_fs.glsl")
-        );
-    }
-    _irradianceFinalProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    //
-    // Delta S
-    if (!_deltaSProgramObject) {
-        _deltaSProgramObject = ghoul::opengl::ProgramObject::Build(
-            "deltaSCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
-        );
-    }
-    _deltaSProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    if (!_deltaSSupTermsProgramObject) {
-        _deltaSSupTermsProgramObject = ghoul::opengl::ProgramObject::Build(
-            "deltaSSUPTermsCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_sup_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
-        );
-    }
-    _deltaSSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    //
-    // Delta J (Radiance Scattered)
-    if (!_deltaJProgramObject) {
-        _deltaJProgramObject = ghoul::opengl::ProgramObject::Build(
-            "deltaJCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaJ_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
-        );
-    }
-    _deltaJProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-}
-
-void AtmosphereDeferredcaster::unloadComputationPrograms() {
-    _transmittanceProgramObject = nullptr;
-    _irradianceProgramObject = nullptr;
-    _irradianceSupTermsProgramObject = nullptr;
-    _inScatteringProgramObject = nullptr;
-    _inScatteringSupTermsProgramObject = nullptr;
-    _deltaEProgramObject = nullptr;
-    _irradianceFinalProgramObject = nullptr;
-    _deltaSProgramObject = nullptr;
-    _deltaSSupTermsProgramObject = nullptr;
-    _deltaJProgramObject = nullptr;
-}
-
-void AtmosphereDeferredcaster::createComputationTextures() {
-    if (!_atmosphereCalculated) {
-        //
-        // Transmittance
-        ghoul::opengl::TextureUnit transmittanceTableTextureUnit;
-        transmittanceTableTextureUnit.activate();
-        glGenTextures(1, &_transmittanceTableTexture);
-        glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
-        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-        glTexImage2D(
-            GL_TEXTURE_2D,
-            0,
-            GL_RGB32F,
-            _transmittanceTableSize.x,
-            _transmittanceTableSize.y,
-            0,
-            GL_RGB,
-            GL_FLOAT,
-            nullptr
-        );
-
-        //
-        // Irradiance
-        ghoul::opengl::TextureUnit irradianceTableTextureUnit;
-        irradianceTableTextureUnit.activate();
-        glGenTextures(1, &_irradianceTableTexture);
-        glBindTexture(GL_TEXTURE_2D, _irradianceTableTexture);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-        glTexImage2D(
-            GL_TEXTURE_2D,
-            0,
-            GL_RGB32F,
-            _irradianceTableSize.x,
-            _irradianceTableSize.y,
-            0,
-            GL_RGB,
-            GL_FLOAT,
-            nullptr
-        );
-
-        //
-        // InScattering
-        ghoul::opengl::TextureUnit inScatteringTableTextureUnit;
-        inScatteringTableTextureUnit.activate();
-        glGenTextures(1, &_inScatteringTableTexture);
-        glBindTexture(GL_TEXTURE_3D, _inScatteringTableTexture);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-        glTexImage3D(
-            GL_TEXTURE_3D,
-            0,
-            GL_RGBA32F,
-            _mu_s_samples * _nu_samples,
-            _mu_samples,
-            _r_samples,
-            0,
-            GL_RGB,
-            GL_FLOAT,
-            nullptr
-        );
-    }
-
-    //
-    // Delta E
-    ghoul::opengl::TextureUnit deltaETableTextureUnit;
-    deltaETableTextureUnit.activate();
-    glGenTextures(1, &_deltaETableTexture);
-    glBindTexture(GL_TEXTURE_2D, _deltaETableTexture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_RGB32F,
-        _deltaETableSize.x,
-        _deltaETableSize.y,
-        0,
-        GL_RGB,
-        GL_FLOAT,
-        nullptr
-    );
-
-    //
-    // Delta S
-    ghoul::opengl::TextureUnit deltaSRayleighTableTextureUnit;
-    deltaSRayleighTableTextureUnit.activate();
-    glGenTextures(1, &_deltaSRayleighTableTexture);
-    glBindTexture(GL_TEXTURE_3D, _deltaSRayleighTableTexture);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage3D(
-        GL_TEXTURE_3D,
-        0,
-        GL_RGB32F,
-        _mu_s_samples * _nu_samples,
-        _mu_samples,
-        _r_samples,
-        0, GL_RGB,
-        GL_FLOAT,
-        nullptr
-    );
-
-    ghoul::opengl::TextureUnit deltaSMieTableTextureUnit;
-    deltaSMieTableTextureUnit.activate();
-    glGenTextures(1, &_deltaSMieTableTexture);
-    glBindTexture(GL_TEXTURE_3D, _deltaSMieTableTexture);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage3D(
-        GL_TEXTURE_3D,
-        0,
-        GL_RGB32F,
-        _mu_s_samples * _nu_samples,
-        _mu_samples,
-        _r_samples,
-        0,
-        GL_RGB,
-        GL_FLOAT,
-        nullptr
-    );
-
-    //
-    // Delta J (Radiance Scattered)
-    ghoul::opengl::TextureUnit deltaJTableTextureUnit;
-    deltaJTableTextureUnit.activate();
-    glGenTextures(1, &_deltaJTableTexture);
-    glBindTexture(GL_TEXTURE_3D, _deltaJTableTexture);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage3D(
-        GL_TEXTURE_3D,
-        0,
-        GL_RGB32F,
-        _mu_s_samples * _nu_samples,
-        _mu_samples,
-        _r_samples,
-        0,
-        GL_RGB,
-        GL_FLOAT,
-        nullptr
-    );
-}
-
-void AtmosphereDeferredcaster::deleteComputationTextures() {
-    glDeleteTextures(1, &_transmittanceTableTexture);
-    _transmittanceTableTexture = 0;
-    glDeleteTextures(1, &_irradianceTableTexture);
-    _irradianceTableTexture = 0;
-    glDeleteTextures(1, &_inScatteringTableTexture);
-    _inScatteringTableTexture = 0;
-    glDeleteTextures(1, &_deltaETableTexture);
-    _deltaETableTexture = 0;
-    glDeleteTextures(1, &_deltaSRayleighTableTexture);
-    _deltaSRayleighTableTexture = 0;
-    glDeleteTextures(1, &_deltaSMieTableTexture);
-    _deltaSMieTableTexture = 0;
-    glDeleteTextures(1, &_deltaJTableTexture);
-    _deltaJTableTexture = 0;
-}
-
-void AtmosphereDeferredcaster::deleteUnusedComputationTextures() {
-    glDeleteTextures(1, &_deltaETableTexture);
-    _deltaETableTexture = 0;
-    glDeleteTextures(1, &_deltaSRayleighTableTexture);
-    _deltaSRayleighTableTexture = 0;
-    glDeleteTextures(1, &_deltaSMieTableTexture);
-    _deltaSMieTableTexture = 0;
-    glDeleteTextures(1, &_deltaJTableTexture);
-    _deltaJTableTexture = 0;
-}
-
-void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
-                                                   GLenum drawBuffers[1],
-                                                   GLsizei vertexSize)
-{
-    ghoul::opengl::TextureUnit transmittanceTableTextureUnit;
-    ghoul::opengl::TextureUnit irradianceTableTextureUnit;
-    ghoul::opengl::TextureUnit inScatteringTableTextureUnit;
-    ghoul::opengl::TextureUnit deltaETableTextureUnit;
-    ghoul::opengl::TextureUnit deltaSRayleighTableTextureUnit;
-    ghoul::opengl::TextureUnit deltaSMieTableTextureUnit;
-    ghoul::opengl::TextureUnit deltaJTableTextureUnit;
-
-    glDisable(GL_BLEND);
-
-    // See Precomputed Atmosphere Scattering from Bruneton et al. paper, algorithm 4.1:
+void AtmosphereDeferredcaster::calculateTransmittance(GLuint vao) {
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -987,90 +560,113 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
         0
     );
     glViewport(0, 0, _transmittanceTableSize.x, _transmittanceTableSize.y);
-    _transmittanceProgramObject->activate();
-    loadAtmosphereDataIntoShaderProgram(*_transmittanceProgramObject);
+    using ProgramObject = ghoul::opengl::ProgramObject;
+    std::unique_ptr<ProgramObject> program = ProgramObject::Build(
+        "Transmittance Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/transmittance_calc_fs.glsl")
+    );
+    program->activate();
+    program->setUniform("Rg", _atmospherePlanetRadius);
+    program->setUniform("Rt", _atmosphereRadius);
+    program->setUniform("HR", _rayleighHeightScale);
+    program->setUniform("betaRayleigh", _rayleighScatteringCoeff);
+    program->setUniform("HM", _mieHeightScale);
+    program->setUniform("betaMieExtinction", _mieExtinctionCoeff);
+    program->setUniform("TRANSMITTANCE", _transmittanceTableSize);
+    program->setUniform("ozoneLayerEnabled", _ozoneEnabled);
+    program->setUniform("HO", _ozoneHeightScale);
+    program->setUniform("betaOzoneExtinction", _ozoneExtinctionCoeff);
 
-    static const float Black[] = { 0.f, 0.f, 0.f, 0.f };
+    constexpr const float Black[] = { 0.f, 0.f, 0.f, 0.f };
     glClearBufferfv(GL_COLOR, 0, Black);
-    renderQuadForCalc(quadCalcVAO, vertexSize);
+    renderQuadForCalc(vao);
     if (_saveCalculationTextures) {
-        saveTextureFile(
-            GL_COLOR_ATTACHMENT0,
-            "transmittance_texture.ppm",
-            _transmittanceTableSize
-        );
+        saveTextureFile("transmittance_texture.ppm", _transmittanceTableSize);
     }
-    _transmittanceProgramObject->deactivate();
+    program->deactivate();
+}
 
-    // line 2 in algorithm 4.1
-    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, _deltaETableTexture, 0);
+GLuint AtmosphereDeferredcaster::calculateDeltaE(GLuint vao) {
+    GLuint deltaE = createTexture(_deltaETableSize, "DeltaE");
+    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaE, 0);
     glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
-    _irradianceProgramObject->activate();
-    transmittanceTableTextureUnit.activate();
+    using ProgramObject = ghoul::opengl::ProgramObject;
+    std::unique_ptr<ProgramObject> program = ProgramObject::Build(
+        "Irradiance Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_calc_fs.glsl")
+    );
+    program->activate();
+    ghoul::opengl::TextureUnit unit;
+    unit.activate();
     glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-    _irradianceProgramObject->setUniform(
-        "transmittanceTexture",
-        transmittanceTableTextureUnit
-    );
-    loadAtmosphereDataIntoShaderProgram(*_irradianceProgramObject);
+    program->setUniform("transmittanceTexture", unit);
+    program->setUniform("Rg", _atmospherePlanetRadius);
+    program->setUniform("Rt", _atmosphereRadius);
+    program->setUniform("OTHER_TEXTURES", _deltaETableSize);
     glClear(GL_COLOR_BUFFER_BIT);
-    renderQuadForCalc(quadCalcVAO, vertexSize);
+    renderQuadForCalc(vao);
     if (_saveCalculationTextures) {
-        saveTextureFile(
-            GL_COLOR_ATTACHMENT0,
-            "deltaE_table_texture.ppm",
-            _deltaETableSize
-        );
+        saveTextureFile("deltaE_table_texture.ppm", _deltaETableSize);
     }
-    _irradianceProgramObject->deactivate();
+    program->deactivate();
+    return deltaE;
+}
 
-    // line 3 in algorithm 4.1
-    glFramebufferTexture(
-        GL_FRAMEBUFFER,
-        GL_COLOR_ATTACHMENT0,
-        _deltaSRayleighTableTexture,
-        0
-    );
-    glFramebufferTexture(
-        GL_FRAMEBUFFER,
-        GL_COLOR_ATTACHMENT1,
-        _deltaSMieTableTexture,
-        0
-    );
+std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS(GLuint vao) {
+    GLuint deltaSRayleigh = createTexture(_textureSize, "DeltaS Rayleigh", 3);
+    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaSRayleigh, 0);
+    GLuint deltaSMie = createTexture(_textureSize, "DeltaS Mie", 3);
+    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, deltaSMie, 0);
     GLenum colorBuffers[2] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
     glDrawBuffers(2, colorBuffers);
-    glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
-    _inScatteringProgramObject->activate();
-    transmittanceTableTextureUnit.activate();
-    glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-    _inScatteringProgramObject->setUniform(
-        "transmittanceTexture",
-        transmittanceTableTextureUnit
+    glViewport(0, 0, _textureSize.x, _textureSize.y);
+    using ProgramObject = ghoul::opengl::ProgramObject;
+    std::unique_ptr<ProgramObject> program = ProgramObject::Build(
+        "InScattering Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_calc_fs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
     );
-    loadAtmosphereDataIntoShaderProgram(*_inScatteringProgramObject);
+    program->activate();
+    ghoul::opengl::TextureUnit unit;
+    unit.activate();
+    glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
+    program->setUniform("transmittanceTexture", unit);
+    program->setUniform("Rg", _atmospherePlanetRadius);
+    program->setUniform("Rt", _atmosphereRadius);
+    program->setUniform("HR", _rayleighHeightScale);
+    program->setUniform("betaRayleigh", _rayleighScatteringCoeff);
+    program->setUniform("HM", _mieHeightScale);
+    program->setUniform("betaMieScattering", _mieScatteringCoeff);
+    program->setUniform("SAMPLES_MU_S", _muSSamples);
+    program->setUniform("SAMPLES_NU", _nuSamples);
+    program->setUniform("SAMPLES_MU", _muSamples);
+    program->setUniform("ozoneLayerEnabled", _ozoneEnabled);
+    program->setUniform("HO", _ozoneHeightScale);
     glClear(GL_COLOR_BUFFER_BIT);
-    for (int layer = 0; layer < _r_samples; ++layer) {
-        step3DTexture(*_inScatteringProgramObject, layer, true);
-        renderQuadForCalc(quadCalcVAO, vertexSize);
+    for (int layer = 0; layer < _rSamples; ++layer) {
+        program->setUniform("layer", layer);
+        step3DTexture(*program, layer);
+        renderQuadForCalc(vao);
     }
     if (_saveCalculationTextures) {
-        saveTextureFile(
-            GL_COLOR_ATTACHMENT0,
-            "deltaS_rayleigh_texture.ppm",
-            glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
-        );
-        saveTextureFile(
-            GL_COLOR_ATTACHMENT1,
+        saveTextureFile("deltaS_rayleigh_texture.ppm", glm::ivec2(_textureSize));
+        saveTextureFile<GL_COLOR_ATTACHMENT1>(
             "deltaS_mie_texture.ppm",
-            glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
+            glm::ivec2(_textureSize)
         );
     }
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, 0, 0);
+    GLenum drawBuffers[1] = { GL_COLOR_ATTACHMENT0 };
     glDrawBuffers(1, drawBuffers);
 
-    _inScatteringProgramObject->deactivate();
+    program->deactivate();
+    return { deltaSRayleigh, deltaSMie };
+}
 
-    // line 4 in algorithm 4.1
+void AtmosphereDeferredcaster::calculateIrradiance(GLuint quadCalcVao) {
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -1080,251 +676,292 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
     glDrawBuffer(GL_COLOR_ATTACHMENT0);
 
     glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
-    _deltaEProgramObject->activate();
-    deltaETableTextureUnit.activate();
-    glBindTexture(GL_TEXTURE_2D, _deltaETableTexture);
-    _deltaEProgramObject->setUniform("deltaETexture", deltaETableTextureUnit);
-    loadAtmosphereDataIntoShaderProgram(*_deltaEProgramObject);
+    using ProgramObject = ghoul::opengl::ProgramObject;
+    std::unique_ptr<ProgramObject> program = ProgramObject::Build(
+        "DeltaE Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/deltaE_calc_fs.glsl")
+    );
+    program->activate();
     glClear(GL_COLOR_BUFFER_BIT);
-    renderQuadForCalc(quadCalcVAO, vertexSize);
+    renderQuadForCalc(quadCalcVao);
     if (_saveCalculationTextures) {
-        saveTextureFile(
-            GL_COLOR_ATTACHMENT0,
-            "irradiance_texture.ppm",
-            _deltaETableSize
-        );
+        saveTextureFile("irradiance_texture.ppm", _deltaETableSize);
     }
-    _deltaEProgramObject->deactivate();
+    program->deactivate();
+}
 
-    // line 5 in algorithm 4.1
+void AtmosphereDeferredcaster::calculateInscattering(GLuint vao, GLuint deltaSRayleigh,
+                                                     GLuint deltaSMie)
+{
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
         _inScatteringTableTexture,
         0
     );
-    glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
-    _deltaSProgramObject->activate();
-    deltaSRayleighTableTextureUnit.activate();
-    glBindTexture(GL_TEXTURE_3D, _deltaSRayleighTableTexture);
-    deltaSMieTableTextureUnit.activate();
-    glBindTexture(GL_TEXTURE_3D, _deltaSMieTableTexture);
-    _deltaSProgramObject->setUniform("deltaSRTexture", deltaSRayleighTableTextureUnit);
-    _deltaSProgramObject->setUniform("deltaSMTexture", deltaSMieTableTextureUnit);
-    loadAtmosphereDataIntoShaderProgram(*_deltaSProgramObject);
+    glViewport(0, 0, _textureSize.x, _textureSize.y);
+    using ProgramObject = ghoul::opengl::ProgramObject;
+    std::unique_ptr<ProgramObject> program = ProgramObject::Build(
+        "deltaSCalcProgram",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_calc_fs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+    );
+    program->activate();
+
+    ghoul::opengl::TextureUnit deltaSRayleighUnit;
+    deltaSRayleighUnit.activate();
+    glBindTexture(GL_TEXTURE_3D, deltaSRayleigh);
+    program->setUniform("deltaSRTexture", deltaSRayleighUnit);
+
+    ghoul::opengl::TextureUnit deltaSMieUnit;
+    deltaSMieUnit.activate();
+    glBindTexture(GL_TEXTURE_3D, deltaSMie);
+    program->setUniform("deltaSMTexture", deltaSMieUnit);
+
+    program->setUniform("SAMPLES_MU_S", _muSSamples);
+    program->setUniform("SAMPLES_NU", _nuSamples);
+    program->setUniform("SAMPLES_MU", _muSamples);
+    program->setUniform("SAMPLES_R", _rSamples);
     glClear(GL_COLOR_BUFFER_BIT);
-    for (int layer = 0; layer < _r_samples; ++layer) {
-        step3DTexture(*_deltaSProgramObject, layer, false);
-        renderQuadForCalc(quadCalcVAO, vertexSize);
+    for (int layer = 0; layer < _rSamples; ++layer) {
+        program->setUniform("layer", layer);
+        renderQuadForCalc(vao);
+    }
+    if (_saveCalculationTextures) {
+        saveTextureFile("S_texture.ppm", glm::ivec2(_textureSize));
+    }
+    program->deactivate();
+}
+
+void AtmosphereDeferredcaster::calculateDeltaJ(GLuint vao, int scatteringOrder,
+                                               ghoul::opengl::ProgramObject& program,
+                                               GLuint deltaJ, GLuint deltaE,
+                                               GLuint deltaSRayleigh, GLuint deltaSMie)
+{
+    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaJ, 0);
+    glViewport(0, 0, _textureSize.x, _textureSize.y);
+    program.activate();
+
+    ghoul::opengl::TextureUnit transmittanceUnit;
+    transmittanceUnit.activate();
+    glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
+    program.setUniform("transmittanceTexture", transmittanceUnit);
+
+    ghoul::opengl::TextureUnit deltaEUnit;
+    deltaEUnit.activate();
+    glBindTexture(GL_TEXTURE_2D, deltaE);
+    program.setUniform("deltaETexture", deltaEUnit);
+
+    ghoul::opengl::TextureUnit deltaSRayleighUnit;
+    deltaSRayleighUnit.activate();
+    glBindTexture(GL_TEXTURE_3D, deltaSRayleigh);
+    program.setUniform("deltaSRTexture", deltaSRayleighUnit);
+    
+    ghoul::opengl::TextureUnit deltaSMieUnit;
+    deltaSMieUnit.activate();
+    glBindTexture(GL_TEXTURE_3D, deltaSMie);
+    program.setUniform("deltaSMTexture", deltaSMieUnit);
+
+    program.setUniform("firstIteration", (scatteringOrder == 2) ? 1 : 0);
+    program.setUniform("Rg", _atmospherePlanetRadius);
+    program.setUniform("Rt", _atmosphereRadius);
+    program.setUniform("AverageGroundReflectance", _averageGroundReflectance);
+    program.setUniform("HR", _rayleighHeightScale);
+    program.setUniform("betaRayleigh", _rayleighScatteringCoeff);
+    program.setUniform("HM", _mieHeightScale);
+    program.setUniform("betaMieScattering", _mieScatteringCoeff);
+    program.setUniform("mieG", _miePhaseConstant);
+    program.setUniform("SAMPLES_MU_S", _muSSamples);
+    program.setUniform("SAMPLES_NU", _nuSamples);
+    program.setUniform("SAMPLES_MU", _muSamples);
+    program.setUniform("SAMPLES_R", _rSamples);
+    for (int layer = 0; layer < _rSamples; ++layer) {
+        program.setUniform("layer", layer);
+        step3DTexture(program, layer);
+        renderQuadForCalc(vao);
     }
     if (_saveCalculationTextures) {
         saveTextureFile(
-            GL_COLOR_ATTACHMENT0,
-            "S_texture.ppm",
-            glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
+            fmt::format("deltaJ_texture-scattering_order-{}.ppm", scatteringOrder),
+            glm::ivec2(_textureSize)
         );
     }
-    _deltaSProgramObject->deactivate();
-
-    // loop in line 6 in algorithm 4.1
-    for (int scatteringOrder = 2; scatteringOrder <= 4; ++scatteringOrder) {
-        // line 7 in algorithm 4.1
-        glFramebufferTexture(
-            GL_FRAMEBUFFER,
-            GL_COLOR_ATTACHMENT0,
-            _deltaJTableTexture,
-            0
-        );
-        glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
-        _deltaJProgramObject->activate();
-        if (scatteringOrder == 2) {
-            _deltaJProgramObject->setUniform("firstIteraction", 1);
-        }
-        else {
-            _deltaJProgramObject->setUniform("firstIteraction", 0);
-        }
-        transmittanceTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-        _deltaJProgramObject->setUniform(
-            "transmittanceTexture",
-            transmittanceTableTextureUnit
-        );
-        deltaETableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_2D, _deltaETableTexture);
-        _deltaJProgramObject->setUniform("deltaETexture", deltaETableTextureUnit);
-        deltaSRayleighTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_3D, _deltaSRayleighTableTexture);
-        _deltaJProgramObject->setUniform(
-            "deltaSRTexture",
-            deltaSRayleighTableTextureUnit
-        );
-        deltaSMieTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_3D, _deltaSMieTableTexture);
-        _deltaJProgramObject->setUniform("deltaSMTexture", deltaSMieTableTextureUnit);
-        loadAtmosphereDataIntoShaderProgram(*_deltaJProgramObject);
-        for (int layer = 0; layer < _r_samples; ++layer) {
-            step3DTexture(*_deltaJProgramObject, layer, true);
-            renderQuadForCalc(quadCalcVAO, vertexSize);
-        }
-        if (_saveCalculationTextures) {
-            saveTextureFile(
-                GL_COLOR_ATTACHMENT0,
-                fmt::format("deltaJ_texture-scattering_order-{}.ppm", scatteringOrder),
-                glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
-            );
-        }
-        _deltaJProgramObject->deactivate();
-
-        // line 8 in algorithm 4.1
-        glFramebufferTexture(
-            GL_FRAMEBUFFER,
-            GL_COLOR_ATTACHMENT0,
-            _deltaETableTexture,
-            0
-        );
-        glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
-        _irradianceSupTermsProgramObject->activate();
-        if (scatteringOrder == 2) {
-            _irradianceSupTermsProgramObject->setUniform("firstIteraction", 1);
-        }
-        else {
-            _irradianceSupTermsProgramObject->setUniform("firstIteraction", 0);
-        }
-        transmittanceTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-        _irradianceSupTermsProgramObject->setUniform(
-            "transmittanceTexture",
-            transmittanceTableTextureUnit
-        );
-        deltaSRayleighTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_3D, _deltaSRayleighTableTexture);
-        _irradianceSupTermsProgramObject->setUniform(
-            "deltaSRTexture",
-            deltaSRayleighTableTextureUnit
-        );
-        deltaSMieTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_3D, _deltaSMieTableTexture);
-        _irradianceSupTermsProgramObject->setUniform(
-            "deltaSMTexture",
-            deltaSMieTableTextureUnit
-        );
-        loadAtmosphereDataIntoShaderProgram(*_irradianceSupTermsProgramObject);
-        renderQuadForCalc(quadCalcVAO, vertexSize);
-        if (_saveCalculationTextures) {
-            saveTextureFile(
-                GL_COLOR_ATTACHMENT0,
-                fmt::format("deltaE_texture-scattering_order-{}.ppm", scatteringOrder),
-                _deltaETableSize
-            );
-        }
-        _irradianceSupTermsProgramObject->deactivate();
-
-        // line 9 in algorithm 4.1
-        glFramebufferTexture(
-            GL_FRAMEBUFFER,
-            GL_COLOR_ATTACHMENT0,
-            _deltaSRayleighTableTexture,
-            0
-        );
-        glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
-        _inScatteringSupTermsProgramObject->activate();
-        transmittanceTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-        _inScatteringSupTermsProgramObject->setUniform(
-            "transmittanceTexture",
-            transmittanceTableTextureUnit
-        );
-        deltaJTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_3D, _deltaJTableTexture);
-        _inScatteringSupTermsProgramObject->setUniform(
-            "deltaJTexture",
-            deltaJTableTextureUnit
-        );
-        loadAtmosphereDataIntoShaderProgram(*_inScatteringSupTermsProgramObject);
-        for (int layer = 0; layer < _r_samples; ++layer) {
-            step3DTexture(*_inScatteringSupTermsProgramObject, layer, true);
-            renderQuadForCalc(quadCalcVAO, vertexSize);
-        }
-        if (_saveCalculationTextures) {
-            saveTextureFile(
-                GL_COLOR_ATTACHMENT0,
-                fmt::format("deltaS_texture-scattering_order-{}.ppm", scatteringOrder),
-                glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
-            );
-        }
-        _inScatteringSupTermsProgramObject->deactivate();
-
-        glEnable(GL_BLEND);
-        glBlendEquationSeparate(GL_FUNC_ADD, GL_FUNC_ADD);
-        glBlendFuncSeparate(GL_ONE, GL_ONE, GL_ONE, GL_ONE);
-
-        // line 10 in algorithm 4.1
-        glFramebufferTexture(
-            GL_FRAMEBUFFER,
-            GL_COLOR_ATTACHMENT0,
-            _irradianceTableTexture,
-            0
-        );
-        glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
-        _irradianceFinalProgramObject->activate();
-        deltaETableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_2D, _deltaETableTexture);
-        _irradianceFinalProgramObject->setUniform(
-            "deltaETexture",
-            deltaETableTextureUnit
-        );
-        loadAtmosphereDataIntoShaderProgram(*_irradianceFinalProgramObject);
-        renderQuadForCalc(quadCalcVAO, vertexSize);
-        if (_saveCalculationTextures) {
-            saveTextureFile(
-                GL_COLOR_ATTACHMENT0,
-                fmt::format("irradianceTable_order-{}.ppm", scatteringOrder),
-                _deltaETableSize
-            );
-        }
-        _irradianceFinalProgramObject->deactivate();
-
-        // line 11 in algorithm 4.1
-        glFramebufferTexture(
-            GL_FRAMEBUFFER,
-            GL_COLOR_ATTACHMENT0,
-            _inScatteringTableTexture,
-            0
-        );
-        glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
-        _deltaSSupTermsProgramObject->activate();
-        deltaSRayleighTableTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_3D, _deltaSRayleighTableTexture);
-        _deltaSSupTermsProgramObject->setUniform(
-            "deltaSTexture",
-            deltaSRayleighTableTextureUnit
-        );
-        loadAtmosphereDataIntoShaderProgram(*_deltaSSupTermsProgramObject);
-        for (int layer = 0; layer < _r_samples; ++layer) {
-            step3DTexture(*_deltaSSupTermsProgramObject, layer, false);
-            renderQuadForCalc(quadCalcVAO, vertexSize);
-        }
-        if (_saveCalculationTextures) {
-            saveTextureFile(GL_COLOR_ATTACHMENT0,
-                fmt::format("inscatteringTable_order-{}.ppm", scatteringOrder),
-                glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
-            );
-        }
-        _deltaSSupTermsProgramObject->deactivate();
-
-        glDisable(GL_BLEND);
-    }
-
-    // Restores OpenGL blending state
-    global::renderEngine->openglStateCache().resetBlendState();
+    program.deactivate();
 }
 
-void AtmosphereDeferredcaster::preCalculateAtmosphereParam() {
-    // Load Shader Programs for Calculations
-    loadComputationPrograms();
+void AtmosphereDeferredcaster::calculateDeltaE(GLuint vao, int scatteringOrder,
+                                               ghoul::opengl::ProgramObject& program,
+                                               GLuint deltaE, GLuint deltaSRayleigh,
+                                               GLuint deltaSMie)
+{
+    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaE, 0);
+    glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
+    program.activate();
+
+    ghoul::opengl::TextureUnit deltaSRayleighUnit;
+    deltaSRayleighUnit.activate();
+    glBindTexture(GL_TEXTURE_3D, deltaSRayleigh);
+    program.setUniform("deltaSRTexture", deltaSRayleighUnit);
+
+    ghoul::opengl::TextureUnit deltaSMieUnit;
+    deltaSMieUnit.activate();
+    glBindTexture(GL_TEXTURE_3D, deltaSMie);
+    program.setUniform("deltaSMTexture", deltaSMieUnit);
+
+    program.setUniform("firstIteration", (scatteringOrder == 2) ? 1 : 0);
+    program.setUniform("Rg", _atmospherePlanetRadius);
+    program.setUniform("Rt", _atmosphereRadius);
+    program.setUniform("mieG", _miePhaseConstant);
+    program.setUniform("SKY", _irradianceTableSize);
+    program.setUniform("SAMPLES_MU_S", _muSSamples);
+    program.setUniform("SAMPLES_NU", _nuSamples);
+    program.setUniform("SAMPLES_MU", _muSamples);
+    program.setUniform("SAMPLES_R", _rSamples);
+    renderQuadForCalc(vao);
+    if (_saveCalculationTextures) {
+        saveTextureFile(
+            fmt::format("deltaE_texture-scattering_order-{}.ppm", scatteringOrder),
+            _deltaETableSize
+        );
+    }
+    program.deactivate();
+}
+
+void AtmosphereDeferredcaster::calculateDeltaS(GLuint vao, int scatteringOrder,
+                                               ghoul::opengl::ProgramObject& program,
+                                               GLuint deltaSRayleigh, GLuint deltaJ)
+{
+    glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaSRayleigh, 0);
+    glViewport(0, 0, _textureSize.x, _textureSize.y);
+    program.activate();
+
+    ghoul::opengl::TextureUnit transmittanceUnit;
+    transmittanceUnit.activate();
+    glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
+    program.setUniform("transmittanceTexture", transmittanceUnit);
+
+    ghoul::opengl::TextureUnit deltaJUnit;
+    deltaJUnit.activate();
+    glBindTexture(GL_TEXTURE_3D, deltaJ);
+    program.setUniform("deltaJTexture", deltaJUnit);
+
+    program.setUniform("Rg", _atmospherePlanetRadius);
+    program.setUniform("Rt", _atmosphereRadius);
+    program.setUniform("SAMPLES_MU_S", _muSSamples);
+    program.setUniform("SAMPLES_NU", _nuSamples);
+    program.setUniform("SAMPLES_MU", _muSamples);
+    program.setUniform("SAMPLES_R", _rSamples);
+    for (int layer = 0; layer < _rSamples; ++layer) {
+        program.setUniform("layer", layer);
+        step3DTexture(program, layer);
+        renderQuadForCalc(vao);
+    }
+    if (_saveCalculationTextures) {
+        saveTextureFile(
+            fmt::format("deltaS_texture-scattering_order-{}.ppm", scatteringOrder),
+            glm::ivec2(_textureSize)
+        );
+    }
+    program.deactivate();
+}
+
+void AtmosphereDeferredcaster::calculateIrradiance(GLuint vao, int scatteringOrder,
+                                                   ghoul::opengl::ProgramObject& program,
+                                                   GLuint deltaE)
+{
+    glFramebufferTexture(
+        GL_FRAMEBUFFER,
+        GL_COLOR_ATTACHMENT0,
+        _irradianceTableTexture,
+        0
+    );
+    glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
+    program.activate();
+
+    ghoul::opengl::TextureUnit unit;
+    unit.activate();
+    glBindTexture(GL_TEXTURE_2D, deltaE);
+    program.setUniform("deltaETexture", unit);
+    program.setUniform("OTHER_TEXTURES", _deltaETableSize);
+
+    renderQuadForCalc(vao);
+    if (_saveCalculationTextures) {
+        saveTextureFile(
+            fmt::format("irradianceTable_order-{}.ppm", scatteringOrder),
+            _deltaETableSize
+        );
+    }
+    program.deactivate();
+}
+
+void AtmosphereDeferredcaster::calculateInscattering(GLuint vao, int scatteringOrder,
+                                                     ghoul::opengl::ProgramObject& prg,
+                                                     GLuint deltaSRayleigh)
+
+{
+    glFramebufferTexture(
+        GL_FRAMEBUFFER,
+        GL_COLOR_ATTACHMENT0,
+        _inScatteringTableTexture,
+        0
+    );
+    glViewport(0, 0, _textureSize.x, _textureSize.y);
+    prg.activate();
+
+    ghoul::opengl::TextureUnit unit;
+    unit.activate();
+    glBindTexture(GL_TEXTURE_3D, deltaSRayleigh);
+    prg.setUniform("deltaSTexture", unit);
+    prg.setUniform("SAMPLES_MU_S", _muSSamples);
+    prg.setUniform("SAMPLES_NU", _nuSamples);
+    prg.setUniform("SAMPLES_MU", _muSamples);
+    prg.setUniform("SAMPLES_R", _rSamples);
+    for (int layer = 0; layer < _rSamples; ++layer) {
+        prg.setUniform("layer", layer);
+        renderQuadForCalc(vao);
+    }
+    if (_saveCalculationTextures) {
+        saveTextureFile(
+            fmt::format("inscatteringTable_order-{}.ppm", scatteringOrder),
+            glm::ivec2(_textureSize)
+        );
+    }
+    prg.deactivate();
+}
+
+void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
+    using ProgramObject = ghoul::opengl::ProgramObject;
+    std::unique_ptr<ProgramObject> deltaJProgram = ProgramObject::Build(
+        "DeltaJ Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/deltaJ_calc_fs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+    );
+    std::unique_ptr<ProgramObject> irradianceSupTermsProgram = ProgramObject::Build(
+        "IrradianceSupTerms Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_sup_calc_fs.glsl")
+    );
+    std::unique_ptr<ProgramObject> inScatteringSupTermsProgram = ProgramObject::Build(
+        "InScatteringSupTerms Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_sup_calc_fs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+    );
+    std::unique_ptr<ProgramObject> irradianceFinalProgram = ProgramObject::Build(
+        "IrradianceEFinal Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_final_fs.glsl")
+    );
+    std::unique_ptr<ProgramObject> deltaSSupTermsProgram = ProgramObject::Build(
+        "DeltaSSUPTerms Program",
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_sup_calc_fs.glsl"),
+        absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+    );
 
-    // Create Textures for Calculations
-    createComputationTextures();
 
     // Saves current FBO first
     GLint defaultFBO;
@@ -1341,86 +978,127 @@ void AtmosphereDeferredcaster::preCalculateAtmosphereParam() {
     glDrawBuffers(1, drawBuffers);
 
     // Prepare for rendering/calculations
-    GLuint quadCalcVAO;
-    GLuint quadCalcVBO;
-    createRenderQuad(&quadCalcVAO, &quadCalcVBO, 1.0f);
-
-    // Starting Calculations...
-    LDEBUG("Starting precalculations for scattering effects");
+    GLuint quadVao;
+    GLuint quadVbo;
+    createRenderQuad(&quadVao, &quadVbo);
 
     // Execute Calculations
-    executeCalculations(quadCalcVAO, drawBuffers, 6);
+    LDEBUG("Starting precalculations for scattering effects");
+    glDisable(GL_BLEND);
 
-    deleteUnusedComputationTextures();
+    // See Precomputed Atmosphere Scattering from Bruneton et al. paper, algorithm 4.1:
+    calculateTransmittance(quadVao);
+
+    // line 2 in algorithm 4.1
+    GLuint deltaETable = calculateDeltaE(quadVao);
+
+    // line 3 in algorithm 4.1
+    auto [deltaSRayleighTable, deltaSMieTable] = calculateDeltaS(quadVao);
+
+    // line 4 in algorithm 4.1
+    calculateIrradiance(quadVao);
+
+    // line 5 in algorithm 4.1
+    calculateInscattering(quadVao, deltaSRayleighTable, deltaSMieTable);
+
+    GLuint deltaJTable = createTexture(_textureSize, "DeltaJ", 3);
+
+    // loop in line 6 in algorithm 4.1
+    for (int scatteringOrder = 2; scatteringOrder <= 4; ++scatteringOrder) {
+        // line 7 in algorithm 4.1
+        calculateDeltaJ(
+            quadVao,
+            scatteringOrder,
+            *deltaJProgram,
+            deltaJTable,
+            deltaETable,
+            deltaSRayleighTable,
+            deltaSMieTable
+        );
+
+        // line 8 in algorithm 4.1
+        calculateDeltaE(
+            quadVao,
+            scatteringOrder,
+            *irradianceSupTermsProgram,
+            deltaETable,
+            deltaSRayleighTable,
+            deltaSMieTable
+        );
+
+        // line 9 in algorithm 4.1
+        calculateDeltaS(
+            quadVao,
+            scatteringOrder,
+            *inScatteringSupTermsProgram,
+            deltaSRayleighTable,
+            deltaJTable
+        );
+
+        glEnable(GL_BLEND);
+        glBlendEquationSeparate(GL_FUNC_ADD, GL_FUNC_ADD);
+        glBlendFuncSeparate(GL_ONE, GL_ONE, GL_ONE, GL_ONE);
+
+        // line 10 in algorithm 4.1
+        calculateIrradiance(
+            quadVao,
+            scatteringOrder,
+            *irradianceFinalProgram,
+            deltaETable
+        );
+
+        // line 11 in algorithm 4.1
+        calculateInscattering(
+            quadVao,
+            scatteringOrder,
+            *deltaSSupTermsProgram,
+            deltaSRayleighTable
+        );
+
+        glDisable(GL_BLEND);
+    }
+
+    // Restores OpenGL blending state
+    global::renderEngine->openglStateCache().resetBlendState();
+
+    glDeleteTextures(1, &deltaETable);
+    glDeleteTextures(1, &deltaSRayleighTable);
+    glDeleteTextures(1, &deltaSMieTable);
+    glDeleteTextures(1, &deltaJTable);
 
     // Restores system state
     glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
     global::renderEngine->openglStateCache().setViewportState(viewport);
-    glDeleteBuffers(1, &quadCalcVBO);
-    glDeleteVertexArrays(1, &quadCalcVAO);
+    glDeleteBuffers(1, &quadVao);
+    glDeleteVertexArrays(1, &quadVbo);
     glDeleteFramebuffers(1, &calcFBO);
 
     LDEBUG("Ended precalculations for Atmosphere effects");
 }
 
-void AtmosphereDeferredcaster::loadAtmosphereDataIntoShaderProgram(
-                                                 ghoul::opengl::ProgramObject& shaderProg)
-{
-    shaderProg.setUniform("Rg", _atmospherePlanetRadius);
-    shaderProg.setUniform("Rt", _atmosphereRadius);
-    shaderProg.setUniform("AverageGroundReflectance", _planetAverageGroundReflectance);
-    shaderProg.setUniform("groundRadianceEmission", _planetGroundRadianceEmission);
-    shaderProg.setUniform("HR", _rayleighHeightScale);
-    shaderProg.setUniform("betaRayleigh", _rayleighScatteringCoeff);
-    shaderProg.setUniform("HM", _mieHeightScale);
-    shaderProg.setUniform("betaMieScattering", _mieScatteringCoeff);
-    shaderProg.setUniform("betaMieExtinction", _mieExtinctionCoeff);
-    shaderProg.setUniform("mieG", _miePhaseConstant);
-    shaderProg.setUniform("sunRadiance", _sunRadianceIntensity);
-    shaderProg.setUniform("TRANSMITTANCE", _transmittanceTableSize);
-    shaderProg.setUniform("SKY", _irradianceTableSize);
-    shaderProg.setUniform("OTHER_TEXTURES", _deltaETableSize);
-    shaderProg.setUniform("SAMPLES_R", _r_samples);
-    shaderProg.setUniform("SAMPLES_MU", _mu_samples);
-    shaderProg.setUniform("SAMPLES_MU_S", _mu_s_samples);
-    shaderProg.setUniform("SAMPLES_NU", _nu_samples);
-    shaderProg.setUniform("ozoneLayerEnabled", _ozoneEnabled);
-    shaderProg.setUniform("HO", _ozoneHeightScale);
-    shaderProg.setUniform("betaOzoneExtinction", _ozoneExtinctionCoeff);
-}
-
-void AtmosphereDeferredcaster::step3DTexture(ghoul::opengl::ProgramObject& shaderProg,
-                                             int layer, bool doCalculation)
+void AtmosphereDeferredcaster::step3DTexture(ghoul::opengl::ProgramObject& prg, int layer)
 {
     // See OpenGL redbook 8th Edition page 556 for Layered Rendering
-    if (doCalculation) {
-        const float earth2 = _atmospherePlanetRadius * _atmospherePlanetRadius;
-        const float diff = _atmosphereRadius * _atmosphereRadius - earth2;
-        const float ri = static_cast<float>(layer) / static_cast<float>(_r_samples - 1);
-        const float eps = [&]() {
-            if (layer == 0) {
-                return 0.01f;
-            }
-            else {
-                if (layer == (_r_samples - 1)) {
-                    return -0.001f;
-                }
-                else {
-                    return 0.f;
-                }
-            }
-        }();
-        const float r = std::sqrt(earth2 + ri * ri * diff) + eps;
-        const float dminG = r - _atmospherePlanetRadius;
-        const float dminT = _atmosphereRadius - r;
-        const float dh = std::sqrt(r * r - earth2);
-        const float dH = dh + std::sqrt(diff);
-
-        shaderProg.setUniform("r", r);
-        shaderProg.setUniform("dhdH", dminT, dH, dminG, dh);
+    const float planet2 = _atmospherePlanetRadius * _atmospherePlanetRadius;
+    const float diff = _atmosphereRadius * _atmosphereRadius - planet2;
+    const float ri = static_cast<float>(layer) / static_cast<float>(_rSamples - 1);
+    float eps = 0.01f;
+    if (layer > 0) {
+        if (layer == (_rSamples - 1)) {
+            eps = -0.001f;
+        }
+        else {
+            eps = 0.f;
+        }
     }
+    const float r = std::sqrt(planet2 + ri * ri * diff) + eps;
+    const float dminG = r - _atmospherePlanetRadius;
+    const float dminT = _atmosphereRadius - r;
+    const float dh = std::sqrt(r * r - planet2);
+    const float dH = dh + std::sqrt(diff);
 
-    shaderProg.setUniform("layer", layer);
+    prg.setUniform("r", r);
+    prg.setUniform("dhdH", dminT, dH, dminG, dh);
 }
 
 } // namespace openspace
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index 589d2479c7..a117882f8e 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -57,16 +57,17 @@ struct ShadowRenderingStruct {
 
 class AtmosphereDeferredcaster : public Deferredcaster {
 public:
+    AtmosphereDeferredcaster(float textureScale,
+        std::vector<ShadowConfiguration> shadowConfigArray, bool saveCalculatedTextures);
     virtual ~AtmosphereDeferredcaster() = default;
 
     void initialize();
     void deinitialize();
-    void preRaycast(const RenderData& renderData, const DeferredcastData& deferredData,
+    void preRaycast(const RenderData& data, const DeferredcastData& deferredData,
         ghoul::opengl::ProgramObject& program) override;
-    void postRaycast(const RenderData& renderData, const DeferredcastData& deferredData,
+    void postRaycast(const RenderData& data, const DeferredcastData& deferredData,
         ghoul::opengl::ProgramObject& program) override;
 
-    std::filesystem::path deferredcastPath() const override;
     std::filesystem::path deferredcastVSPath() const override;
     std::filesystem::path deferredcastFSPath() const override;
     std::filesystem::path helperPath() const override;
@@ -75,82 +76,64 @@ public:
 
     void update(const UpdateData&) override;
 
-    void preCalculateAtmosphereParam();
+    void calculateAtmosphereParameters();
 
     void setModelTransform(glm::dmat4 transform);
-    void setTime(double time);
-    void setAtmosphereRadius(float atmRadius);
-    void setPlanetRadius(float planetRadius);
-    void setPlanetAverageGroundReflectance(float averageGReflectance);
-    void setPlanetGroundRadianceEmission(float groundRadianceEmission);
-    void setRayleighHeightScale(float rayleighHeightScale);
-    void enableOzone(bool enable);
-    void setOzoneHeightScale(float ozoneHeightScale);
-    void setMieHeightScale(float mieHeightScale);
-    void setMiePhaseConstant(float miePhaseConstant);
-    void setSunRadianceIntensity(float sunRadiance);
-    void setRayleighScatteringCoefficients(glm::vec3 rayScattCoeff);
-    void setOzoneExtinctionCoefficients(glm::vec3 ozoneExtCoeff);
-    void setMieScatteringCoefficients(glm::vec3 mieScattCoeff);
-    void setMieExtinctionCoefficients(glm::vec3 mieExtCoeff);
-    void setEllipsoidRadii(glm::dvec3 radii);
-    void setShadowConfigArray(std::vector<ShadowConfiguration> shadowConfigArray);
-    void setHardShadows(bool enabled);
-    void enableSunFollowing(bool enable);
 
-    void setPrecalculationTextureScale(float preCalculatedTexturesScale);
-    void enablePrecalculationTexturesSaving();
+    void setParameters(float atmosphereRadius, float planetRadius,
+        float averageGroundReflectance, float groundRadianceEmission,
+        float rayleighHeightScale, bool enableOzone, float ozoneHeightScale,
+        float mieHeightScale, float miePhaseConstant, float sunRadiance,
+        glm::vec3 rayScatteringCoefficients, glm::vec3 ozoneExtinctionCoefficients,
+        glm::vec3 mieScatteringCoefficients, glm::vec3 mieExtinctionCoefficients,
+        bool sunFollowing);
+
+    void setHardShadows(bool enabled);
 
 private:
-    void loadComputationPrograms();
-    void unloadComputationPrograms();
-    void createComputationTextures();
-    void deleteComputationTextures();
-    void deleteUnusedComputationTextures();
-    void executeCalculations(GLuint quadCalcVAO, GLenum drawBuffers[1],
-        GLsizei vertexSize);
-    void step3DTexture(ghoul::opengl::ProgramObject& shaderProg, int layer,
-        bool doCalculation);
-    void loadAtmosphereDataIntoShaderProgram(ghoul::opengl::ProgramObject& shaderProg);
+    void step3DTexture(ghoul::opengl::ProgramObject& prg, int layer);
+
+    void calculateTransmittance(GLuint vao);
+    GLuint calculateDeltaE(GLuint vao);
+    std::pair<GLuint, GLuint> calculateDeltaS(GLuint vao);
+    void calculateIrradiance(GLuint vao);
+    void calculateInscattering(GLuint vao, GLuint deltaSRayleigh, GLuint deltaSMie);
+    void calculateDeltaJ(GLuint vao, int scatteringOrder,
+        ghoul::opengl::ProgramObject& program, GLuint deltaJ, GLuint deltaE,
+        GLuint deltaSRayleigh, GLuint deltaSMie);
+    void calculateDeltaE(GLuint vao, int scatteringOrder,
+        ghoul::opengl::ProgramObject& program, GLuint deltaE, GLuint deltaSRayleigh,
+        GLuint deltaSMie);
+    void calculateDeltaS(GLuint vao, int scatteringOrder,
+        ghoul::opengl::ProgramObject& program, GLuint deltaSRayleigh, GLuint deltaJ);
+    void calculateIrradiance(GLuint vao, int scatteringOrder,
+        ghoul::opengl::ProgramObject& program, GLuint deltaE);
+    void calculateInscattering(GLuint vao, int scatteringOrder,
+        ghoul::opengl::ProgramObject& program, GLuint deltaSRayleigh);
 
-    std::unique_ptr<ghoul::opengl::ProgramObject> _transmittanceProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _irradianceProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _irradianceSupTermsProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _irradianceFinalProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _inScatteringProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _inScatteringSupTermsProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _deltaEProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _deltaSProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _deltaSSupTermsProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _deltaJProgramObject;
 
     UniformCache(cullAtmosphere, Rg, Rt, groundRadianceEmission, HR, betaRayleigh, HM,
         betaMieExtinction, mieG, sunRadiance, ozoneLayerEnabled, HO, betaOzoneExtinction,
         SAMPLES_R, SAMPLES_MU, SAMPLES_MU_S, SAMPLES_NU, inverseModelTransformMatrix, 
-        modelTransformMatrix, projectionToModelTransformMatrix,
-        viewToWorldMatrix, camPosObj, sunDirectionObj, hardShadows,
-        transmittanceTexture, irradianceTexture, inscatterTexture) _uniformCache;
-
-    GLuint _transmittanceTableTexture = 0;
-    GLuint _irradianceTableTexture = 0;
-    GLuint _inScatteringTableTexture = 0;
-    GLuint _deltaETableTexture = 0;
-    GLuint _deltaSRayleighTableTexture = 0;
-    GLuint _deltaSMieTableTexture = 0;
-    GLuint _deltaJTableTexture = 0;
+        modelTransformMatrix, projectionToModelTransform, viewToWorldMatrix,
+        camPosObj, sunDirectionObj, hardShadows, transmittanceTexture, irradianceTexture, 
+        inscatterTexture) _uniformCache;
 
     ghoul::opengl::TextureUnit _transmittanceTableTextureUnit;
     ghoul::opengl::TextureUnit _irradianceTableTextureUnit;
     ghoul::opengl::TextureUnit _inScatteringTableTextureUnit;
 
+    GLuint _transmittanceTableTexture = 0;
+    GLuint _irradianceTableTexture = 0;
+    GLuint _inScatteringTableTexture = 0;
+
     // Atmosphere Data
-    bool _atmosphereCalculated = false;
     bool _ozoneEnabled = false;
     bool _sunFollowingCameraEnabled = false;
     float _atmosphereRadius = 0.f;
     float _atmospherePlanetRadius = 0.f;
-    float _planetAverageGroundReflectance = 0.f;
-    float _planetGroundRadianceEmission = 0.f;
+    float _averageGroundReflectance = 0.f;
+    float _groundRadianceEmission = 0.f;
     float _rayleighHeightScale = 0.f;
     float _ozoneHeightScale = 0.f;
     float _mieHeightScale = 0.f;
@@ -161,34 +144,33 @@ private:
     glm::vec3 _ozoneExtinctionCoeff = glm::vec3(0.f);
     glm::vec3 _mieScatteringCoeff = glm::vec3(0.f);
     glm::vec3 _mieExtinctionCoeff = glm::vec3(0.f);
-    glm::dvec3 _ellipsoidRadii = glm::dvec3(0.0);
 
     // Atmosphere Textures Dimmensions
-    glm::ivec2 _transmittanceTableSize = glm::ivec2(256, 64);
-    glm::ivec2 _irradianceTableSize = glm::ivec2(64, 16);
-    glm::ivec2 _deltaETableSize = glm::ivec2(64, 16);
-    int _r_samples = 32;
-    int _mu_samples = 128;
-    int _mu_s_samples = 32;
-    int _nu_samples = 8;
+    const glm::ivec2 _transmittanceTableSize;
+    const glm::ivec2 _irradianceTableSize;
+    const glm::ivec2 _deltaETableSize;
+    const int _muSSamples;
+    const int _nuSamples;
+    const int _muSamples;
+    const int _rSamples;
+    const glm::ivec3 _textureSize;
 
     glm::dmat4 _modelTransform;
-    double _time = 0.0;
 
     // Eclipse Shadows
     std::vector<ShadowConfiguration> _shadowConfArray;
+    std::vector<ShadowRenderingStruct> _shadowDataArrayCache;
     bool _hardShadowsEnabled = false;
 
     // Atmosphere Debugging
-    bool _saveCalculationTextures = false;
+    const bool _saveCalculationTextures = false;
 
-    std::vector<ShadowRenderingStruct> _shadowDataArrayCache;
     // Assuming < 1000 shadow casters, the longest uniform name that we are getting is
     // shadowDataArray[999].casterPositionVec
     // which needs to fit into the uniform buffer
     char _uniformNameBuffer[40];
 };
 
-} // openspace
+} // namespace openspace
 
 #endif // __OPENSPACE_MODULE_ATMOSPHERE___ATMOSPHEREDEFERREDCASTER___H__
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index e14ff893a7..6f0fa990ac 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -244,7 +244,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         MieScatteringCoeffInfo,
         glm::vec3(0.004f), glm::vec3(0.00001f), glm::vec3(1.f)
     )
-    , _mieScatteringExtinctionPropCoefficient(
+    , _mieScatteringExtinctionPropCoeff(
         MieScatteringExtinctionPropCoeffInfo,
         0.9f, 0.01f, 1.f
     )
@@ -328,16 +328,15 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
     _miePhaseConstant.onChange(updateWithCalculation);
     addProperty(_miePhaseConstant);
 
-    _mieScatteringExtinctionPropCoefficient =
+    _mieScatteringExtinctionPropCoeff =
         _mieScattExtPropCoefProp != 1.f ? _mieScattExtPropCoefProp :
         _mieScatteringCoeff.value().x / _mieExtinctionCoeff.x;
 
-    _mieScatteringExtinctionPropCoefficient.onChange(updateWithCalculation);
-    addProperty(_mieScatteringExtinctionPropCoefficient);
+    _mieScatteringExtinctionPropCoeff.onChange(updateWithCalculation);
+    addProperty(_mieScatteringExtinctionPropCoeff);
 
     if (p.debug.has_value()) {
-        _preCalculatedTexturesScale =
-            p.debug->preCalculatedTextureScale.value_or(_preCalculatedTexturesScale);
+        _textureScale = p.debug->preCalculatedTextureScale.value_or(_textureScale);
 
         _saveCalculationsToTexture =
             p.debug->saveCalculatedTextures.value_or(_saveCalculationsToTexture);
@@ -364,15 +363,13 @@ void RenderableAtmosphere::deinitializeGL() {
 }
 
 void RenderableAtmosphere::initializeGL() {
-    _deferredcaster = std::make_unique<AtmosphereDeferredcaster>();
+    _deferredcaster = std::make_unique<AtmosphereDeferredcaster>(
+        _textureScale,
+        _shadowEnabled ? std::move(_shadowConfArray) : std::vector<ShadowConfiguration>(),
+        _saveCalculationsToTexture
+    );
+    _shadowConfArray.clear();
     updateAtmosphereParameters();
-
-    if (_shadowEnabled) {
-        _deferredcaster->setShadowConfigArray(_shadowConfArray);
-        // We no longer need it
-        _shadowConfArray.clear();
-    }
-
     _deferredcaster->initialize();
 
     global::deferredcasterManager->attachDeferredcaster(*_deferredcaster);
@@ -382,13 +379,11 @@ bool RenderableAtmosphere::isReady() const {
     return true;
 }
 
-glm::dmat4 RenderableAtmosphere::computeModelTransformMatrix(
-                                                       const TransformData& transformData)
-{
+glm::dmat4 RenderableAtmosphere::computeModelTransformMatrix(const TransformData& data) {
     // scale the planet to appropriate size since the planet is a unit sphere
-    return glm::translate(glm::dmat4(1.0), transformData.translation) *
-        glm::dmat4(transformData.rotation) *
-        glm::scale(glm::dmat4(1.0), glm::dvec3(transformData.scale));
+    return glm::translate(glm::dmat4(1.0), data.translation) *
+        glm::dmat4(data.rotation) *
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.scale));
 }
 
 void RenderableAtmosphere::render(const RenderData& data, RendererTasks& renderTask) {
@@ -404,11 +399,10 @@ void RenderableAtmosphere::update(const UpdateData& data) {
         _deferredCasterNeedsUpdate = false;
     }
     if (_deferredCasterNeedsCalculation) {
-        _deferredcaster->preCalculateAtmosphereParam();
+        _deferredcaster->calculateAtmosphereParameters();
         _deferredCasterNeedsCalculation = false;
     }
 
-    _deferredcaster->setTime(data.time.j2000Seconds());
     glm::dmat4 modelTransform = computeModelTransformMatrix(data.modelTransform);
     _deferredcaster->setModelTransform(modelTransform);
     _deferredcaster->update(data);
@@ -416,34 +410,26 @@ void RenderableAtmosphere::update(const UpdateData& data) {
 
 void RenderableAtmosphere::updateAtmosphereParameters() {
     _mieExtinctionCoeff =
-        _mieScatteringCoeff.value() / _mieScatteringExtinctionPropCoefficient.value();
+        _mieScatteringCoeff.value() / _mieScatteringExtinctionPropCoeff.value();
 
-    _deferredcaster->setAtmosphereRadius(_planetRadius + _atmosphereHeight);
-    _deferredcaster->setPlanetRadius(_planetRadius);
-    _deferredcaster->setPlanetAverageGroundReflectance(_groundAverageReflectance);
-    _deferredcaster->setPlanetGroundRadianceEmission(_groundRadianceEmission);
-    _deferredcaster->setRayleighHeightScale(_rayleighHeightScale);
-    _deferredcaster->enableOzone(_ozoneEnabled);
-    _deferredcaster->setOzoneHeightScale(_ozoneHeightScale);
-    _deferredcaster->setMieHeightScale(_mieHeightScale);
-    _deferredcaster->setMiePhaseConstant(_miePhaseConstant);
-    _deferredcaster->setSunRadianceIntensity(_sunIntensity);
-    _deferredcaster->setRayleighScatteringCoefficients(_rayleighScatteringCoeff);
-    _deferredcaster->setOzoneExtinctionCoefficients(_ozoneCoeff);
-    _deferredcaster->setMieScatteringCoefficients(_mieScatteringCoeff);
-    _deferredcaster->setMieExtinctionCoefficients(_mieExtinctionCoeff);
-    _deferredcaster->enableSunFollowing(_sunFollowingCameraEnabled);
-    // TODO: Fix the ellipsoid nature of the renderable globe (JCC)
-    //_deferredcaster->setEllipsoidRadii(_ellipsoid.radii());
-
-    _deferredcaster->setPrecalculationTextureScale(_preCalculatedTexturesScale);
-    if (_saveCalculationsToTexture) {
-        _deferredcaster->enablePrecalculationTexturesSaving();
-    }
-
-    if (_shadowEnabled) {
-        _deferredcaster->setHardShadows(_hardShadowsEnabled);
-    }
+    _deferredcaster->setParameters(
+        _planetRadius + _atmosphereHeight,
+        _planetRadius,
+        _groundAverageReflectance,
+        _groundRadianceEmission,
+        _rayleighHeightScale,
+        _ozoneEnabled,
+        _ozoneHeightScale,
+        _mieHeightScale,
+        _miePhaseConstant,
+        _sunIntensity,
+        _rayleighScatteringCoeff,
+        _ozoneCoeff,
+        _mieScatteringCoeff,
+        _mieExtinctionCoeff,
+        _sunFollowingCameraEnabled
+    );
+    _deferredcaster->setHardShadows(_hardShadowsEnabled);
 }
 
 }  // namespace openspace
diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index 63ec3afeab..c0f871ff2c 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -72,7 +72,7 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    glm::dmat4 computeModelTransformMatrix(const openspace::TransformData& transformData);
+    glm::dmat4 computeModelTransformMatrix(const openspace::TransformData& data);
     void updateAtmosphereParameters();
 
     properties::FloatProperty _atmosphereHeight;
@@ -85,7 +85,7 @@ private:
     properties::Vec3Property _ozoneCoeff;
     properties::FloatProperty _mieHeightScale;
     properties::Vec3Property _mieScatteringCoeff;
-    properties::FloatProperty _mieScatteringExtinctionPropCoefficient;
+    properties::FloatProperty _mieScatteringExtinctionPropCoeff;
     properties::FloatProperty _miePhaseConstant;
     properties::FloatProperty _sunIntensity;
     properties::BoolProperty _sunFollowingCameraEnabled;
@@ -98,7 +98,7 @@ private:
 
     // Atmosphere Debug
     bool _saveCalculationsToTexture = false;
-    float _preCalculatedTexturesScale = 1.f;
+    float _textureScale = 1.f;
 
     std::unique_ptr<AtmosphereDeferredcaster> _deferredcaster;
 
diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/atmosphere/shaders/atmosphere_common.glsl
index 6a0884f861..c935dc0c50 100644
--- a/modules/atmosphere/shaders/atmosphere_common.glsl
+++ b/modules/atmosphere/shaders/atmosphere_common.glsl
@@ -54,85 +54,11 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Atmosphere Rendering Parameters 
-uniform float Rg;
-uniform float Rt;
-uniform float AverageGroundReflectance;
-uniform float groundRadianceEmission;
-uniform float HR;
-uniform vec3 betaRayleigh;
-uniform float HO;
-uniform vec3 betaOzoneExtinction;
-uniform float HM;
-uniform vec3 betaMieScattering;
-uniform vec3 betaMieExtinction;
-uniform float mieG;
-uniform float sunRadiance;
-
-uniform bool ozoneLayerEnabled;
-
-uniform ivec2 TRANSMITTANCE;
-uniform ivec2 SKY;
-uniform ivec2 OTHER_TEXTURES;
-uniform int SAMPLES_R;
-uniform int SAMPLES_MU;
-uniform int SAMPLES_MU_S;
-uniform int SAMPLES_NU;
 
+const int INSCATTER_INTEGRAL_SAMPLES = 50;
+const float M_PI = 3.141592657;
 const float ATM_EPSILON = 1.0;
 
-// Integration steps
-const int TRANSMITTANCE_STEPS = 500;
-const int INSCATTER_INTEGRAL_SAMPLES = 50;
-const int IRRADIANCE_INTEGRAL_SAMPLES = 32;
-const int INSCATTER_SPHERICAL_INTEGRAL_SAMPLES = 16;
-
-const float M_PI = 3.141592657;
-const float M_2PI = 2.0 * M_PI;
-
-uniform sampler2D transmittanceTexture;
-
-float Rg2 = Rg * Rg;
-float Rt2 = Rt * Rt;
-float H = sqrt(Rt2 - Rg2);
-float H2 = Rt2 - Rg2;
-float invSamplesMu = 1.0 / float(SAMPLES_MU);
-float invSamplesR = 1.0 / float(SAMPLES_R);
-float invSamplesMuS = 1.0 / float(SAMPLES_MU_S);
-float invSamplesNu = 1.0 / float(SAMPLES_NU);
-float RtMinusRg = float(Rt - Rg);
-float invRtMinusRg = 1.0 / RtMinusRg;
-
-float opticalDepth(float localH, float r, float mu, float d) {
-  float invH = 1.0 / localH;
-  float a = sqrt(0.5 * invH * r);
-  vec2 a01 = a * vec2(mu, mu + d / r);
-  vec2 a01s = sign(a01);
-  vec2 a01sq = a01 * a01;
-  float x = a01s.y > a01s.x ? exp(a01sq.x) : 0.0;
-  vec2 y = a01s / (2.3193 * abs(a01) + sqrt(1.52 * a01sq + 4.0)) * vec2(1.0, exp(-d * invH * (d / (2.0 * r) + mu)));
-  return sqrt(M_2PI * H * r) * exp((Rg-r)*invH) * (x + dot(y, vec2(1.0, -1.0)));
-}
-
-vec3 analyticTransmittance(float r, float mu, float d) {
-  vec3 ozone = vec3(0.0);
-  if (ozoneLayerEnabled) {
-    ozone = betaOzoneExtinction * (0.0000006) * opticalDepth(HO, r, mu, d);
-  }
-  return exp(-betaRayleigh * opticalDepth(HR, r, mu, d) - ozone -
-    betaMieExtinction * opticalDepth(HM, r, mu, d));
-}
-
-vec3 irradiance(sampler2D sampler, float r, float muSun) {
-  float u_r = (r - Rg) * invRtMinusRg;
-  float u_muSun = (muSun + 0.2) / 1.2;
-  return texture(sampler, vec2(u_muSun, u_r)).rgb;
-}
-
-
-//================================================//
-//=============== General Functions ==============//
-//================================================//
 // In the following shaders r (altitude) is the length of vector/position x in the
 // atmosphere (or on the top of it when considering an observer in space), where the light
 // is coming from the opposite direction of the view direction, here the vector v or
@@ -142,7 +68,7 @@ vec3 irradiance(sampler2D sampler, float r, float muSun) {
 // or top of atmosphere
 // r := || vec(x) || e [0, Rt]
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r 
-float rayDistance(float r, float mu) {
+float rayDistance(float r, float mu, float Rt, float Rg) {
   // The light ray starting at the observer in/on the atmosphere can have to possible end
   // points: the top of the atmosphere or the planet ground. So the shortest path is the
   // one we are looking for, otherwise we may be passing through the ground
@@ -151,9 +77,8 @@ float rayDistance(float r, float mu) {
   float atmRadiusEps2 = (Rt + ATM_EPSILON) * (Rt + ATM_EPSILON);
   float mu2 = mu * mu;
   float r2 = r * r;
-  float rg2 = Rg * Rg;
   float rayDistanceAtmosphere = -r * mu + sqrt(r2 * (mu2 - 1.0) + atmRadiusEps2); 
-  float delta = r2 * (mu2 - 1.0) + rg2;
+  float delta = r2 * (mu2 - 1.0) + Rg*Rg;
 
   // Ray may be hitting ground
   if (delta >= 0.0) {
@@ -173,19 +98,23 @@ float rayDistance(float r, float mu) {
 // nu := cosone of the angle between vec(s) and vec(v)
 // dhdH := it is a vec4. dhdH.x stores the dminT := Rt - r, dhdH.y stores the dH value
 //         (see paper), dhdH.z stores dminG := r - Rg and dhdH.w stores dh (see paper)
-void unmappingMuMuSunNu(float r, vec4 dhdH, out float mu, out float muSun, out float nu) {
+void unmappingMuMuSunNu(float r, vec4 dhdH, int SAMPLES_MU, float Rg, float Rt,
+                        int SAMPLES_MU_S, int SAMPLES_NU,
+                        out float mu, out float muSun, out float nu)
+{
   // Window coordinates of pixel (uncentering also)
   vec2 fragment = gl_FragCoord.xy - vec2(0.5);
 
   // Pre-calculations
   float r2  = r * r;
+  float Rg2 = Rg * Rg;
   
   float halfSAMPLE_MU = float(SAMPLES_MU) / 2.0;
   // If the (vec(x) dot vec(v))/r is negative, i.e., the light ray has great probability
   // to touch the ground, we obtain mu considering the geometry of the ground
   if (fragment.y < halfSAMPLE_MU) {
     float ud = 1.0 - (fragment.y / (halfSAMPLE_MU - 1.0));
-    float d  = min(max(dhdH.z, ud * dhdH.w), dhdH.w * 0.999);
+    float d = min(max(dhdH.z, ud * dhdH.w), dhdH.w * 0.999);
     // cosine law: Rg^2 = r^2 + d^2 - 2rdcos(pi-theta) where cosine(theta) = mu
     mu = (Rg2 - r2 - d * d) / (2.0 * r * d);
     // We can't handle a ray inside the planet, i.e., when r ~ Rg, so we check against it.
@@ -199,12 +128,12 @@ void unmappingMuMuSunNu(float r, vec4 dhdH, out float mu, out float muSun, out f
     float d = (fragment.y - halfSAMPLE_MU) / (halfSAMPLE_MU - 1.0);
     d = min(max(dhdH.x, d * dhdH.y), dhdH.y * 0.999);
     // cosine law: Rt^2 = r^2 + d^2 - 2rdcos(pi-theta) where cosine(theta) = mu
-    mu = (Rt2 - r2 - d * d) / (2.0 * r * d);
+    mu = (Rt*Rt - r2 - d * d) / (2.0 * r * d);
   }
   
   float modValueMuSun = mod(fragment.x, float(SAMPLES_MU_S)) / (float(SAMPLES_MU_S) - 1.0);
-  // The following mapping is different from the paper. See Colliene for an details.
-  muSun = tan((2.0 * modValueMuSun - 1.0 + 0.26) * 1.1f) / tan(1.26 * 1.1);
+  // The following mapping is different from the paper. See Collienne for an details.
+  muSun = tan((2.0 * modValueMuSun - 1.0 + 0.26) * 1.1) / tan(1.26 * 1.1);
   nu = -1.0 + floor(fragment.x / float(SAMPLES_MU_S)) / (float(SAMPLES_NU) - 1.0) * 2.0;
 }
 
@@ -213,14 +142,14 @@ void unmappingMuMuSunNu(float r, vec4 dhdH, out float mu, out float muSun, out f
 // hits the ground or the top of atmosphere.
 // r := height of starting point vect(x)
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
-vec3 transmittance(float r, float mu) {
+vec3 transmittance(sampler2D tex, float r, float mu, float Rg, float Rt) {
   // Given the position x (here the altitude r) and the view angle v
   // (here the cosine(v)= mu), we map this
-  float u_r = sqrt((r - Rg) * invRtMinusRg);
-  // See Colliene to understand the mapping
+  float u_r = sqrt((r - Rg) / (Rt - Rg));
+  // See Collienne to understand the mapping
   float u_mu = atan((mu + 0.15) / 1.15 * tan(1.5)) / 1.5;
   
-  return texture(transmittanceTexture, vec2(u_mu, u_r)).rgb;
+  return texture(tex, vec2(u_mu, u_r)).rgb;
 }
 
 // Given a position r and direction mu, calculates de transmittance along the ray with
@@ -228,13 +157,13 @@ vec3 transmittance(float r, float mu) {
 // T(a,b) = TableT(a,v)/TableT(b, v)
 // r := height of starting point vect(x)
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
-vec3 transmittance(float r, float mu, float d) {
+vec3 transmittance(sampler2D tex, float r, float mu, float d, float Rg, float Rt) {
   // Here we use the transmittance property: T(x,v) = T(x,d)*T(d,v) to, given a distance
   // d, calculates that transmittance along that distance starting in x (height r):
   // T(x,d) = T(x,v)/T(d,v).
   // 
   // From cosine law: c^2 = a^2 + b^2 - 2*a*b*cos(ab)
-  float ri = sqrt(d * d  + r * r + 2.0 * r * d * mu);
+  float ri = sqrt(d * d + r * r + 2.0 * r * d * mu);
   // mu_i = (vec(d) dot vec(v)) / r_i
   //      = ((vec(x) + vec(d-x)) dot vec(v))/ r_i
   //      = (r*mu + d) / r_i
@@ -246,19 +175,21 @@ vec3 transmittance(float r, float mu, float d) {
   // x --> x0, then x0-->x.
   // Also, let's use the property: T(a,c) = T(a,b)*T(b,c)
   // Because T(a,c) and T(b,c) are already in the table T, T(a,b) = T(a,c)/T(b,c).
+  vec3 res;
   if (mu > 0.0) {
-    return min(transmittance(r, mu) /  transmittance(ri, mui), 1.0);
+    res = transmittance(tex, r, mu, Rg, Rt) / transmittance(tex, ri, mui, Rg, Rt);
   }
   else {
-    return min(transmittance(ri, -mui) / transmittance(r, -mu), 1.0);
+    res = transmittance(tex, ri, -mui, Rg, Rt) / transmittance(tex, r, -mu, Rg, Rt);
   }
+  return min(res, 1.0);
 }
 
 // Calculates Rayleigh phase function given the scattering cosine angle mu
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
 float rayleighPhaseFunction(float mu) {
-    //return (3.0f / (16.0f * M_PI)) * (1.0f + mu * mu);
-    return 0.0596831036 * (1.0 + mu * mu);
+  // return (3.0 / (16.0 * M_PI)) * (1.0 + mu * mu);
+  return 0.0596831036 * (1.0 + mu * mu);
 }
 
 // Calculates Mie phase function given the scattering cosine angle mu
@@ -277,38 +208,30 @@ float miePhaseFunction(float mu, float mieG) {
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
 // muSun := cosine of the zeith angle of vec(s). Or muSun = (vec(s) * vec(v))
 // nu := cosine of the angle between vec(s) and vec(v)
-vec4 texture4D(sampler3D table, float r, float mu, float muSun, float nu) {
+vec4 texture4D(sampler3D table, float r, float mu, float muSun, float nu, float Rg,
+               int samplesMu, float Rt, int samplesR, int samplesMuS,
+               int samplesNu)
+{
   float r2 = r * r;
+  float Rg2 = Rg * Rg;
+  float Rt2 = Rt * Rt;
   float rho = sqrt(r2 - Rg2);
   float rmu = r * mu;
   float delta = rmu * rmu - r2 + Rg2;
 
   vec4 cst = rmu < 0.0 && delta > 0.0 ?
-    vec4(1.0, 0.0, 0.0, 0.5 - 0.5 * invSamplesMu) :
-    vec4(-1.0, H2, H, 0.5 + 0.5 * invSamplesMu);
+    vec4(1.0, 0.0, 0.0, 0.5 - 0.5 / float(samplesMu)) :
+    vec4(-1.0, Rt2 - Rg2, sqrt(Rt2 - Rg2), 0.5 + 0.5 / float(samplesMu));
 
-  float u_r = 0.5 * invSamplesR + rho / H * (1.0 - invSamplesR);
-  float u_mu = cst.w + (rmu * cst.x + sqrt(delta + cst.y)) / (rho + cst.z) * (0.5 - invSamplesMu);
-  float u_mu_s = 0.5 * invSamplesMuS +
-    (atan(max(muSun, -0.1975) * tan(1.386)) * 0.9090909090909090 + 0.74) * 0.5 * (1.0 - invSamplesMuS);
-  float lerp = (nu + 1.0) / 2.0 * (float(SAMPLES_NU) - 1.0);
-  float u_nu = floor(lerp);
-  lerp = lerp - u_nu;
+  float u_r = 0.5 / float(samplesR) + rho / sqrt(Rt2 - Rg2) * (1.0 - 1.0 / float(samplesR));
+  float u_mu = cst.w + (rmu * cst.x + sqrt(delta + cst.y)) / (rho + cst.z) * (0.5 - 1.0 / samplesMu);
+  float u_mu_s = 0.5 / float(samplesMuS) +
+    (atan(max(muSun, -0.1975) * tan(1.386)) * 0.9090909090909090 + 0.74) * 0.5 * (1.0 - 1.0 / float(samplesMuS));
+  float t = (nu + 1.0) / 2.0 * (float(samplesNu) - 1.0);
+  float u_nu = floor(t);
+  t = t - u_nu;
 
-  return texture(
-    table, vec3((u_nu + u_mu_s) * invSamplesNu, u_mu, u_r)) * (1.0 - lerp) +
-    texture(table, vec3((u_nu + u_mu_s + 1.0) * invSamplesNu, u_mu, u_r)) * lerp;
-}
-
-// Given the irradiance texture table, the cosine of zenith sun vector and the height of
-// the observer (ray's stating point x), calculates the mapping for u_r and u_muSun and
-// returns the value in the LUT
-// lut   := OpenGL texture2D sampler (the irradiance texture deltaE)
-// muSun := cosine of the zeith angle of vec(s). Or muSun = (vec(s) * vec(v))
-// r     := height of starting point vect(x)
-vec3 irradianceLUT(sampler2D lut, float muSun, float r) {
-  // See Bruneton paper and Coliene to understand the mapping
-  float u_muSun = (muSun + 0.2) / 1.2;
-  float u_r = (r - Rg) * invRtMinusRg;
-  return texture(lut, vec2(u_muSun, u_r)).rgb;
+  vec4 v1 = texture(table, vec3((u_nu + u_mu_s) / float(samplesNu), u_mu, u_r));
+  vec4 v2 = texture(table, vec3((u_nu + u_mu_s + 1.0) / float(samplesNu), u_mu, u_r));
+  return mix(v1, v2, t);
 }
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index f0f97c8de1..6c524a5072 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -64,27 +64,37 @@ out vec4 renderTarget;
 
 uniform int cullAtmosphere;
 
+uniform float Rg;
+uniform float Rt;
+uniform float groundRadianceEmission;
+uniform float HR;
+uniform vec3 betaRayleigh;
+uniform float HO;
+uniform vec3 betaOzoneExtinction;
+uniform float HM;
+uniform vec3 betaMieExtinction;
+uniform float mieG;
+uniform float sunRadiance;
+uniform bool ozoneLayerEnabled;
+uniform int SAMPLES_R;
+uniform int SAMPLES_MU;
+uniform int SAMPLES_MU_S;
+uniform int SAMPLES_NU;
+uniform sampler2D transmittanceTexture;
 uniform sampler2D irradianceTexture;
 uniform sampler3D inscatterTexture;
 uniform sampler2D mainPositionTexture;
 uniform sampler2D mainNormalTexture;
 uniform sampler2D mainColorTexture;
-
 uniform dmat4 inverseModelTransformMatrix; 
 uniform dmat4 modelTransformMatrix;
 uniform dmat4 viewToWorldMatrix;
 uniform dmat4 projectionToModelTransformMatrix;
-
 uniform vec4 viewport;
 uniform vec2 resolution;
-
 uniform dvec3 camPosObj;
 uniform dvec3 sunDirectionObj;
 
-uniform dvec3 sunWorld;
-uniform dvec3 viewDirWorld;
-uniform dvec3 sunModel;
-
 /*******************************************************************************
  ***** ALL CALCULATIONS FOR ECLIPSE ARE IN METERS AND IN WORLD SPACE SYSTEM ****
  *******************************************************************************/
@@ -92,8 +102,10 @@ uniform dvec3 sunModel;
 const uint numberOfShadows = 1;
 
 struct ShadowRenderingStruct {
-  double xu, xp;
-  double rs, rc;
+  double xu;
+  double xp;
+  double rs;
+  double rc;
   dvec3 sourceCasterVec;
   dvec3 casterPositionVec;
   bool isShadowing;
@@ -113,15 +125,15 @@ float calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 p
   }
 
   dvec3 pc = shadowInfoArray[0].casterPositionVec - position;
-  dvec3 sc_norm = shadowInfoArray[0].sourceCasterVec;
-  dvec3 pc_proj = dot(pc, sc_norm) * sc_norm;
-  dvec3 d = pc - pc_proj;
+  dvec3 scNorm = shadowInfoArray[0].sourceCasterVec;
+  dvec3 pcProj = dot(pc, scNorm) * scNorm;
+  dvec3 d = pc - pcProj;
   
   float length_d = float(length(d));
-  double length_pc_proj = length(pc_proj);
+  double lengthPcProj = length(pcProj);
   
-  float r_p_pi = float(shadowInfoArray[0].rc * (length_pc_proj + shadowInfoArray[0].xp) / shadowInfoArray[0].xp);
-  float r_u_pi = float(shadowInfoArray[0].rc * (shadowInfoArray[0].xu - length_pc_proj) / shadowInfoArray[0].xu);
+  float r_p_pi = float(shadowInfoArray[0].rc * (lengthPcProj + shadowInfoArray[0].xp) / shadowInfoArray[0].xp);
+  float r_u_pi = float(shadowInfoArray[0].rc * (shadowInfoArray[0].xu - lengthPcProj) / shadowInfoArray[0].xu);
   
   if (length_d < r_u_pi) {
     // umbra
@@ -142,6 +154,33 @@ float calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 p
   }
 }
 
+float opticalDepth(float localH, float r, float mu, float d, float Rg) {
+  float invH = 1.0 / localH;
+  float a = sqrt(0.5 * invH * r);
+  vec2 a01 = a * vec2(mu, mu + d / r);
+  vec2 a01s = sign(a01);
+  vec2 a01sq = a01 * a01;
+  float x = a01s.y > a01s.x ? exp(a01sq.x) : 0.0;
+  vec2 y = a01s / (2.3193 * abs(a01) + sqrt(1.52 * a01sq + 4.0)) *
+    vec2(1.0, exp(-d * invH * (d / (2.0 * r) + mu)));
+  return sqrt(2.0 * M_PI * sqrt(Rt*Rt - Rg*Rg) * r) * exp((Rg-r)*invH) * (x + dot(y, vec2(1.0, -1.0)));
+}
+
+vec3 analyticTransmittance(float r, float mu, float d) {
+  vec3 ozone = vec3(0.0);
+  if (ozoneLayerEnabled) {
+    ozone = betaOzoneExtinction * 0.0000006 * opticalDepth(HO, r, mu, d, Rg);
+  }
+  return exp(-betaRayleigh * opticalDepth(HR, r, mu, d, Rg) - ozone -
+    betaMieExtinction * opticalDepth(HM, r, mu, d, Rg));
+}
+
+vec3 irradiance(sampler2D s, float r, float muSun) {
+  float u_r = (r - Rg) / (Rt - Rg);
+  float u_muSun = (muSun + 0.2) / 1.2;
+  return texture(s, vec2(u_muSun, u_r)).rgb;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 //  ALL CALCULATIONS FOR ATMOSPHERE ARE KM AND IN WORLD SPACE SYSTEM                    //
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -173,10 +212,11 @@ bool atmosphereIntersection(Ray ray, double atmRadius, out double offset,
   double l2 = dot(l, l);
   double r2 = atmRadius * atmRadius; // avoiding surface acne
 
+  offset = 0.0;
+  maxLength = 0.0;
+
   // Ray origin (eye position) is behind sphere
   if ((s < 0.0) && (l2 > r2)) {
-    offset = 0.0;
-    maxLength = 0.0;
     return false;
   }
 
@@ -184,13 +224,9 @@ bool atmosphereIntersection(Ray ray, double atmRadius, out double offset,
 
   // Ray misses atmosphere
   if (m2 > r2) {
-    offset = 0.0;
-    maxLength = 0.0;
     return false;
   }
 
-  // We already now the ray hits the atmosphere
-
   // If q = 0.0, there is only one intersection
   double q = sqrt(r2 - m2);
 
@@ -248,9 +284,9 @@ Ray calculateRayRenderableGlobe(vec2 st) {
  *                the reflectance R[L]
  */
 vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3 v, vec3 s,
-                       float r, out float mu, out vec3 attenuation, vec3 fragPosObj,
-                       out bool groundHit, double maxLength, double pixelDepth,
-                       vec3 spaceColor, float sunIntensity)
+                       float r, vec3 fragPosObj, double maxLength, double pixelDepth,
+                       vec3 spaceColor, float sunIntensity,
+                       out float mu, out vec3 attenuation, out bool groundHit)
 {
   const float INTERPOLATION_EPS = 0.004; // precision const from Brunetton
 
@@ -268,7 +304,11 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
   // I.e. the next line has the scattering light for the "infinite" ray passing through
   // the atmosphere. If this ray hits something inside the atmosphere, we will subtract
   // the attenuated scattering light from that path in the current path
-  vec4 inscatterRadiance = max(texture4D(inscatterTexture, r, mu, muSun, nu), 0.0);
+  vec4 inscatterRadiance = max(
+    texture4D(inscatterTexture, r, mu, muSun, nu, Rg, SAMPLES_MU, Rt, SAMPLES_R,
+      SAMPLES_MU_S, SAMPLES_NU),
+    0.0
+  );
     
   // After removing the initial path from camera pos to top of atmosphere (for an
   // observer in the space) we test if the light ray is hitting the atmosphere
@@ -286,13 +326,14 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
     // attenuation = analyticTransmittance(r, mu, t);
     // JCC: change from analytical to LUT transmittance to avoid
     // acme on planet surface when looking from far away. (11/02/2017)
-    attenuation = transmittance(r, mu, t); 
+    attenuation = transmittance(transmittanceTexture, r, mu, t, Rg, Rt); 
     
     // Here we use the idea of S[L](a->b) = S[L](b->a), and get the S[L](x0, v, s)
     // Then we calculate S[L] = S[L]|x - T(x, x0)*S[L]|x0        
     // The "infinite" ray hist something inside the atmosphere, so we need to remove
     // the unsused contribution to the final radiance.
-    vec4 inscatterFromSurface = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
+    vec4 inscatterFromSurface = texture4D(inscatterTexture, r0, mu0, muSun0, nu, Rg,
+      SAMPLES_MU, Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU);
     inscatterRadiance = max(inscatterRadiance - attenuation.rgbr * inscatterFromSurface, 0.0);
 
     // We set the irradianceFactor to 1.0 so the reflected irradiance will be considered
@@ -307,7 +348,7 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
   // cos(PI-thetaH) = dist/r
   // cos(thetaH) = -dist/r
   // muHorizon = -sqrt(r^2-Rg^2)/r = -sqrt(1-(Rg/r)^2)
-  float muHorizon = -sqrt(1.0 - Rg2 / r2);
+  float muHorizon = -sqrt(1.0 - Rg*Rg / r2);
 
   // In order to avoid precision problems near horizon, we interpolate between two
   // points: above and below horizon
@@ -318,10 +359,10 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
 
     // Above Horizon
     mu = muHorizon - INTERPOLATION_EPS;
-    // r0  = sqrt(r * r + t * t + 2.0f * r * t * mu);
+    // r0  = sqrt(r * r + t * t + 2.0 * r * t * mu);
     // From cosine law where t = distance between x and x0
     // r0^2 = r^2 + t^2 - 2 * r * t * cos(PI-theta)
-    // r0  = sqrt(r2 + t2 + 2.0f * r * t * mu);
+    // r0  = sqrt(r2 + t2 + 2.0 * r * t * mu);
     float halfCosineLaw1 = r2 + (t * t);
     float halfCosineLaw2 = 2.0 * r * t;
     r0 = sqrt(halfCosineLaw1 + halfCosineLaw2 * mu);
@@ -332,20 +373,24 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
     // mu0 = (r*mu + t) / r0
     mu0 = (r * mu + t) * (1.0 / r0);
     
-    vec4 inScatterAboveX = texture4D(inscatterTexture, r, mu, muSun, nu);
-    vec4 inScatterAboveXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
+    vec4 inScatterAboveX = texture4D(inscatterTexture, r, mu, muSun, nu, Rg,
+      SAMPLES_MU, Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU);
+    vec4 inScatterAboveXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu, Rg,
+      SAMPLES_MU, Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU);
     // Attention for the attenuation.r value applied to the S_Mie
     vec4 inScatterAbove = max(inScatterAboveX - attenuation.rgbr * inScatterAboveXs, 0.0);
 
     // Below Horizon
     mu = muHorizon + INTERPOLATION_EPS;
-    //r0  = sqrt(r2 + t2 + 2.0f * r * t * mu);
+    //r0  = sqrt(r2 + t2 + 2.0 * r * t * mu);
     r0 = sqrt(halfCosineLaw1 + halfCosineLaw2 * mu);
     
     mu0 = (r * mu + t) * (1.0 / r0);
     
-    vec4 inScatterBelowX = texture4D(inscatterTexture, r, mu, muSun, nu);
-    vec4 inScatterBelowXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
+    vec4 inScatterBelowX = texture4D(inscatterTexture, r, mu, muSun, nu, Rg,
+      SAMPLES_MU, Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU);
+    vec4 inScatterBelowXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu, Rg,
+      SAMPLES_MU, Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU);
     // Attention for the attenuation.r value applied to the S_Mie
     vec4 inScatterBelow = max(inScatterBelowX - attenuation.rgbr * inScatterBelowXs, 0.0);
 
@@ -370,13 +415,7 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
   // Finally we add the Lsun (all calculations are done with no Lsun so we can change it
   // on the fly with no precomputations)
   vec3 finalScatteringRadiance = radiance * sunIntensity;
-  
-  if (groundHit) {
-    return finalScatteringRadiance;
-  }
-  else {
-    return spaceColor + finalScatteringRadiance;
-  }    
+  return groundHit ?  finalScatteringRadiance  :  spaceColor + finalScatteringRadiance;
 }
 
 /* 
@@ -401,8 +440,6 @@ vec3 groundColor(vec3 x, float t, vec3 v, vec3 s, vec3 attenuationXtoX0, vec3 gr
                  vec3 normal, float irradianceFactor, float waterReflectance,
                  float sunIntensity)
 {
-  vec3 reflectedRadiance = vec3(0.0);
-
   // First we obtain the ray's end point on the surface
   float r0 = length(x + t * v);
 
@@ -415,7 +452,7 @@ vec3 groundColor(vec3 x, float t, vec3 v, vec3 s, vec3 attenuationXtoX0, vec3 gr
 
   // Is direct Sun light arriving at x0? If not, there is no direct light from Sun (shadowed)
   vec3 transmittanceL0 =
-    muSun < -sqrt(1.0 - (Rg2 / (r0 * r0)))  ?  vec3(0.0)  :  transmittance(r0, muSun);
+    muSun < -sqrt(1.0 - (Rg*Rg / (r0 * r0)))  ?  vec3(0.0)  :  transmittance(transmittanceTexture, r0, muSun, Rg, Rt);
 
   // E[L*] at x0
   vec3 irradianceReflected = irradiance(irradianceTexture, r0, muSun) * irradianceFactor;
@@ -433,16 +470,14 @@ vec3 groundColor(vec3 x, float t, vec3 v, vec3 s, vec3 attenuationXtoX0, vec3 gr
     // Fresnell Schlick's approximation
     float fresnel = 0.02 + 0.98 * pow(1.0 - dot(-v, h), 5.0);
     // Walter BRDF approximation
-    float waterBrdf = fresnel * pow(max(dot(h, normal), 0.0), 150.0);
+    float waterBrdf = max(fresnel * pow(max(dot(h, normal), 0.0), 150.0), 0.0);
     // Adding Fresnell and Water BRDFs approximation to the final surface color
     // after adding the sunRadiance and the attenuation of the Sun through atmosphere
-    groundRadiance += waterReflectance * max(waterBrdf, 0.0) * transmittanceL0 * sunIntensity;
+    groundRadiance += waterReflectance * waterBrdf * transmittanceL0 * sunIntensity;
   }
 
   // Finally, we attenuate the surface Radiance from the point x0 to the camera location
-  reflectedRadiance = attenuationXtoX0 * groundRadiance;    
-    
-  // Returns reflectedRadiance = 0.0 if the ray doesn't hit the ground.
+  vec3 reflectedRadiance = attenuationXtoX0 * groundRadiance;    
   return reflectedRadiance;  
 }
 
@@ -464,7 +499,7 @@ vec3 sunColor(vec3 v, vec3 s, float r, float mu, float irradianceFactor) {
   // JCC: Change this function to a impostor texture with gaussian decay color weighted
   // by the sunRadiance, transmittance and irradianceColor (11/03/2017)
 
-  // @TODO (abock, 2021-07-01) This value is hard-coded to our sun right now
+  // @TODO (abock, 2021-07-01) This value is hard-coded to our sun+earth right now
   // Convert 0.3 degrees -> radians
   const float SunAngularSize = (0.3 * M_PI / 180.0);
   const float FuzzyFactor = 0.5; // How fuzzy should the edges be
@@ -474,7 +509,7 @@ vec3 sunColor(vec3 v, vec3 s, float r, float mu, float irradianceFactor) {
 
   float t = (angle - p1) / (p2 - p1);
   float scale = clamp(t, 0.0, 1.0);
-  return scale * transmittance(r, mu) * sunRadiance * (1.0 - irradianceFactor);
+  return scale * transmittance(transmittanceTexture, r, mu, Rg, Rt) * sunRadiance * (1.0 - irradianceFactor);
 }
 
 void main() {
@@ -588,24 +623,22 @@ void main() {
   bool groundHit = false;
   vec3 attenuation;     
   
-  vec3 inscatterColor = inscatterRadiance(x, tF, irradianceFactor, v, s, r, mu,
-    attenuation, vec3(positionObjectsCoords), groundHit, maxLength, pixelDepth,
-    color, sunIntensityInscatter);
+  vec3 inscatterColor = inscatterRadiance(x, tF, irradianceFactor, v, s, r,
+    vec3(positionObjectsCoords), maxLength, pixelDepth, color, sunIntensityInscatter, mu,
+    attenuation, groundHit);
   vec3 atmColor = vec3(0.0);
   if (groundHit) {
     float eclipseShadowPlanet = calcShadow(shadowDataArray, positionWorldCoords.xyz, true);
     float sunIntensityGround = sunRadiance * eclipseShadowPlanet;
-    atmColor = groundColor(x, tF, v, s, attenuation, color, normal.xyz,
-      irradianceFactor, normal.w, sunIntensityGround);
+    atmColor = groundColor(x, tF, v, s, attenuation, color, normal.xyz, irradianceFactor,
+      normal.w, sunIntensityGround);
   }
   else {
     // In order to get better performance, we are not tracing multiple rays per pixel
     // when the ray doesn't intersect the ground
-    
     atmColor = sunColor(v, s, r, mu, irradianceFactor);
   } 
   
   // Final Color of ATM plus terrain:
-  vec4 finalRadiance = vec4(inscatterColor + atmColor, 1.0);
-  renderTarget = finalRadiance;
+  renderTarget = vec4(inscatterColor + atmColor, 1.0);;
 }
diff --git a/modules/atmosphere/shaders/calculation_vs.glsl b/modules/atmosphere/shaders/calculation_vs.glsl
index be225fa6a6..a7d480b829 100644
--- a/modules/atmosphere/shaders/calculation_vs.glsl
+++ b/modules/atmosphere/shaders/calculation_vs.glsl
@@ -24,8 +24,8 @@
 
 #version __CONTEXT__
 
-layout(location = 0) in vec3 in_position;
+layout(location = 0) in vec2 in_position;
 
 void main() {
-  gl_Position = vec4(in_position, 1.0);
+  gl_Position = vec4(in_position, 0.0, 1.0);
 }
diff --git a/modules/atmosphere/shaders/deltaE_calc_fs.glsl b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
index fe0163b6b2..117bd0a631 100644
--- a/modules/atmosphere/shaders/deltaE_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
@@ -24,8 +24,6 @@
 
 #version __CONTEXT__
 
-#include "atmosphere_common.glsl"
-
 out vec4 renderTableColor;
 
 void main() {   
diff --git a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
index 37bacbe3b9..044ea1de30 100644
--- a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
@@ -28,19 +28,45 @@
 
 out vec4 renderTarget;
 
+uniform float Rg;
+uniform float Rt;
+uniform float AverageGroundReflectance;
+uniform float HR;
+uniform vec3 betaRayleigh;
+uniform float HM;
+uniform vec3 betaMieScattering;
+uniform float mieG;
+uniform int SAMPLES_R;
+uniform int SAMPLES_MU;
+uniform int SAMPLES_MU_S;
+uniform int SAMPLES_NU;
+uniform sampler2D transmittanceTexture;
 uniform float r;
 uniform vec4 dhdH;
-
 uniform sampler2D deltaETexture;
 uniform sampler3D deltaSRTexture;
 uniform sampler3D deltaSMTexture;
+uniform int firstIteration;
 
-uniform int firstIteraction;
+const int INSCATTER_SPHERICAL_INTEGRAL_SAMPLES = 16;
 
 // -- Spherical Coordinates Steps. phi e [0,2PI] and theta e [0, PI]
 const float stepPhi = (2.0 * M_PI) / float(INSCATTER_SPHERICAL_INTEGRAL_SAMPLES);
 const float stepTheta = M_PI / float(INSCATTER_SPHERICAL_INTEGRAL_SAMPLES);
 
+// Given the irradiance texture table, the cosine of zenith sun vector and the height of
+// the observer (ray's stating point x), calculates the mapping for u_r and u_muSun and
+// returns the value in the LUT
+// lut   := OpenGL texture2D sampler (the irradiance texture deltaE)
+// muSun := cosine of the zeith angle of vec(s). Or muSun = (vec(s) * vec(v))
+// r     := height of starting point vect(x)
+vec3 irradianceLUT(sampler2D lut, float muSun, float r) {
+  // See Bruneton paper and Coliene to understand the mapping
+  float u_muSun = (muSun + 0.2) / 1.2;
+  float u_r = (r - Rg) / (Rt - Rg);
+  return texture(lut, vec2(u_muSun, u_r)).rgb;
+}
+
 vec3 inscatter(float r, float mu, float muSun, float nu) {
   // Be sure to not get a cosine or height out of bounds
   r = clamp(r, Rg, Rt);
@@ -59,7 +85,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
   float muSun2 = muSun * muSun;
   float sinThetaSinSigma = sqrt(1.0 - mu2) * sqrt(1.0 - muSun2);
   // cos(sigma + theta) = cos(theta)cos(sigma)-sin(theta)sin(sigma)
-  // cos(ni) = nu = mu * muSun - sqrt(1.0f - mu*mu)*sqrt(1.0 - muSun*muSun) // sin(theta) = sqrt(1.0 - mu*mu)
+  // cos(ni) = nu = mu * muSun - sqrt(1.0 - mu*mu)*sqrt(1.0 - muSun*muSun) // sin(theta) = sqrt(1.0 - mu*mu)
   // Now we make sure the angle between vec(s) and vec(v) is in the right range:
   nu = clamp(nu, muSun * mu - sinThetaSinSigma, muSun * mu + sinThetaSinSigma);
 
@@ -69,7 +95,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
   // -cos(theta) = sqrt(r*r-Rg*Rg)/r
   float Rg2 = Rg * Rg;
   float r2 = r * r;
-  float cosHorizon = -sqrt(r2 - Rg2)/r;
+  float cosHorizon = -sqrt(r2 - Rg2) / r;
 
   // Now we get vec(v) and vec(s) from mu, muSun and nu:
   // Assuming:
@@ -97,6 +123,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
   
   // In order to integrate over 4PI, we scan the sphere using the spherical coordinates
   // previously defined
+  vec3 radianceJAcc = vec3(0.0);
   for (int theta_i = 0; theta_i < INSCATTER_SPHERICAL_INTEGRAL_SAMPLES; theta_i++) {
     float theta = (float(theta_i) + 0.5) * stepTheta;
     float cosineTheta = cos(theta);
@@ -131,7 +158,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
       // float muGround = (r2 - distanceToGround*distanceToGround - Rg2)/(2*distanceToGround*Rg);
       // Access the Transmittance LUT in order to calculate the transmittance from the
       // ground point Rg, thorugh the atmosphere, at a distance: distanceToGround
-      groundTransmittance = transmittance(Rg, muGround, distanceToGround);
+      groundTransmittance = transmittance(transmittanceTexture, Rg, muGround, distanceToGround, Rg, Rt);
     }
 
     for (int phi_i = 0; phi_i < INSCATTER_SPHERICAL_INTEGRAL_SAMPLES; ++phi_i) {
@@ -161,43 +188,48 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
       // We calculate the Rayleigh and Mie phase function for the new scattering angle:
       // cos(angle between vec(s) and vec(w)), ||s|| = ||w|| = 1
       float nuSW = dot(s, w);
-      // The first iteraction is different from the others. In the first iteraction all
+      // The first iteration is different from the others. In the first iteration all
       // the light InScattered is coming from the initial pre-computed single InScattered
       // light. We stored these values in the deltaS textures (Ray and Mie), and in order
       // to avoid problems with the high angle dependency in the phase functions, we don't
       // include the phase functions on those tables (that's why we calculate them now).
-      if (firstIteraction == 1) {        
+      if (firstIteration == 1) {        
         float phaseRaySW = rayleighPhaseFunction(nuSW);
         float phaseMieSW = miePhaseFunction(nuSW, mieG);
         // We can now access the values for the single InScattering in the textures deltaS textures.
-        vec3 singleRay = texture4D(deltaSRTexture, r, w.z, muSun, nuSW).rgb;
-        vec3 singleMie = texture4D(deltaSMTexture, r, w.z, muSun, nuSW).rgb;
+        vec3 singleRay = texture4D(deltaSRTexture, r, w.z, muSun, nuSW, Rg, SAMPLES_MU,
+          Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU).rgb;
+        vec3 singleMie = texture4D(deltaSMTexture, r, w.z, muSun, nuSW, Rg, SAMPLES_MU,
+          Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU).rgb;
 
         // Initial InScattering including the phase functions
         radianceJ1 += singleRay * phaseRaySW + singleMie * phaseMieSW;        
       }
       else {
         // On line 9 of the algorithm, the texture table deltaSR is updated, so when we
-        // are not in the first iteraction, we are getting the updated result of deltaSR
+        // are not in the first iteration, we are getting the updated result of deltaSR
         // (not the single inscattered light but the accumulated (higher order)
         // inscattered light.
         // w.z is the cosine(theta) = mu for vec(w)
-        radianceJ1 += texture4D(deltaSRTexture, r, w.z, muSun, nuSW).rgb;
+        radianceJ1 += texture4D(deltaSRTexture, r, w.z, muSun, nuSW, Rg, SAMPLES_MU, Rt,
+          SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU).rgb;
       }
 
       // Finally, we add the atmospheric scale height (See: Radiation Transfer on the
       // Atmosphere and Ocean from Thomas and Stamnes, pg 9-10.
-      return radianceJ1 * (betaRayleigh * exp(-(r - Rg) / HR) * phaseRayleighWV +
+      radianceJAcc += radianceJ1 * (betaRayleigh * exp(-(r - Rg) / HR) * phaseRayleighWV +
         betaMieScattering * exp(-(r - Rg) / HM) * phaseMieWV) * dw;        
     }
   }
+
+  return radianceJAcc;
 }
 
 void main() {
   // InScattering Radiance to be calculated at different points in the ray path
   // Unmapping the variables from texture texels coordinates to mapped coordinates
   float mu, muSun, nu;
-  unmappingMuMuSunNu(r, dhdH, mu, muSun, nu);
+  unmappingMuMuSunNu(r, dhdH, SAMPLES_MU, Rg, Rt, SAMPLES_MU_S, SAMPLES_NU, mu, muSun, nu);
 
   // Calculate the the light inScattered in direction
   // -vec(v) for the point at height r (vec(y) following Bruneton and Neyret's paper
diff --git a/modules/atmosphere/shaders/deltaS_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
index b5d7de5e79..ca97f15ff9 100644
--- a/modules/atmosphere/shaders/deltaS_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
@@ -28,6 +28,10 @@
 
 out vec4 renderTarget;
 
+uniform int SAMPLES_R;
+uniform int SAMPLES_MU;
+uniform int SAMPLES_MU_S;
+uniform int SAMPLES_NU;
 uniform int layer;
 uniform sampler3D deltaSRTexture;
 uniform sampler3D deltaSMTexture;
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
index ebe63b5071..7580c790be 100644
--- a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
@@ -28,6 +28,10 @@
 
 out vec4 renderTarget;
 
+uniform int SAMPLES_R;
+uniform int SAMPLES_MU;
+uniform int SAMPLES_MU_S;
+uniform int SAMPLES_NU;
 uniform int layer;
 uniform sampler3D deltaSTexture;
 
@@ -35,10 +39,9 @@ void main() {
   vec2 p = gl_FragCoord.xy - vec2(0.5);
 
   float nu = -1.0 + floor(p.x / float(SAMPLES_MU_S)) / (float(SAMPLES_NU) - 1.0) * 2.0;
-  vec3 uvw = vec3(
-    gl_FragCoord.xy,
-    float(layer) + 0.5) / vec3(ivec3(SAMPLES_MU_S * SAMPLES_NU, SAMPLES_MU, SAMPLES_R)
-  );
+  vec3 uvw =
+    vec3(gl_FragCoord.xy, float(layer) + 0.5) /
+    vec3(ivec3(SAMPLES_MU_S * SAMPLES_NU, SAMPLES_MU, SAMPLES_R));
 
   // See Bruneton and Neyret paper, "Angular Precision" paragraph to understanding why we
   // are dividing the S[L*] by the Rayleigh phase function.
diff --git a/modules/atmosphere/shaders/inScattering_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
index 8443cb1109..94c7aabcac 100644
--- a/modules/atmosphere/shaders/inScattering_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
@@ -29,6 +29,18 @@
 layout(location = 0) out vec4 renderTarget1;
 layout(location = 1) out vec4 renderTarget2;
 
+uniform float Rg;
+uniform float Rt;
+uniform float HR;
+uniform vec3 betaRayleigh;
+uniform float HO;
+uniform float HM;
+uniform vec3 betaMieScattering;
+uniform bool ozoneLayerEnabled;
+uniform int SAMPLES_MU;
+uniform int SAMPLES_MU_S;
+uniform int SAMPLES_NU;
+uniform sampler2D transmittanceTexture;
 uniform float r;
 uniform vec4 dhdH;
 
@@ -60,7 +72,9 @@ void integrand(float r, float mu, float muSun, float nu, float y, out vec3 S_R,
   if (muSun_i >= -sqrt(1.0 - Rg * Rg / (ri * ri))) {
     // It's the transmittance from the point y (ri) to the top of atmosphere in direction
     // of the sun (muSun_i) and the transmittance from the observer at x (r) to y (ri).
-    vec3 transmittanceY = transmittance(r, mu, y) * transmittance(ri, muSun_i);
+    vec3 transmittanceY =
+      transmittance(transmittanceTexture, r, mu, y, Rg, Rt) *
+      transmittance(transmittanceTexture, ri, muSun_i, Rg, Rt);
     // exp(-h/H)*T(x,v)
     if (ozoneLayerEnabled) {
       S_R = (exp(-(ri - Rg) / HO) + exp(-(ri - Rg) / HR)) * transmittanceY;
@@ -83,7 +97,7 @@ void inscatter(float r, float mu, float muSun, float nu, out vec3 S_R, out vec3
   S_R = vec3(0.0);
   S_M = vec3(0.0);
 
-  float rayDist = rayDistance(r, mu);
+  float rayDist = rayDistance(r, mu, Rt, Rg);
   float dy = rayDist / float(INSCATTER_INTEGRAL_SAMPLES);
   vec3 S_Ri;
   vec3 S_Mi;
@@ -103,13 +117,10 @@ void inscatter(float r, float mu, float muSun, float nu, out vec3 S_R, out vec3
 }
 
 void main() {
-  vec3 S_R; // First Order Rayleigh InScattering 
-  vec3 S_M; // First Order Mie InScattering
-
   // From the layer interpolation (see C++ code for layer to r) and the textures
   // parameters (uv), we unmapping mu, muSun and nu.
   float mu, muSun, nu;
-  unmappingMuMuSunNu(r, dhdH, mu, muSun, nu);
+  unmappingMuMuSunNu(r, dhdH, SAMPLES_MU, Rg, Rt, SAMPLES_MU_S, SAMPLES_NU, mu, muSun, nu);
   
   // Here we calculate the single inScattered light. Because this is a single
   // inscattering, the light that arrives at a point y in the path from the eye to the
@@ -122,6 +133,8 @@ void main() {
   // S[L0] = P_R*S_R[L0] + P_M*S_M[L0]
   // In order to save memory, we just store the red component of S_M[L0], and later we use
   // the proportionality rule to calcule the other components.
+  vec3 S_R; // First Order Rayleigh InScattering 
+  vec3 S_M; // First Order Mie InScattering
   inscatter(r, mu, muSun, nu, S_R, S_M);
   renderTarget1 = vec4(S_R, 1.0);
   renderTarget2 = vec4(S_M, 1.0);
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
index fd128b3b16..c84ffff774 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
@@ -28,6 +28,13 @@
 
 out vec4 renderTarget;
 
+uniform float Rg;
+uniform float Rt;
+uniform int SAMPLES_R;
+uniform int SAMPLES_MU;
+uniform int SAMPLES_MU_S;
+uniform int SAMPLES_NU;
+uniform sampler2D transmittanceTexture;
 uniform float r;
 uniform vec4 dhdH;
 uniform sampler3D deltaJTexture;
@@ -35,7 +42,7 @@ uniform sampler3D deltaJTexture;
 // The integrand here is the f(y) of the trapezoidal rule:
 vec3 integrand(float r, float mu, float muSun, float nu, float dist) {
   // We can calculate r_i by the cosine law: r_i^2=dist^2 + r^2 - 2*r*dist*cos(PI-theta)
-  float r_i = sqrt(r * r + dist * dist + 2.0f * r * dist * mu);
+  float r_i = sqrt(r * r + dist * dist + 2.0 * r * dist * mu);
   // r_i can be found using the dot product:
   // vec(y_i) dot vec(dist) = cos(theta_i) * ||vec(y_i)|| * ||vec(dist)||
   // But vec(y_i) = vec(x) + vec(dist), also: vec(x) dot vec(dist) = cos(theta) = mu
@@ -46,12 +53,15 @@ vec3 integrand(float r, float mu, float muSun, float nu, float dist) {
   // But vec(y_i) = vec(x) + vec(dist), and vec(x) dot vec(s) = muSun, cos(sigma_i + theta_i) = nu
   float muSun_i = (r * muSun + dist * nu) / r_i;
   // The irradiance attenuated from point r until y (y-x = dist)
-  return transmittance(r, mu, dist) * texture4D(deltaJTexture, r_i, mu_i, muSun_i, nu).rgb;
+  return
+    transmittance(transmittanceTexture, r, mu, dist, Rg, Rt) *
+    texture4D(deltaJTexture, r_i, mu_i, muSun_i, nu, Rg, SAMPLES_MU, Rt, SAMPLES_R,
+      SAMPLES_MU_S, SAMPLES_NU).rgb;
 }
 
 vec3 inscatter(float r, float mu, float muSun, float nu) {
   vec3 inScatteringRadiance = vec3(0.0);
-  float dy = rayDistance(r, mu) / float(INSCATTER_INTEGRAL_SAMPLES);
+  float dy = rayDistance(r, mu, Rt, Rg) / float(INSCATTER_INTEGRAL_SAMPLES);
   vec3 inScatteringRadiance_i = integrand(r, mu, muSun, nu, 0.0);
   
   // In order to solve the integral from equation (11) we use the trapezoidal rule:
@@ -71,7 +81,7 @@ void main() {
   float muSun = 0.0;
   float nu = 0.0;
   // Unmapping the variables from texture texels coordinates to mapped coordinates
-  unmappingMuMuSunNu(r, dhdH, mu, muSun, nu);
+  unmappingMuMuSunNu(r, dhdH, SAMPLES_MU, Rg, Rt, SAMPLES_MU_S, SAMPLES_NU, mu, muSun, nu);
   
   // Write to texture deltaSR 
   renderTarget = vec4(inscatter(r, mu, muSun, nu), 1.0);
diff --git a/modules/atmosphere/shaders/irradiance_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
index 93fca5128e..4e31d608b1 100644
--- a/modules/atmosphere/shaders/irradiance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
@@ -28,16 +28,24 @@
 
 out vec4 renderTableColor;
 
-void main() {
-    // See Bruneton and Colliene to understand the mapping
-  float muSun = -0.2 + (gl_FragCoord.x - 0.5) / (float(OTHER_TEXTURES.x) - 1.0) * 1.2;
-  float r = Rg + (gl_FragCoord.y - 0.5) / (float(OTHER_TEXTURES.y) ) * RtMinusRg;
+uniform float Rg;
+uniform float Rt;
+uniform ivec2 OTHER_TEXTURES;
+uniform sampler2D transmittanceTexture;
 
-  // We are calculating the Irradiance for L0, i.e., only the radiance coming from Sun
-  // direction is accounted:
+void main() {
+  // See Bruneton and Collienne to understand the mapping
+  float muSun = -0.2 + (gl_FragCoord.x - 0.5) / (float(OTHER_TEXTURES.x) - 1.0) * 1.2;
+  float r = Rg + (gl_FragCoord.y - 0.5) / (float(OTHER_TEXTURES.y)) * (Rt - Rg);
+
+  // We are calculating the Irradiance for L0, i.e., only the radiance coming from the Sun
+  // direction is accounted for:
   // E[L0](x,s) = L0*dot(w,n) or 0 (if v!=s or the sun is occluded).
-  // Because we consider the Planet as a perfect sphere and we are considering only single
+  // Because we consider the planet as a perfect sphere and we are considering only single
   // scattering here, the dot product dot(w,n) is equal to dot(s,n) that is equal to
   // dot(s, r/||r||) = muSun.
-  renderTableColor = vec4(transmittance(r, muSun) * max(muSun, 0.0), 0.0);     
+  renderTableColor = vec4(
+    transmittance(transmittanceTexture, r, muSun, Rg, Rt) * max(muSun, 0.0),
+    0.0
+  );
 }
diff --git a/modules/atmosphere/shaders/irradiance_final_fs.glsl b/modules/atmosphere/shaders/irradiance_final_fs.glsl
index 5f9834ab2c..6640cc2f6a 100644
--- a/modules/atmosphere/shaders/irradiance_final_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_final_fs.glsl
@@ -24,10 +24,9 @@
 
 #version __CONTEXT__
 
-#include "atmosphere_common.glsl"
-
 out vec4 renderTableColor;
 
+uniform ivec2 OTHER_TEXTURES;
 uniform sampler2D deltaETexture;
 
 void main() {   
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
index 06b31090b8..5c3f29452e 100644
--- a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
@@ -28,22 +28,32 @@
 
 out vec4 renderTableColor;
 
-uniform int firstIteraction;
+uniform float Rg;
+uniform float Rt;
+uniform float mieG;
+uniform ivec2 SKY;
+uniform int SAMPLES_R;
+uniform int SAMPLES_MU;
+uniform int SAMPLES_MU_S;
+uniform int SAMPLES_NU;
+uniform int firstIteration;
 uniform sampler3D deltaSRTexture;
 uniform sampler3D deltaSMTexture;
 
+const int IRRADIANCE_INTEGRAL_SAMPLES = 32;
+
 // Spherical Coordinates Steps. phi e [0,2PI] and theta e [0, PI/2]
 const float stepPhi = (2.0 * M_PI) / float(IRRADIANCE_INTEGRAL_SAMPLES);
 const float stepTheta = M_PI / (2.0 * float(IRRADIANCE_INTEGRAL_SAMPLES));
 
 void main() {
-    // See Bruneton and Colliene to understand the mapping.
+  // See Bruneton and Collienne to understand the mapping.
   float muSun = -0.2 + (gl_FragCoord.x - 0.5) / (float(SKY.x) - 1.0) * 1.2;
-  float r = Rg + (gl_FragCoord.y - 0.5) / (float(SKY.y) - 1.0) * RtMinusRg;
+  float r = Rg + (gl_FragCoord.y - 0.5) / (float(SKY.y) - 1.0) * (Rt - Rg);
 
   // We know that muSun = cos(sigma) = s.z/||s||
   // But, ||s|| = 1, so s.z = muSun. Also,
-  // ||s|| = 1, so s.x = sin(sigma) = sqrt(1-muSun^2) and s.y = 0.0f
+  // ||s|| = 1, so s.x = sin(sigma) = sqrt(1-muSun^2) and s.y = 0.0
   vec3 s = vec3(max(sqrt(1.0 - muSun * muSun), 0.0), 0.0, muSun);
 
   // In order to solve the integral from equation (15) we use the trapezoidal rule:
@@ -60,30 +70,32 @@ void main() {
       vec3 w = vec3(cos(phi) * sin(theta), sin(phi) * sin(theta), cos(theta));
       float nu = dot(s, w);
 
-      // The first iteraction is different from the others, that's because in the first
-      // iteraction all the light arriving are coming from the initial pre-computed
-      // single scattered light. We stored these values in the deltaS textures (Ray and
-      // Mie), and in order to avoid problems with the high angle dependency in the phase
-      // functions, we don't include the phase functions on those tables (that's why we
-      // calculate them now)
-      if (firstIteraction == 1) {
+      // The first iteration is different from the others as in the first iteration all
+      // the light arriving is coming from the initial pre-computed single scattered
+      // light. We stored these values in the deltaS textures (Ray and Mie), and in order
+      // to avoid problems with the high angle dependency in the phase functions, we don't
+      // include the phase functions on those tables (that's why we calculate them now)
+      if (firstIteration == 1) {
         float phaseRay = rayleighPhaseFunction(nu);
         float phaseMie = miePhaseFunction(nu, mieG);
-        vec3 singleRay = texture4D(deltaSRTexture, r, w.z, muSun, nu).rgb;
-        vec3 singleMie = texture4D(deltaSMTexture, r, w.z, muSun, nu).rgb;
+        vec3 singleRay = texture4D(deltaSRTexture, r, w.z, muSun, nu, Rg, SAMPLES_MU, Rt,
+          SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU).rgb;
+        vec3 singleMie = texture4D(deltaSMTexture, r, w.z, muSun, nu, Rg, SAMPLES_MU, Rt,
+          SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU).rgb;
         // w.z is the cosine(theta) = mu for vec(w) and also vec(w) dot vec(n(xo))
         irradianceE += (singleRay * phaseRay + singleMie * phaseMie) * w.z * dw;
       }
       else {
         // On line 10 of the algorithm, the texture table deltaE is updated, so when we
-        // are not in the first iteraction, we are getting the updated result of deltaE
+        // are not in the first iteration, we are getting the updated result of deltaE
         // (not the single irradiance light but the accumulated (higher order) irradiance
         // light. w.z is the cosine(theta) = mu for vec(w) and also vec(w) dot vec(n(xo))
-        irradianceE += texture4D(deltaSRTexture, r, w.z, muSun, nu).rgb * w.z * dw;
+        irradianceE += texture4D(deltaSRTexture, r, w.z, muSun, nu, Rg, SAMPLES_MU, Rt,
+          SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU).rgb * w.z * dw;
       }
     }
   }
 
-  // Write the higher oder irradiance to texture deltaE
+  // Write the higher order irradiance to texture deltaE
   renderTableColor = vec4(irradianceE, 0.0);    
 }
diff --git a/modules/atmosphere/shaders/transmittance_calc_fs.glsl b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
index cf78347f29..a0dd54f6f2 100644
--- a/modules/atmosphere/shaders/transmittance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
@@ -28,6 +28,19 @@
 
 out vec4 renderTableColor;
 
+uniform float Rg;
+uniform float Rt;
+uniform float HR;
+uniform vec3 betaRayleigh;
+uniform float HO;
+uniform vec3 betaOzoneExtinction;
+uniform float HM;
+uniform vec3 betaMieExtinction;
+uniform bool ozoneLayerEnabled;
+uniform ivec2 TRANSMITTANCE;
+
+const int TRANSMITTANCE_STEPS = 500;
+
 // Optical depth by integration, from ray starting at point vec(x), i.e, height r and
 // angle mu (cosine of vec(v)) until top of atmosphere or planet's ground.
 // r := height of starting point vect(x)
@@ -42,14 +55,14 @@ float opticalDepth(float r, float mu, float H) {
   // direction and starting and ending points.
   
   // cosine law for triangles: y_i^2 = a^2 + b^2 - 2abcos(alpha)
-  float cosZenithHorizon = -sqrt(1.0 - (Rg * Rg / r2));
+  float cosZenithHorizon = -sqrt(1.0 - ((Rg * Rg) / r2));
   if (mu < cosZenithHorizon) {
     return 1e9;
   }
 
   // Integrating using the Trapezoidal rule:
   // Integral(f(y)dy)(from a to b) = ((b-a)/2n_steps)*(Sum(f(y_i+1)+f(y_i)))
-  float b_a = rayDistance(r, mu);
+  float b_a = rayDistance(r, mu, Rt, Rg);
   float deltaStep = b_a / float(TRANSMITTANCE_STEPS);
   // cosine law
   float y_i = exp(-(r - Rg) / H);
@@ -72,11 +85,11 @@ void main() {
   
   // In the paper u_r^2 = (r^2-Rg^2)/(Rt^2-Rg^2)
   // So, extracting r from u_r in the above equation:
-  float r = Rg + (u_r * u_r) * RtMinusRg;
+  float r = Rg + (u_r * u_r) * (Rt - Rg);
   
   // In the paper the Bruneton suggest mu = dot(v,x)/||x|| with ||v|| = 1.0
   // Later he proposes u_mu = (1-exp(-3mu-0.6))/(1-exp(-3.6))
-  // But the below one is better. See Colliene.
+  // But the below one is better. See Collienne.
   // One must remember that mu is defined from 0 to PI/2 + epsilon
   float muSun = -0.15 + tan(1.5 * u_mu) / tan(1.5) * 1.15;
 
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 7c93764d9f..1a92b2f781 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -1067,7 +1067,6 @@ void FramebufferRenderer::updateDeferredcastData() {
 
         std::filesystem::path vsPath = caster->deferredcastVSPath();
         std::filesystem::path fsPath = caster->deferredcastFSPath();
-        std::filesystem::path deferredShaderPath = caster->deferredcastPath();
 
         ghoul::Dictionary dict;
         dict.setValue("rendererData", _rendererData);
@@ -1086,17 +1085,10 @@ void FramebufferRenderer::updateDeferredcastData() {
             _deferredcastPrograms[caster] = ghoul::opengl::ProgramObject::Build(
                 "Deferred " + std::to_string(data.id) + " raycast",
                 vsPath,
-                deferredShaderPath,
+                fsPath,
                 dict
             );
 
-            _deferredcastPrograms[caster]->setIgnoreSubroutineUniformLocationError(
-                ghoul::opengl::ProgramObject::IgnoreError::Yes
-            );
-            _deferredcastPrograms[caster]->setIgnoreUniformLocationError(
-                ghoul::opengl::ProgramObject::IgnoreError::Yes
-            );
-
             caster->initializeCachedVariables(*_deferredcastPrograms[caster]);
         }
         catch (ghoul::RuntimeError& e) {

From fcc108312968c3f850ed72c548eafa500b5b2188 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 22 Jul 2021 20:51:01 +0200
Subject: [PATCH 15/47] Make the Speckloader ignore tabs as well as spaces
 (closes #1688)

---
 modules/space/speckloader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/space/speckloader.cpp b/modules/space/speckloader.cpp
index 649e3f9aff..6ee778bf42 100644
--- a/modules/space/speckloader.cpp
+++ b/modules/space/speckloader.cpp
@@ -50,7 +50,7 @@ namespace {
         // 3. Remove all spaces from the new beginning
         // 4. Remove all spaces from the end
 
-        while (!line.empty() && line[0] == ' ') {
+        while (!line.empty() && (line[0] == ' ' || line[0] == '\t')) {
             line = line.substr(1);
         }
 
@@ -58,11 +58,11 @@ namespace {
             line = line.substr(1);
         }
 
-        while (!line.empty() && line[0] == ' ') {
+        while (!line.empty() && (line[0] == ' ' || line[0] == '\t')) {
             line = line.substr(1);
         }
 
-        while (!line.empty() && line.back() == ' ') {
+        while (!line.empty() && (line.back() == ' ' || line.back() == '\t')) {
             line = line.substr(0, line.size() - 1);
         }
     }

From 527bc4d108e060d3ccfadf961746caf3147c134a Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 22 Jul 2021 21:04:53 +0200
Subject: [PATCH 16/47] Add support for speck keywords that are mixed case
 (closes #1689)

---
 modules/space/speckloader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/space/speckloader.cpp b/modules/space/speckloader.cpp
index 6ee778bf42..4bf46d86cf 100644
--- a/modules/space/speckloader.cpp
+++ b/modules/space/speckloader.cpp
@@ -40,7 +40,10 @@ namespace {
     constexpr const int8_t LabelCacheFileVersion = 10;
     constexpr const int8_t ColorCacheFileVersion = 10;
 
-    constexpr bool startsWith(std::string_view lhs, std::string_view rhs) noexcept {
+    bool startsWith(std::string lhs, std::string_view rhs) noexcept {
+        for (size_t i = 0; i < lhs.size(); i++) {
+            lhs[i] = static_cast<char>(tolower(lhs[i]));
+        }
         return (rhs.size() <= lhs.size()) && (lhs.substr(0, rhs.size()) == rhs);
     }
 

From 05c577bd3d0b6c8f532ad90ec23ca9c85db43c9c Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 22 Jul 2021 21:19:35 +0200
Subject: [PATCH 17/47] Filter out non-image files from the launcher collection
 (closes #1693)

---
 .../ext/launcher/src/launcherwindow.cpp       | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index a7ebe492c3..460313f531 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -312,8 +312,24 @@ void LauncherWindow::setBackgroundImage(const std::string& syncPath) {
     std::mt19937 g(rd());
     std::shuffle(files.begin(), files.end(), g);
     // We know there has to be at least one folder, so it's fine to just pick the first
-    std::string image = files.front();
-    _backgroundImage->setPixmap(QPixmap(QString::fromStdString(image)));
+    while (!files.empty()) {
+        std::string p = files.front();
+        if (std::filesystem::path(p).extension() == ".png") {
+            // If the top path starts with the png extension, we have found our candidate
+            break;
+        }
+        else {
+            // There shouldn't be any non-png images in here, but you never know. So we 
+            // just remove non-image files here
+            files.erase(files.begin());
+        }
+    }
+
+    // There better be at least one file left, but just in in case
+    if (!files.empty()) {
+        std::string image = files.front();
+        _backgroundImage->setPixmap(QPixmap(QString::fromStdString(image)));
+    }
 }
 
 void LauncherWindow::populateProfilesList(std::string preset) {

From d38968a5ad1c820a45e84ce11d7b0939af1f9064 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 23 Jul 2021 11:50:50 +0200
Subject: [PATCH 18/47] Don't accidentally delete someone elses VBO and VAO
 (closes #1694)

---
 .../rendering/atmospheredeferredcaster.cpp    | 107 ++++++++----------
 .../rendering/atmospheredeferredcaster.h      |  20 ++--
 2 files changed, 56 insertions(+), 71 deletions(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 90b8cb0f83..cafe67ef2d 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -83,28 +83,6 @@ namespace {
     constexpr const float ATM_EPS = 2000.f;
     constexpr const float KM_TO_M = 1000.f;
 
-    void createRenderQuad(GLuint* vao, GLuint* vbo) {
-        glGenVertexArrays(1, vao);
-        glBindVertexArray(*vao);
-        glGenBuffers(1, vbo);
-        glBindBuffer(GL_ARRAY_BUFFER, *vbo);
-
-        const GLfloat VertexData[] = {
-            //  x      y    z
-            -1.f, -1.f,
-             1.f,  1.f,
-            -1.f,  1.f,
-            -1.f, -1.f,
-             1.f, -1.f,
-             1.f,  1.f,
-        };
-
-        glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData, GL_STATIC_DRAW);
-        glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
-        glBindVertexArray(0);
-    }
-
     template <GLenum colorBufferAttachment = GL_COLOR_ATTACHMENT0>
     void saveTextureFile(const std::filesystem::path& fileName, const glm::ivec2& size) {
         std::ofstream ppmFile(fileName);
@@ -190,12 +168,6 @@ namespace {
         return true;
     }
 
-    void renderQuadForCalc(GLuint vao) {
-        glBindVertexArray(vao);
-        glDrawArrays(GL_TRIANGLES, 0, 6);
-        glBindVertexArray(0);
-    }
-
     GLuint createTexture(const glm::ivec2& size, std::string_view name) {
         GLuint t;
         glGenTextures(1, &t);
@@ -552,7 +524,7 @@ void AtmosphereDeferredcaster::setHardShadows(bool enabled) {
     _hardShadowsEnabled = enabled;
 }
 
-void AtmosphereDeferredcaster::calculateTransmittance(GLuint vao) {
+void AtmosphereDeferredcaster::calculateTransmittance() {
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -580,14 +552,14 @@ void AtmosphereDeferredcaster::calculateTransmittance(GLuint vao) {
 
     constexpr const float Black[] = { 0.f, 0.f, 0.f, 0.f };
     glClearBufferfv(GL_COLOR, 0, Black);
-    renderQuadForCalc(vao);
+    glDrawArrays(GL_TRIANGLES, 0, 6);
     if (_saveCalculationTextures) {
         saveTextureFile("transmittance_texture.ppm", _transmittanceTableSize);
     }
     program->deactivate();
 }
 
-GLuint AtmosphereDeferredcaster::calculateDeltaE(GLuint vao) {
+GLuint AtmosphereDeferredcaster::calculateDeltaE() {
     GLuint deltaE = createTexture(_deltaETableSize, "DeltaE");
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaE, 0);
     glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
@@ -606,7 +578,7 @@ GLuint AtmosphereDeferredcaster::calculateDeltaE(GLuint vao) {
     program->setUniform("Rt", _atmosphereRadius);
     program->setUniform("OTHER_TEXTURES", _deltaETableSize);
     glClear(GL_COLOR_BUFFER_BIT);
-    renderQuadForCalc(vao);
+    glDrawArrays(GL_TRIANGLES, 0, 6);
     if (_saveCalculationTextures) {
         saveTextureFile("deltaE_table_texture.ppm", _deltaETableSize);
     }
@@ -614,7 +586,7 @@ GLuint AtmosphereDeferredcaster::calculateDeltaE(GLuint vao) {
     return deltaE;
 }
 
-std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS(GLuint vao) {
+std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS() {
     GLuint deltaSRayleigh = createTexture(_textureSize, "DeltaS Rayleigh", 3);
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaSRayleigh, 0);
     GLuint deltaSMie = createTexture(_textureSize, "DeltaS Mie", 3);
@@ -649,7 +621,7 @@ std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS(GLuint vao)
     for (int layer = 0; layer < _rSamples; ++layer) {
         program->setUniform("layer", layer);
         step3DTexture(*program, layer);
-        renderQuadForCalc(vao);
+        glDrawArrays(GL_TRIANGLES, 0, 6);
     }
     if (_saveCalculationTextures) {
         saveTextureFile("deltaS_rayleigh_texture.ppm", glm::ivec2(_textureSize));
@@ -666,7 +638,7 @@ std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS(GLuint vao)
     return { deltaSRayleigh, deltaSMie };
 }
 
-void AtmosphereDeferredcaster::calculateIrradiance(GLuint quadCalcVao) {
+void AtmosphereDeferredcaster::calculateIrradiance() {
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -684,14 +656,14 @@ void AtmosphereDeferredcaster::calculateIrradiance(GLuint quadCalcVao) {
     );
     program->activate();
     glClear(GL_COLOR_BUFFER_BIT);
-    renderQuadForCalc(quadCalcVao);
+    glDrawArrays(GL_TRIANGLES, 0, 6);
     if (_saveCalculationTextures) {
         saveTextureFile("irradiance_texture.ppm", _deltaETableSize);
     }
     program->deactivate();
 }
 
-void AtmosphereDeferredcaster::calculateInscattering(GLuint vao, GLuint deltaSRayleigh,
+void AtmosphereDeferredcaster::calculateInscattering(GLuint deltaSRayleigh,
                                                      GLuint deltaSMie)
 {
     glFramebufferTexture(
@@ -727,7 +699,7 @@ void AtmosphereDeferredcaster::calculateInscattering(GLuint vao, GLuint deltaSRa
     glClear(GL_COLOR_BUFFER_BIT);
     for (int layer = 0; layer < _rSamples; ++layer) {
         program->setUniform("layer", layer);
-        renderQuadForCalc(vao);
+        glDrawArrays(GL_TRIANGLES, 0, 6);
     }
     if (_saveCalculationTextures) {
         saveTextureFile("S_texture.ppm", glm::ivec2(_textureSize));
@@ -735,7 +707,7 @@ void AtmosphereDeferredcaster::calculateInscattering(GLuint vao, GLuint deltaSRa
     program->deactivate();
 }
 
-void AtmosphereDeferredcaster::calculateDeltaJ(GLuint vao, int scatteringOrder,
+void AtmosphereDeferredcaster::calculateDeltaJ(int scatteringOrder,
                                                ghoul::opengl::ProgramObject& program,
                                                GLuint deltaJ, GLuint deltaE,
                                                GLuint deltaSRayleigh, GLuint deltaSMie)
@@ -780,7 +752,7 @@ void AtmosphereDeferredcaster::calculateDeltaJ(GLuint vao, int scatteringOrder,
     for (int layer = 0; layer < _rSamples; ++layer) {
         program.setUniform("layer", layer);
         step3DTexture(program, layer);
-        renderQuadForCalc(vao);
+        glDrawArrays(GL_TRIANGLES, 0, 6);
     }
     if (_saveCalculationTextures) {
         saveTextureFile(
@@ -791,7 +763,7 @@ void AtmosphereDeferredcaster::calculateDeltaJ(GLuint vao, int scatteringOrder,
     program.deactivate();
 }
 
-void AtmosphereDeferredcaster::calculateDeltaE(GLuint vao, int scatteringOrder,
+void AtmosphereDeferredcaster::calculateDeltaE(int scatteringOrder,
                                                ghoul::opengl::ProgramObject& program,
                                                GLuint deltaE, GLuint deltaSRayleigh,
                                                GLuint deltaSMie)
@@ -819,7 +791,7 @@ void AtmosphereDeferredcaster::calculateDeltaE(GLuint vao, int scatteringOrder,
     program.setUniform("SAMPLES_NU", _nuSamples);
     program.setUniform("SAMPLES_MU", _muSamples);
     program.setUniform("SAMPLES_R", _rSamples);
-    renderQuadForCalc(vao);
+    glDrawArrays(GL_TRIANGLES, 0, 6);
     if (_saveCalculationTextures) {
         saveTextureFile(
             fmt::format("deltaE_texture-scattering_order-{}.ppm", scatteringOrder),
@@ -829,7 +801,7 @@ void AtmosphereDeferredcaster::calculateDeltaE(GLuint vao, int scatteringOrder,
     program.deactivate();
 }
 
-void AtmosphereDeferredcaster::calculateDeltaS(GLuint vao, int scatteringOrder,
+void AtmosphereDeferredcaster::calculateDeltaS(int scatteringOrder,
                                                ghoul::opengl::ProgramObject& program,
                                                GLuint deltaSRayleigh, GLuint deltaJ)
 {
@@ -856,7 +828,7 @@ void AtmosphereDeferredcaster::calculateDeltaS(GLuint vao, int scatteringOrder,
     for (int layer = 0; layer < _rSamples; ++layer) {
         program.setUniform("layer", layer);
         step3DTexture(program, layer);
-        renderQuadForCalc(vao);
+        glDrawArrays(GL_TRIANGLES, 0, 6);
     }
     if (_saveCalculationTextures) {
         saveTextureFile(
@@ -867,7 +839,7 @@ void AtmosphereDeferredcaster::calculateDeltaS(GLuint vao, int scatteringOrder,
     program.deactivate();
 }
 
-void AtmosphereDeferredcaster::calculateIrradiance(GLuint vao, int scatteringOrder,
+void AtmosphereDeferredcaster::calculateIrradiance(int scatteringOrder,
                                                    ghoul::opengl::ProgramObject& program,
                                                    GLuint deltaE)
 {
@@ -886,7 +858,7 @@ void AtmosphereDeferredcaster::calculateIrradiance(GLuint vao, int scatteringOrd
     program.setUniform("deltaETexture", unit);
     program.setUniform("OTHER_TEXTURES", _deltaETableSize);
 
-    renderQuadForCalc(vao);
+    glDrawArrays(GL_TRIANGLES, 0, 6);
     if (_saveCalculationTextures) {
         saveTextureFile(
             fmt::format("irradianceTable_order-{}.ppm", scatteringOrder),
@@ -896,7 +868,7 @@ void AtmosphereDeferredcaster::calculateIrradiance(GLuint vao, int scatteringOrd
     program.deactivate();
 }
 
-void AtmosphereDeferredcaster::calculateInscattering(GLuint vao, int scatteringOrder,
+void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder,
                                                      ghoul::opengl::ProgramObject& prg,
                                                      GLuint deltaSRayleigh)
 
@@ -920,7 +892,7 @@ void AtmosphereDeferredcaster::calculateInscattering(GLuint vao, int scatteringO
     prg.setUniform("SAMPLES_R", _rSamples);
     for (int layer = 0; layer < _rSamples; ++layer) {
         prg.setUniform("layer", layer);
-        renderQuadForCalc(vao);
+        glDrawArrays(GL_TRIANGLES, 0, 6);
     }
     if (_saveCalculationTextures) {
         saveTextureFile(
@@ -979,27 +951,44 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
 
     // Prepare for rendering/calculations
     GLuint quadVao;
+    glGenVertexArrays(1, &quadVao);
+    glBindVertexArray(quadVao);
     GLuint quadVbo;
-    createRenderQuad(&quadVao, &quadVbo);
+    glGenBuffers(1, &quadVbo);
+    glBindBuffer(GL_ARRAY_BUFFER, quadVbo);
+
+    const GLfloat VertexData[] = {
+        //  x      y    z
+        -1.f, -1.f,
+        1.f,  1.f,
+        -1.f,  1.f,
+        -1.f, -1.f,
+        1.f, -1.f,
+        1.f,  1.f,
+    };
+
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData, GL_STATIC_DRAW);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
 
     // Execute Calculations
     LDEBUG("Starting precalculations for scattering effects");
     glDisable(GL_BLEND);
 
     // See Precomputed Atmosphere Scattering from Bruneton et al. paper, algorithm 4.1:
-    calculateTransmittance(quadVao);
+    calculateTransmittance();
 
     // line 2 in algorithm 4.1
-    GLuint deltaETable = calculateDeltaE(quadVao);
+    GLuint deltaETable = calculateDeltaE();
 
     // line 3 in algorithm 4.1
-    auto [deltaSRayleighTable, deltaSMieTable] = calculateDeltaS(quadVao);
+    auto [deltaSRayleighTable, deltaSMieTable] = calculateDeltaS();
 
     // line 4 in algorithm 4.1
-    calculateIrradiance(quadVao);
+    calculateIrradiance();
 
     // line 5 in algorithm 4.1
-    calculateInscattering(quadVao, deltaSRayleighTable, deltaSMieTable);
+    calculateInscattering(deltaSRayleighTable, deltaSMieTable);
 
     GLuint deltaJTable = createTexture(_textureSize, "DeltaJ", 3);
 
@@ -1007,7 +996,6 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
     for (int scatteringOrder = 2; scatteringOrder <= 4; ++scatteringOrder) {
         // line 7 in algorithm 4.1
         calculateDeltaJ(
-            quadVao,
             scatteringOrder,
             *deltaJProgram,
             deltaJTable,
@@ -1018,7 +1006,6 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
 
         // line 8 in algorithm 4.1
         calculateDeltaE(
-            quadVao,
             scatteringOrder,
             *irradianceSupTermsProgram,
             deltaETable,
@@ -1028,7 +1015,6 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
 
         // line 9 in algorithm 4.1
         calculateDeltaS(
-            quadVao,
             scatteringOrder,
             *inScatteringSupTermsProgram,
             deltaSRayleighTable,
@@ -1041,7 +1027,6 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
 
         // line 10 in algorithm 4.1
         calculateIrradiance(
-            quadVao,
             scatteringOrder,
             *irradianceFinalProgram,
             deltaETable
@@ -1049,7 +1034,6 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
 
         // line 11 in algorithm 4.1
         calculateInscattering(
-            quadVao,
             scatteringOrder,
             *deltaSSupTermsProgram,
             deltaSRayleighTable
@@ -1069,9 +1053,10 @@ void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
     // Restores system state
     glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
     global::renderEngine->openglStateCache().setViewportState(viewport);
-    glDeleteBuffers(1, &quadVao);
-    glDeleteVertexArrays(1, &quadVbo);
+    glDeleteBuffers(1, &quadVbo);
+    glDeleteVertexArrays(1, &quadVao);
     glDeleteFramebuffers(1, &calcFBO);
+    glBindVertexArray(0);
 
     LDEBUG("Ended precalculations for Atmosphere effects");
 }
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index a117882f8e..6836352c0a 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -93,22 +93,22 @@ public:
 private:
     void step3DTexture(ghoul::opengl::ProgramObject& prg, int layer);
 
-    void calculateTransmittance(GLuint vao);
-    GLuint calculateDeltaE(GLuint vao);
-    std::pair<GLuint, GLuint> calculateDeltaS(GLuint vao);
-    void calculateIrradiance(GLuint vao);
-    void calculateInscattering(GLuint vao, GLuint deltaSRayleigh, GLuint deltaSMie);
-    void calculateDeltaJ(GLuint vao, int scatteringOrder,
+    void calculateTransmittance();
+    GLuint calculateDeltaE();
+    std::pair<GLuint, GLuint> calculateDeltaS();
+    void calculateIrradiance();
+    void calculateInscattering(GLuint deltaSRayleigh, GLuint deltaSMie);
+    void calculateDeltaJ(int scatteringOrder,
         ghoul::opengl::ProgramObject& program, GLuint deltaJ, GLuint deltaE,
         GLuint deltaSRayleigh, GLuint deltaSMie);
-    void calculateDeltaE(GLuint vao, int scatteringOrder,
+    void calculateDeltaE(int scatteringOrder,
         ghoul::opengl::ProgramObject& program, GLuint deltaE, GLuint deltaSRayleigh,
         GLuint deltaSMie);
-    void calculateDeltaS(GLuint vao, int scatteringOrder,
+    void calculateDeltaS(int scatteringOrder,
         ghoul::opengl::ProgramObject& program, GLuint deltaSRayleigh, GLuint deltaJ);
-    void calculateIrradiance(GLuint vao, int scatteringOrder,
+    void calculateIrradiance(int scatteringOrder,
         ghoul::opengl::ProgramObject& program, GLuint deltaE);
-    void calculateInscattering(GLuint vao, int scatteringOrder,
+    void calculateInscattering(int scatteringOrder,
         ghoul::opengl::ProgramObject& program, GLuint deltaSRayleigh);
 
 

From 817621617eda64ef22e968cc6f6f7fadc3d7efb0 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 23 Jul 2021 14:17:16 +0200
Subject: [PATCH 19/47] Check for nan in camera setting (closes #1686), add
 tracy zones to atmosphere rendering

---
 .../rendering/atmospheredeferredcaster.cpp    | 22 ++++++++++++++++++
 src/util/camera.cpp                           | 23 ++++++++++---------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index cafe67ef2d..3bc7f14edc 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -525,6 +525,8 @@ void AtmosphereDeferredcaster::setHardShadows(bool enabled) {
 }
 
 void AtmosphereDeferredcaster::calculateTransmittance() {
+    ZoneScoped
+        
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -560,6 +562,8 @@ void AtmosphereDeferredcaster::calculateTransmittance() {
 }
 
 GLuint AtmosphereDeferredcaster::calculateDeltaE() {
+    ZoneScoped
+        
     GLuint deltaE = createTexture(_deltaETableSize, "DeltaE");
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaE, 0);
     glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
@@ -587,6 +591,8 @@ GLuint AtmosphereDeferredcaster::calculateDeltaE() {
 }
 
 std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS() {
+    ZoneScoped
+        
     GLuint deltaSRayleigh = createTexture(_textureSize, "DeltaS Rayleigh", 3);
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaSRayleigh, 0);
     GLuint deltaSMie = createTexture(_textureSize, "DeltaS Mie", 3);
@@ -639,6 +645,8 @@ std::pair<GLuint, GLuint> AtmosphereDeferredcaster::calculateDeltaS() {
 }
 
 void AtmosphereDeferredcaster::calculateIrradiance() {
+    ZoneScoped
+        
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -666,6 +674,8 @@ void AtmosphereDeferredcaster::calculateIrradiance() {
 void AtmosphereDeferredcaster::calculateInscattering(GLuint deltaSRayleigh,
                                                      GLuint deltaSMie)
 {
+    ZoneScoped
+        
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -712,6 +722,8 @@ void AtmosphereDeferredcaster::calculateDeltaJ(int scatteringOrder,
                                                GLuint deltaJ, GLuint deltaE,
                                                GLuint deltaSRayleigh, GLuint deltaSMie)
 {
+    ZoneScoped
+        
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaJ, 0);
     glViewport(0, 0, _textureSize.x, _textureSize.y);
     program.activate();
@@ -768,6 +780,8 @@ void AtmosphereDeferredcaster::calculateDeltaE(int scatteringOrder,
                                                GLuint deltaE, GLuint deltaSRayleigh,
                                                GLuint deltaSMie)
 {
+    ZoneScoped
+        
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaE, 0);
     glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
     program.activate();
@@ -805,6 +819,8 @@ void AtmosphereDeferredcaster::calculateDeltaS(int scatteringOrder,
                                                ghoul::opengl::ProgramObject& program,
                                                GLuint deltaSRayleigh, GLuint deltaJ)
 {
+    ZoneScoped
+        
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, deltaSRayleigh, 0);
     glViewport(0, 0, _textureSize.x, _textureSize.y);
     program.activate();
@@ -843,6 +859,8 @@ void AtmosphereDeferredcaster::calculateIrradiance(int scatteringOrder,
                                                    ghoul::opengl::ProgramObject& program,
                                                    GLuint deltaE)
 {
+    ZoneScoped
+        
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -873,6 +891,8 @@ void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder,
                                                      GLuint deltaSRayleigh)
 
 {
+    ZoneScoped
+        
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
@@ -904,6 +924,8 @@ void AtmosphereDeferredcaster::calculateInscattering(int scatteringOrder,
 }
 
 void AtmosphereDeferredcaster::calculateAtmosphereParameters() {
+    ZoneScoped
+
     using ProgramObject = ghoul::opengl::ProgramObject;
     std::unique_ptr<ProgramObject> deltaJProgram = ProgramObject::Build(
         "DeltaJ Program",
diff --git a/src/util/camera.cpp b/src/util/camera.cpp
index 0cd86da56a..4091bdb45b 100644
--- a/src/util/camera.cpp
+++ b/src/util/camera.cpp
@@ -42,14 +42,15 @@ Camera::Camera(const Camera& o)
 {}
 
 void Camera::setPositionVec3(glm::dvec3 pos) {
-    std::lock_guard<std::mutex> _lock(_mutex);
-    _position = std::move(pos);
-
-    _cachedCombinedViewMatrix.isDirty = true;
+    if (!glm::any(glm::isnan(pos))) {
+        std::lock_guard _lock(_mutex);
+        _position = std::move(pos);
+        _cachedCombinedViewMatrix.isDirty = true;
+    }
 }
 
 void Camera::setRotation(glm::dquat rotation) {
-    std::lock_guard<std::mutex> _lock(_mutex);
+    std::lock_guard _lock(_mutex);
     _rotation = std::move(rotation);
     _cachedViewDirection.isDirty = true;
     _cachedLookupVector.isDirty = true;
@@ -58,14 +59,14 @@ void Camera::setRotation(glm::dquat rotation) {
 }
 
 void Camera::setScaling(float scaling) {
-    std::lock_guard<std::mutex> _lock(_mutex);
+    std::lock_guard _lock(_mutex);
     _scaling = scaling;
     _cachedViewScaleMatrix.isDirty = true;
     _cachedCombinedViewMatrix.isDirty = true;
 }
 
 void Camera::setMaxFov(float fov) {
-    std::lock_guard<std::mutex> _lock(_mutex);
+    std::lock_guard _lock(_mutex);
     _maxFov = fov;
     _cachedSinMaxFov.isDirty = true;
 }
@@ -75,7 +76,7 @@ void Camera::setParent(SceneGraphNode* parent) {
 }
 
 void Camera::rotate(glm::dquat rotation) {
-    std::lock_guard<std::mutex> _lock(_mutex);
+    std::lock_guard _lock(_mutex);
     _rotation = std::move(rotation) * static_cast<glm::dquat>(_rotation);
 
     _cachedViewDirection.isDirty = true;
@@ -224,20 +225,20 @@ Camera::SgctInternal::SgctInternal(const SgctInternal& o)
 {}
 
 void Camera::SgctInternal::setSceneMatrix(glm::mat4 sceneMatrix) {
-    std::lock_guard<std::mutex> _lock(_mutex);
+    std::lock_guard _lock(_mutex);
 
     _sceneMatrix = std::move(sceneMatrix);
 }
 
 void Camera::SgctInternal::setViewMatrix(glm::mat4 viewMatrix) {
-    std::lock_guard<std::mutex> _lock(_mutex);
+    std::lock_guard _lock(_mutex);
 
     _viewMatrix = std::move(viewMatrix);
     _cachedViewProjectionMatrix.isDirty = true;
 }
 
 void Camera::SgctInternal::setProjectionMatrix(glm::mat4 projectionMatrix) {
-    std::lock_guard<std::mutex> _lock(_mutex);
+    std::lock_guard _lock(_mutex);
 
     _projectionMatrix = std::move(projectionMatrix);
     _cachedViewProjectionMatrix.isDirty = true;

From 3ae1028a854eadec4a0447c72d6b9cbe406be4c2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 26 Jul 2021 11:03:06 +0200
Subject: [PATCH 20/47] Print the identifier of the offending scene graph node
 when the specification fails

---
 src/scene/scene_lua.inl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index cb1d33fd52..8c231f8efc 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -654,7 +654,12 @@ int addSceneGraphNode(lua_State* L) {
         global::renderEngine->scene()->initializeNode(node);
     }
     catch (const documentation::SpecificationError& e) {
-        LERRORC("Scene", ghoul::to_string(e.result));
+        std::string cat = 
+            d.hasValue<std::string>("Identifier") ?
+            d.value<std::string>("Identifier") :
+            "Scene";
+        LERRORC(cat, ghoul::to_string(e.result));
+        
         return ghoul::lua::luaError(
             L,
             fmt::format("Error loading scene graph node: {}", e.what())

From e5b88ead92c07a8948c132922a002e2d2cc76acd Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 26 Jul 2021 11:52:43 +0200
Subject: [PATCH 21/47] Make it possible to pass any number of arguments to the
 print functions (#1635)

---
 src/scripting/scriptengine_lua.inl | 61 ++++++++++++++++--------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index 8d550bbeca..a8b0fec9e2 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -30,37 +30,42 @@
 namespace openspace::luascriptfunctions {
 
 int printInternal(ghoul::logging::LogLevel level, lua_State* L) {
-    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::printInternal");
-
     using ghoul::lua::luaTypeToString;
 
-    const int type = lua_type(L, 1);
-    switch (type) {
-        case LUA_TNONE:
-        case LUA_TLIGHTUSERDATA:
-        case LUA_TTABLE:
-        case LUA_TFUNCTION:
-        case LUA_TUSERDATA:
-        case LUA_TTHREAD:
-            log(
-                level,
-                "print",
-                fmt::format("Function parameter was of type '{}'", luaTypeToString(type))
-            );
-            break;
-        case LUA_TNIL:
-            break;
-        case LUA_TBOOLEAN:
-            log(level, "print", std::to_string(ghoul::lua::value<bool>(L, 1)));
-            break;
-        case LUA_TNUMBER:
-            log(level, "print", std::to_string(ghoul::lua::value<double>(L, 1)));
-            break;
-        case LUA_TSTRING:
-            log(level, "print", ghoul::lua::value<std::string>(L, 1));
-            break;
+    const int nArguments = lua_gettop(L);
+    for (int i = 1; i <= nArguments; i++) {
+        const int type = lua_type(L, i);
+        switch (type) {
+            case LUA_TNONE:
+            case LUA_TLIGHTUSERDATA:
+            case LUA_TTABLE:
+            case LUA_TFUNCTION:
+            case LUA_TUSERDATA:
+            case LUA_TTHREAD:
+                log(
+                    level,
+                    "print",
+                    fmt::format(
+                        "Function parameter was of type '{}'", luaTypeToString(type)
+                    )
+                );
+                break;
+            case LUA_TNIL:
+                break;
+            case LUA_TBOOLEAN:
+                log(level, "print", std::to_string(ghoul::lua::value<bool>(L, i)));
+                break;
+            case LUA_TNUMBER:
+                log(level, "print", std::to_string(ghoul::lua::value<double>(L, i)));
+                break;
+            case LUA_TSTRING:
+                log(level, "print", ghoul::lua::value<std::string>(L, i));
+                break;
+        }
     }
-    lua_pop(L, 1);
+
+
+    lua_pop(L, nArguments);
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
     return 0;

From 7abc964b0ec568ec779218f695051f3f9416e5e1 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 26 Jul 2021 13:35:20 +0200
Subject: [PATCH 22/47] Add the ability to read files from disk (closes #1636)

---
 src/scripting/scriptengine.cpp     |  7 +++++++
 src/scripting/scriptengine_lua.inl | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 3e6941c354..d34b2a1afe 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -423,6 +423,13 @@ void ScriptEngine::addBaseLibrary() {
                 "string",
                 "Checks whether the provided file exists."
             },
+            {
+                "readFile",
+                &luascriptfunctions::readFile,
+                {},
+                "string",
+                "Reads a file from disk and return its contents"
+            },
             {
                 "directoryExists",
                 &luascriptfunctions::directoryExists,
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index a8b0fec9e2..f43ae6e365 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -202,6 +202,32 @@ int fileExists(lua_State* L) {
     return 1;
 }
 
+/**
+ * \ingroup LuaScripts
+ * readFile(string):
+ * Reads a file from disk and return its contents
+ */
+int readFile(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::readFile");
+
+    const std::string& file = ghoul::lua::value<std::string>(
+        L,
+        1,
+        ghoul::lua::PopValue::Yes
+    );
+    std::filesystem::path p = absPath(file);
+    if (!std::filesystem::is_regular_file(p)) {
+        return ghoul::lua::luaError(L, fmt::format("Could not open file {}", file));
+    }
+
+    std::ifstream f(p);
+    std::stringstream buffer;
+    buffer << f.rdbuf();
+
+    ghoul::lua::push(L, buffer.str());
+    return 1;
+}
+
 /**
  * \ingroup LuaScripts
  * directoryExists(string):

From eb1de6fbd2be53899a9f4bd4e29c44280237808c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 26 Jul 2021 13:35:31 +0200
Subject: [PATCH 23/47] Update Ghoul repository

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 2ffa7b7f7a..323d11d2ee 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 2ffa7b7f7a9582f191e51d4f7b030ea764f86a4c
+Subproject commit 323d11d2ee21c061d319820b6257cbfe48e53d5b

From 043fb9c4e95f5f12aecd959339d880122403e234 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 26 Jul 2021 15:21:06 +0200
Subject: [PATCH 24/47] Prevent the failure of font loading from keeping file
 handles open and breaking everything else (#1627)

---
 ext/ghoul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ghoul b/ext/ghoul
index 323d11d2ee..79b09090ae 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 323d11d2ee21c061d319820b6257cbfe48e53d5b
+Subproject commit 79b09090ae31f960ead48870a948af348323a287

From a13f94da210f83681db9ed1eb45f97632caaff1f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 27 Jul 2021 11:26:41 +0200
Subject: [PATCH 25/47] Add ability to print all types of information in the
 printInfo/... functions (closes #1635)

---
 ext/ghoul                          |  2 +-
 src/scripting/scriptengine_lua.inl | 33 +-----------------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 79b09090ae..0282811937 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 79b09090ae31f960ead48870a948af348323a287
+Subproject commit 0282811937bc5102ac4dad3a0b53bf72c28aac77
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index f43ae6e365..1cdc5882f9 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -30,41 +30,10 @@
 namespace openspace::luascriptfunctions {
 
 int printInternal(ghoul::logging::LogLevel level, lua_State* L) {
-    using ghoul::lua::luaTypeToString;
-
     const int nArguments = lua_gettop(L);
     for (int i = 1; i <= nArguments; i++) {
-        const int type = lua_type(L, i);
-        switch (type) {
-            case LUA_TNONE:
-            case LUA_TLIGHTUSERDATA:
-            case LUA_TTABLE:
-            case LUA_TFUNCTION:
-            case LUA_TUSERDATA:
-            case LUA_TTHREAD:
-                log(
-                    level,
-                    "print",
-                    fmt::format(
-                        "Function parameter was of type '{}'", luaTypeToString(type)
-                    )
-                );
-                break;
-            case LUA_TNIL:
-                break;
-            case LUA_TBOOLEAN:
-                log(level, "print", std::to_string(ghoul::lua::value<bool>(L, i)));
-                break;
-            case LUA_TNUMBER:
-                log(level, "print", std::to_string(ghoul::lua::value<double>(L, i)));
-                break;
-            case LUA_TSTRING:
-                log(level, "print", ghoul::lua::value<std::string>(L, i));
-                break;
-        }
+        log(level, "print", ghoul::lua::luaValueToString(L, i));
     }
-
-
     lua_pop(L, nArguments);
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");

From 5f139b81445b4eac84de20d4f20d8b3a46f7bb92 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 27 Jul 2021 14:14:19 +0200
Subject: [PATCH 26/47] Tune the look of the asset dialog

---
 .../ext/launcher/resources/qss/launcher.qss        |  1 +
 .../ext/launcher/src/profile/assetsdialog.cpp      | 14 ++++++--------
 ext/ghoul                                          |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
index 032ac15ccc..1b31494beb 100644
--- a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
+++ b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
@@ -115,6 +115,7 @@ PropertiesDialog  QListWidget {
  */
 AssetsDialog  QTreeView {
   min-width: 40em;
+  min-height: 40em;
 }
 
 /*
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index c2573cc381..a89b0c3ba3 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -129,10 +129,7 @@ AssetsDialog::AssetsDialog(openspace::Profile& profile, const std::string& asset
 {
     setWindowTitle("Assets");
     _assetTreeModel.importModelData(assetBasePath, userAssetBasePath);
-    createWidgets();
-}
 
-void AssetsDialog::createWidgets() {
     QBoxLayout* layout = new QVBoxLayout(this);
     {
         QLabel* heading = new QLabel("Select assets from /data/assets");
@@ -173,18 +170,19 @@ void AssetsDialog::createWidgets() {
             nRows,
             _assetTreeModel.index(-1, 0)
         );
-        layout->addWidget(_assetTree);
+        layout->addWidget(_assetTree, 4);
     }
     {
+        QWidget* box = new QWidget;
+        QBoxLayout* boxLayout = new QVBoxLayout(box);
         QLabel* summaryHeading = new QLabel("Selection summary");
         summaryHeading->setObjectName("heading");
-        layout->addWidget(summaryHeading);
-    }
-    {
+        boxLayout->addWidget(summaryHeading);
         _summary = new QTextEdit;
         _summary->setReadOnly(true);
         _summary->setText(createTextSummary());
-        layout->addWidget(_summary);
+        boxLayout->addWidget(_summary);
+        layout->addWidget(box, 1);
     }
 
     layout->addWidget(new Line);
diff --git a/ext/ghoul b/ext/ghoul
index 0282811937..0a7f66f9a1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 0282811937bc5102ac4dad3a0b53bf72c28aac77
+Subproject commit 0a7f66f9a1cb050b9d6e803257ab1320259fa53d

From 3e7f0d24ada846192035e31f86b9080859df8267 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 27 Jul 2021 16:35:41 +0200
Subject: [PATCH 27/47] Add support for DMS format support in the
 DashboardItemGlobeLocation (closes #1632)

---
 .../src/dashboarditemglobelocation.cpp        | 121 +++++++++++++++---
 .../src/dashboarditemglobelocation.h          |   7 +
 src/util/coordinateconversion.cpp             |   6 +-
 3 files changed, 112 insertions(+), 22 deletions(-)

diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index 0369043f4f..650e8557a0 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -39,6 +39,8 @@
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/misc/profiling.h>
 
+#pragma optimize ("", off)
+
 namespace {
     constexpr const char* KeyFontMono = "Mono";
     constexpr const float DefaultFontSize = 10.f;
@@ -56,6 +58,12 @@ namespace {
         "This value determines the size of the font that is used to render the date."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo DisplayFormatInfo = {
+        "DisplayFormat",
+        "Display Format",
+        "Choosing the format in which the camera location is displayed"
+    };
+
     constexpr openspace::properties::Property::PropertyInfo SignificantDigitsInfo = {
         "SignificantDigits",
         "Significant Digits",
@@ -69,6 +77,14 @@ namespace {
         // [[codegen::verbatim(FontSizeInfo.description)]]
         std::optional<float> fontSize;
 
+        enum class DisplayFormat {
+            DecimalDegrees,
+            DegreeMinuteSeconds
+        };
+
+        // [[codegen::verbatim(DisplayFormatInfo.description)]]
+        std::optional<DisplayFormat> displayFormat;
+
         // [[codegen::verbatim(SignificantDigitsInfo.description)]]
         std::optional<int> significantDigits;
     };
@@ -86,6 +102,7 @@ DashboardItemGlobeLocation::DashboardItemGlobeLocation(
     : DashboardItem(dictionary)
     , _fontName(FontNameInfo, KeyFontMono)
     , _fontSize(FontSizeInfo, DefaultFontSize, 10.f, 144.f, 1.f)
+    , _displayFormat(DisplayFormatInfo)
     , _significantDigits(SignificantDigitsInfo, 4, 1, 12)
     , _font(global::fontManager->font(KeyFontMono, 10))
 {
@@ -104,20 +121,54 @@ DashboardItemGlobeLocation::DashboardItemGlobeLocation(
     addProperty(_fontSize);
 
     auto updateFormatString = [this]() {
-        using namespace fmt::literals;
-
-        _formatString = fmt::format(
-            "Position: {{:03.{0}f}}{{}}, {{:03.{0}f}}{{}}  Altitude: {{:03.{0}f}} {{}}",
-            _significantDigits.value()
-        );
+        switch (_displayFormat.value()) {
+            case static_cast<int>(DisplayFormat::DecimalDegrees):
+                _formatString = fmt::format(
+                    "Position: {{:03.{0}f}}, {{:03.{0}f}}  "
+                    "Altitude: {{:03.{0}f}} {{}}",
+                    _significantDigits.value()
+                );
+                break;
+            case static_cast<int>(DisplayFormat::DegreeMinuteSeconds):
+                _formatString = fmt::format(
+                    "Position: {{}}d {{}}' {{:03.{0}f}}\" {{}}, "
+                    "{{}}d {{}}' {{:03.{0}f}}\" {{}}  "
+                    "Altitude: {{:03.{0}f}} {{}}",
+                    _significantDigits.value()
+                );
+                break;
+        }
     };
+
+    _displayFormat.addOptions({
+        { static_cast<int>(DisplayFormat::DecimalDegrees), "Decimal Degrees" },
+        { static_cast<int>(DisplayFormat::DegreeMinuteSeconds), "Degree Minute Seconds" }
+    });
+    _displayFormat.onChange(updateFormatString);
+    addProperty(_displayFormat);
+
+    if (p.displayFormat.has_value()) {
+        switch (*p.displayFormat) {
+            case Parameters::DisplayFormat::DecimalDegrees:
+                _displayFormat = static_cast<int>(DisplayFormat::DecimalDegrees);
+                break;
+            case Parameters::DisplayFormat::DegreeMinuteSeconds:
+                _displayFormat = static_cast<int>(DisplayFormat::DegreeMinuteSeconds);
+                break;
+        }
+    }
+    else {
+        _displayFormat = static_cast<int>(DisplayFormat::DecimalDegrees);
+    }
+
+
     _significantDigits = p.significantDigits.value_or(_significantDigits);
     _significantDigits.onChange(updateFormatString);
     addProperty(_significantDigits);
-    updateFormatString();
 
     _font = global::fontManager->font(_fontName, _fontSize);
     _buffer.resize(128);
+    updateFormatString();
 }
 
 void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
@@ -149,12 +200,6 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
     double lat = glm::degrees(geo2.lat);
     double lon = glm::degrees(geo2.lon);
 
-    bool isNorth = lat > 0.0;
-    lat = std::abs(lat);
-
-    bool isEast = lon > 0.0;
-    lon = std::abs(lon);
-
     double altitude = glm::length(
         cameraPositionModelSpace - posHandle.centerToReferenceSurface
     );
@@ -168,13 +213,49 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
     std::pair<double, std::string> dist = simplifyDistance(altitude);
 
     std::fill(_buffer.begin(), _buffer.end(), char(0));
-    char* end = fmt::format_to(
-        _buffer.data(),
-        _formatString.c_str(),
-        lat, isNorth ? "N" : "S",
-        lon, isEast ? "E" : "W",
-        dist.first, dist.second
-    );
+    char* end = nullptr;
+    switch (_displayFormat.value()) {
+        case static_cast<int>(DisplayFormat::DecimalDegrees):
+        {
+            end = fmt::format_to(
+                _buffer.data(),
+                _formatString, lat, lon, dist.first, dist.second
+            );
+            break;
+        }
+        case static_cast<int>(DisplayFormat::DegreeMinuteSeconds):
+        {
+            const bool isNorth = lat > 0.0;
+            lat = std::abs(lat);
+
+            const bool isEast = lon > 0.0;
+            lon = std::abs(lon);
+
+            const float latDeg = std::trunc(lat);
+            const float latDegRemainder = lat - latDeg;
+            const float latMin = std::trunc(latDegRemainder * 60.f);
+            const float latMinRemainder = latDegRemainder * 60.f - latMin;
+            const float latSec = latMinRemainder * 60.f;
+
+            const float lonDeg = std::trunc(lon);
+            const float lonDegRemainder = lon - lonDeg;
+            const float lonMin = std::trunc(lonDegRemainder * 60.f);
+            const float lonMinRemainder = lonDegRemainder * 60.f - lonMin;
+            const float lonSec = lonMinRemainder * 60.f;
+
+
+            end = fmt::format_to(
+                _buffer.data(),
+                _formatString,
+                latDeg, latMin, latSec, isNorth ? "N" : "S",
+                lonDeg, lonMin, lonSec, isEast ? "E" : "W",
+                dist.first, dist.second
+            );
+
+            break;
+        }
+    }
+
     std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
 
     RenderFont(*_font, penPosition, text);
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.h b/modules/globebrowsing/src/dashboarditemglobelocation.h
index 13400ead72..3792732b04 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.h
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.h
@@ -27,6 +27,7 @@
 
 #include <openspace/rendering/dashboarditem.h>
 
+#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
@@ -49,9 +50,15 @@ public:
     static documentation::Documentation Documentation();
 
 private:
+    enum class DisplayFormat {
+        DecimalDegrees = 0,
+        DegreeMinuteSeconds
+    };
+
     properties::StringProperty _fontName;
     properties::FloatProperty _fontSize;
 
+    properties::OptionProperty _displayFormat;
     properties::IntProperty _significantDigits;
 
     std::shared_ptr<ghoul::fontrendering::Font> _font;
diff --git a/src/util/coordinateconversion.cpp b/src/util/coordinateconversion.cpp
index cc5e28aae4..daaa9a34ea 100644
--- a/src/util/coordinateconversion.cpp
+++ b/src/util/coordinateconversion.cpp
@@ -32,9 +32,11 @@ namespace {
     constexpr const char* _loggerCat = "Coordinateconversion";
 
     // J2000 Galactic reference frame
-    constexpr double A0 = glm::radians(192.8595); // Equatorial coordinates of the Galactic north pole
+    // Equatorial coordinates of the Galactic north pole
+    constexpr double A0 = glm::radians(192.8595);
     constexpr double D0 = glm::radians(27.1284);
-    constexpr double L0 = glm::radians(122.9320); // Galactic longitude of the equatorial north pole
+    // Galactic longitude of the equatorial north pole
+    constexpr double L0 = glm::radians(122.9320);
 
     void parseString(const std::string& str, int& hoursOrDegrees, int& minutes,
                      double& seconds)

From 6628b9f0b4011ab3f6c871cf0bc808e08183e9ab Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 28 Jul 2021 14:04:31 +0200
Subject: [PATCH 28/47] Parent the Gaia trail and model to the Earth Center to
 match the Horizons file (closes #1573);  Fix mistake that caused the Gaia
 spacecraft to not point away from the Sun anymore

---
 .../solarsystem/missions/gaia/gaia.asset      |  2 +-
 .../solarsystem/missions/gaia/trail.asset     |  4 ++--
 .../missions/gaia/transforms.asset            |  2 +-
 .../scene/solarsystem/sun/transforms.asset    | 20 ++++++++++++++++++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/gaia/gaia.asset b/data/assets/scene/solarsystem/missions/gaia/gaia.asset
index 2268aa01bd..638ad5833f 100644
--- a/data/assets/scene/solarsystem/missions/gaia/gaia.asset
+++ b/data/assets/scene/solarsystem/missions/gaia/gaia.asset
@@ -20,7 +20,7 @@ local Gaia = {
       XAxis = { 1.0, 0.0, 0.0 },
       XAxisOrthogonal = true,
       YAxis = "Sun",
-      YAxisInverted = true
+      YAxisInvert = true
     },
     Scale = {
       Type = "StaticScale",
diff --git a/data/assets/scene/solarsystem/missions/gaia/trail.asset b/data/assets/scene/solarsystem/missions/gaia/trail.asset
index ee00ea2a6c..64b8dfd8de 100644
--- a/data/assets/scene/solarsystem/missions/gaia/trail.asset
+++ b/data/assets/scene/solarsystem/missions/gaia/trail.asset
@@ -11,7 +11,7 @@ local trail = asset.syncedResource({
 
 local GaiaTrail = {
   Identifier = "GaiaTrail",
-  Parent = earthTransforms.EarthBarycenter.Identifier,
+  Parent = earthTransforms.EarthCenter.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
     Translation = {
@@ -36,7 +36,7 @@ local GaiaTrail = {
 
 local GaiaTrailEclip = {
   Identifier = "GaiaTrail_Eclip",
-  Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+  Parent = sunTransforms.SunCenter.Identifier,
   Renderable = {
     Type = "RenderableTrailTrajectory",
     Enabled = false,
diff --git a/data/assets/scene/solarsystem/missions/gaia/transforms.asset b/data/assets/scene/solarsystem/missions/gaia/transforms.asset
index 5db3a1205c..83441604d5 100644
--- a/data/assets/scene/solarsystem/missions/gaia/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/gaia/transforms.asset
@@ -11,7 +11,7 @@ local trail = asset.syncedResource({
 
 local GaiaPosition = {
   Identifier = "GaiaPosition",
-  Parent = earthTransforms.EarthBarycenter.Identifier,
+  Parent = earthTransforms.EarthCenter.Identifier,
   Transform = {
     Translation = {
       Type = "HorizonsTranslation",
diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset
index 29ab4120b8..ffa77be444 100644
--- a/data/assets/scene/solarsystem/sun/transforms.asset
+++ b/data/assets/scene/solarsystem/sun/transforms.asset
@@ -20,6 +20,24 @@ local SolarSystemBarycenter = {
   }
 }
 
+local SunCenter = {
+  Identifier = "SunCenter",
+  Parent = SolarSystemBarycenter.Identifier,
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "SUN",
+      Observer = "SSB"
+    }
+  },
+  GUI = {
+    Name = "SUN Center",
+    Path = "/Solar System/Sun",
+    Description = [[Spice frame for the Sun]],
+    Hidden = true
+  }
+}
+
 -- Spice frame for the Sun
 local SunIAU = {
   Identifier = "SunIAU",
@@ -67,7 +85,7 @@ local SunECLIPJ2000 = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { SolarSystemBarycenter, SunIAU, SunECLIPJ2000 })
+assetHelper.registerSceneGraphNodesAndExport(asset, { SolarSystemBarycenter, SunCenter, SunIAU, SunECLIPJ2000 })
 
 
 asset.meta = {

From 309bce2e30c11715c2eef8e5d0c07ef18211c2bb Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 28 Jul 2021 14:49:29 +0200
Subject: [PATCH 29/47] Fix DebugAxis helper;  Increase the sensitivity to
 prevent loss of color in debug axis (closes #1560)

---
 data/assets/util/debug_helper.asset           |  2 +-
 .../rendering/renderablecartesianaxes.cpp     | 14 ++++-------
 modules/base/shaders/axes_fs.glsl             | 23 +++++++++++--------
 modules/base/shaders/axes_vs.glsl             | 16 ++++++-------
 modules/globebrowsing/src/tileprovider.cpp    |  3 ---
 5 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/data/assets/util/debug_helper.asset b/data/assets/util/debug_helper.asset
index 6c75714d06..9b10fb04c6 100644
--- a/data/assets/util/debug_helper.asset
+++ b/data/assets/util/debug_helper.asset
@@ -67,7 +67,7 @@ local addCartesianAxes = function (specification)
     Parent = parent,
     Transform = {
       Scale = {
-        Type = "StaticScale",
+        Type = "NonUniformStaticScale",
         Scale = scale
       },
       Translation = {
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index 9b658ac953..2228fa11e1 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -118,14 +118,7 @@ void RenderableCartesianAxes::initializeGL() {
     );
 
     glGenVertexArrays(1, &_vaoId);
-    glGenBuffers(1, &_vBufferId);
-    glGenBuffers(1, &_iBufferId);
-
     glBindVertexArray(_vaoId);
-    glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferId);
-    glEnableVertexAttribArray(0);
-    glBindVertexArray(0);
 
     std::vector<Vertex> vertices({
         Vertex{0.f, 0.f, 0.f},
@@ -140,7 +133,7 @@ void RenderableCartesianAxes::initializeGL() {
         0, 3
     };
 
-    glBindVertexArray(_vaoId);
+    glGenBuffers(1, &_vBufferId);
     glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
     glBufferData(
         GL_ARRAY_BUFFER,
@@ -149,8 +142,10 @@ void RenderableCartesianAxes::initializeGL() {
         GL_STATIC_DRAW
     );
 
+    glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
 
+    glGenBuffers(1, &_iBufferId);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferId);
     glBufferData(
         GL_ELEMENT_ARRAY_BUFFER,
@@ -158,6 +153,7 @@ void RenderableCartesianAxes::initializeGL() {
         indices.data(),
         GL_STATIC_DRAW
     );
+    glBindVertexArray(0);
 }
 
 void RenderableCartesianAxes::deinitializeGL() {
@@ -201,9 +197,9 @@ void RenderableCartesianAxes::render(const RenderData& data, RendererTasks&){
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnablei(GL_BLEND, 0);
     glEnable(GL_LINE_SMOOTH);
+    glLineWidth(3.0);
 
     glBindVertexArray(_vaoId);
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferId);
     glDrawElements(GL_LINES, NVertexIndices, GL_UNSIGNED_INT, nullptr);
     glBindVertexArray(0);
 
diff --git a/modules/base/shaders/axes_fs.glsl b/modules/base/shaders/axes_fs.glsl
index 912657481c..182e24e973 100644
--- a/modules/base/shaders/axes_fs.glsl
+++ b/modules/base/shaders/axes_fs.glsl
@@ -33,17 +33,20 @@ uniform vec3 yColor;
 uniform vec3 zColor;
 
 Fragment getFragment() {
-    Fragment frag;
+  Fragment frag;
 
-    vec3 colorComponents = step(0.01, vs_positionModelSpace);
+  // We compare against a small value as the first vertex doesn't have a positional
+  // information (or rather it is 0) and we don't want to miss out on the color close to
+  // the origin
+  vec3 colorComponents = step(2e-32, vs_positionModelSpace);
 
-    frag.color.rgb = colorComponents.x * xColor +
-        colorComponents.y * yColor +
-        colorComponents.z * zColor;
-    frag.color.a = 1.0;
+  frag.color.rgb = colorComponents.x * xColor +
+    colorComponents.y * yColor +
+    colorComponents.z * zColor;
+  frag.color.a = 1.0;
 
-    frag.depth = vs_screenSpaceDepth;
-    frag.gPosition = vs_positionViewSpace;
-    frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
-    return frag;
+  frag.depth = vs_screenSpaceDepth;
+  frag.gPosition = vs_positionViewSpace;
+  frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
+  return frag;
 }
diff --git a/modules/base/shaders/axes_vs.glsl b/modules/base/shaders/axes_vs.glsl
index 539b4ddd18..feb654a310 100644
--- a/modules/base/shaders/axes_vs.glsl
+++ b/modules/base/shaders/axes_vs.glsl
@@ -34,13 +34,13 @@ uniform mat4 modelViewTransform;
 uniform mat4 projectionTransform;
 
 void main() {
-    vec4 positionViewSpace = modelViewTransform * vec4(in_position, 1.0);
-    vec4 positionClipSpace = projectionTransform * positionViewSpace;
-    vec4 positionScreenSpace = positionClipSpace;
-    positionScreenSpace.z = 0.0;
-    vs_positionModelSpace = in_position;
-    vs_screenSpaceDepth  = positionScreenSpace.w;
-    vs_positionViewSpace = positionViewSpace;
+  vec4 positionViewSpace = modelViewTransform * vec4(in_position, 1.0);
+  vec4 positionClipSpace = projectionTransform * positionViewSpace;
+  vec4 positionScreenSpace = positionClipSpace;
+  positionScreenSpace.z = 0.0;
+  vs_positionModelSpace = in_position;
+  vs_screenSpaceDepth  = positionScreenSpace.w;
+  vs_positionViewSpace = positionViewSpace;
 
-    gl_Position = positionScreenSpace;
+  gl_Position = positionScreenSpace;
 }
diff --git a/modules/globebrowsing/src/tileprovider.cpp b/modules/globebrowsing/src/tileprovider.cpp
index 53d75717f3..0f743ec592 100644
--- a/modules/globebrowsing/src/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider.cpp
@@ -228,9 +228,7 @@ Tile tile(TextTileProvider& t, const TileIndex& tileIndex) {
 
         // Keep track of defaultFBO and viewport to be able to reset state when done
         GLint defaultFBO;
-        //GLint viewport[4];
         defaultFBO = global::renderEngine->openglStateCache().defaultFramebuffer();
-        //glGetIntegerv(GL_VIEWPORT, viewport);
 
         // Render to texture
         glBindFramebuffer(GL_FRAMEBUFFER, t.fbo);
@@ -252,7 +250,6 @@ Tile tile(TextTileProvider& t, const TileIndex& tileIndex) {
 
         glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
         global::renderEngine->openglStateCache().resetViewportState();
-        //glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
 
         tile = Tile{ texture, std::nullopt, Tile::Status::OK };
         t.tileCache->put(key, t.initData.hashKey, tile);

From f676c780f5d1b215cacf79be367e74ffd6b1f484 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 28 Jul 2021 15:10:01 +0200
Subject: [PATCH 30/47] Prevent resetting of empty tileproviders (closes #1383)

---
 modules/globebrowsing/src/layermanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index 7aa19c6e60..51f0cc4dbc 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -156,7 +156,7 @@ void LayerManager::reset(bool includeDisabled) {
 
     for (std::unique_ptr<LayerGroup>& layerGroup : _layerGroups) {
         for (Layer* layer : layerGroup->layers()) {
-            if (layer->enabled() || includeDisabled) {
+            if ((layer->enabled() || includeDisabled) && layer->tileProvider()) {
                 tileprovider::reset(*layer->tileProvider());
             }
         }

From e2c13b399dd5661ef491534e733563dc7d4073a6 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Wed, 28 Jul 2021 23:41:24 -0600
Subject: [PATCH 31/47] Added warning to keybinding editor for duplicate
 assignments

---
 .../include/profile/keybindingsdialog.h       |  6 ++
 .../src/profile/keybindingsdialog.cpp         | 67 ++++++++++++++-----
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/profile/keybindingsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/keybindingsdialog.h
index 34097a0b2a..91dd07972c 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/keybindingsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/keybindingsdialog.h
@@ -28,6 +28,7 @@
 #include <QDialog>
 
 #include <openspace/scene/profile.h>
+#include <openspace/util/keys.h>
 #include <QWidget>
 #include <QListWidgetItem>
 
@@ -68,6 +69,7 @@ private slots:
     void parseSelections();
     void chooseScripts();
     void keySelected(int index);
+    void keyModSelected(int index);
 
     /**
      * Adds scripts to the _scriptEdit from outside dialogs
@@ -83,12 +85,16 @@ private:
     int indexInKeyMapping(std::vector<int>& mapVector, int keyInt);
     bool areRequiredFormsFilled();
     bool isLineEmpty(int index);
+    void addStringToErrorDisplay(const QString& newString);
+    void checkForNumberKeyConflict(int key);
+    void checkForBindingConflict(int selectedModKey, int selectedKey);
 
     openspace::Profile& _profile;
     std::vector<openspace::Profile::Keybinding> _data;
     std::vector<int> _mapModKeyComboBoxIndexToKeyValue;
     std::vector<int> _mapKeyComboBoxIndexToKeyValue;
     bool _editModeNewItem = false;
+    int _currentKeybindingSelection = 0;
 
     QListWidget* _list = nullptr;
     QLabel* _keyModLabel = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
index 273dde9ab6..a51afcb5fe 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
@@ -28,7 +28,6 @@
 #include "profile/scriptlogdialog.h"
 
 #include <openspace/scene/profile.h>
-#include <openspace/util/keys.h>
 #include <qevent.h>
 #include <algorithm>
 #include <QKeyEvent>
@@ -167,6 +166,10 @@ void KeybindingsDialog::createWidgets() {
             _mapModKeyComboBoxIndexToKeyValue.push_back(modIdx++);
         }
         _keyModCombo->addItems(comboModKeysStringList);
+        connect(
+            _keyModCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, &KeybindingsDialog::keyModSelected
+        );
         box->addWidget(_keyModCombo, 0, 1);
 
 
@@ -286,6 +289,7 @@ void KeybindingsDialog::createWidgets() {
 void KeybindingsDialog::listItemSelected() {
     QListWidgetItem *item = _list->currentItem();
     int index = _list->row(item);
+    _currentKeybindingSelection = index;
 
     if (_data.size() > 0) {
         Profile::Keybinding& k = _data[index];
@@ -317,21 +321,25 @@ void KeybindingsDialog::listItemSelected() {
 }
 
 void KeybindingsDialog::keySelected(int index) {
-    const QString numKeyWarning = "Warning: Using a number key may conflict with the "
-        "keybindings for simulation time increments.";
+    _errorMsg->clear();
+    int selectedKey = _mapKeyComboBoxIndexToKeyValue[index];
+    checkForNumberKeyConflict(selectedKey);
+    checkForBindingConflict(_keyModCombo->currentIndex(), selectedKey);
+}
+
+void KeybindingsDialog::keyModSelected(int index) {
+    _errorMsg->clear();
+    int selectedKey = _mapModKeyComboBoxIndexToKeyValue[index];
+    checkForBindingConflict(selectedKey,
+        _mapKeyComboBoxIndexToKeyValue.at(_keyCombo->currentIndex()));
+}
+
+void KeybindingsDialog::addStringToErrorDisplay(const QString& newString) {
     QString errorContents = _errorMsg->text();
-    bool alreadyContainsWarning = (errorContents.length() >= numKeyWarning.length() &&
-        errorContents.left(numKeyWarning.length()) == numKeyWarning);
-    if  (_mapKeyComboBoxIndexToKeyValue[index] >= static_cast<int>(Key::Num0)
-      && _mapKeyComboBoxIndexToKeyValue[index] <= static_cast<int>(Key::Num9))
-    {
-        if (!alreadyContainsWarning) {
-            errorContents = numKeyWarning + errorContents;
-            _errorMsg->setText(errorContents);
-        }
-    }
-    else if (alreadyContainsWarning) {
-        _errorMsg->setText(errorContents.mid(numKeyWarning.length()));
+    bool alreadyContainsString = (errorContents.indexOf(newString, 0) != -1);
+    if (!alreadyContainsString) {
+        errorContents = newString + errorContents;
+        _errorMsg->setText(errorContents);
     }
 }
 
@@ -371,10 +379,37 @@ void KeybindingsDialog::listItemAdded() {
     _documentationEdit->setText(QString::fromStdString(_data.back().documentation));
     _localCheck->setChecked(false);
     _scriptEdit->setText(QString::fromStdString(_data.back().script));
-
+    _currentKeybindingSelection = _data.size() - 1;
     _editModeNewItem = true;
 }
 
+void KeybindingsDialog::checkForNumberKeyConflict(int key) {
+    const QString numKeyWarning = "Warning: Using a number key may conflict with the "
+        "keybindings for simulation time increments.\n";
+    if (key >= static_cast<int>(Key::Num0) && key <= static_cast<int>(Key::Num9)) {
+        addStringToErrorDisplay(numKeyWarning);
+    }
+}
+
+void KeybindingsDialog::checkForBindingConflict(int selectedModKey, int selectedKey) {
+    const QString localWarn = "Warning: New selection conflicts with binding '";
+    if (_currentKeybindingSelection >= _data.size()) {
+        return;
+    }
+    KeyModifier newModifier = static_cast<KeyModifier>(selectedModKey);
+    Key newKey = static_cast<Key>(selectedKey);
+    for (int i = 0; i < _data.size(); ++i) {
+        if (i == _currentKeybindingSelection) {
+            continue;
+        }
+        openspace::Profile::Keybinding k = _data[i];
+        if ((k.key.key == newKey) && (k.key.modifier == newModifier)) {
+            addStringToErrorDisplay(localWarn + QString::fromStdString(k.name) + "'.\n");
+            break;
+        }
+    }
+}
+
 void KeybindingsDialog::listItemSave() {
     if (!areRequiredFormsFilled()) {
         return;

From c0941a124313dc4d0cb6106d032163ef5f90e5ed Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 29 Jul 2021 14:22:41 +0200
Subject: [PATCH 32/47] Reset the anchor/aim node when removing a scenegraph
 node (closes #1402)

---
 src/interaction/navigationhandler.cpp |  1 +
 src/scene/scene_lua.inl               | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp
index 620e87baf1..03843619d3 100644
--- a/src/interaction/navigationhandler.cpp
+++ b/src/interaction/navigationhandler.cpp
@@ -197,6 +197,7 @@ void NavigationHandler::deinitialize() {
 }
 
 void NavigationHandler::setFocusNode(SceneGraphNode* node) {
+    ghoul_assert(node, "Focus node must not be nullptr");
     _orbitalNavigator.setFocusNode(node);
     _camera->setPositionVec3(anchorNode()->worldPosition());
 }
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 8c231f8efc..b7e3af12b9 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -25,6 +25,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/openspaceengine.h>
+#include <openspace/interaction/navigationhandler.h>
 #include <ghoul/misc/defer.h>
 #include <ghoul/misc/easing.h>
 
@@ -703,6 +704,15 @@ int removeSceneGraphNode(lua_State* L) {
     // Remove the node and all its children
     std::function<void(SceneGraphNode*)> removeNode =
         [&removeNode](SceneGraphNode* localNode) {
+
+        if (localNode == global::navigationHandler->anchorNode()) {
+            global::navigationHandler->setFocusNode(sceneGraph()->root());
+        }
+
+        if (localNode == global::navigationHandler->orbitalNavigator().aimNode()) {
+            global::navigationHandler->orbitalNavigator().setAimNode("");
+        }
+
         std::vector<SceneGraphNode*> children = localNode->children();
 
         ghoul::mm_unique_ptr<SceneGraphNode> n = localNode->parent()->detachChild(
@@ -852,6 +862,15 @@ int removeSceneGraphNodesFromRegex(lua_State* L) {
     // Remove all marked nodes
     std::function<void(SceneGraphNode*)> removeNode =
         [&removeNode, &markedList](SceneGraphNode* localNode) {
+
+        if (localNode == global::navigationHandler->anchorNode()) {
+            global::navigationHandler->setFocusNode(sceneGraph()->root());
+        }
+
+        if (localNode == global::navigationHandler->orbitalNavigator().aimNode()) {
+            global::navigationHandler->orbitalNavigator().setAimNode("");
+        }
+
         std::vector<SceneGraphNode*> children = localNode->children();
 
         ghoul::mm_unique_ptr<SceneGraphNode> n = localNode->parent()->detachChild(

From c4bddacfeb1d58a06230b061249dde52cb9ef835 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 30 Jul 2021 12:00:56 +0200
Subject: [PATCH 33/47] Remove nonfunctioning ABufferRenderer from RenderEngine

---
 CMakeLists.txt                                |    2 -
 include/openspace/engine/configuration.h      |    8 +-
 include/openspace/rendering/abufferrenderer.h |  183 ---
 .../openspace/rendering/framebufferrenderer.h |   34 +-
 include/openspace/rendering/renderengine.h    |   30 +-
 include/openspace/rendering/renderer.h        |   83 --
 modules/base/rendering/renderableplane.cpp    |   16 +-
 modules/base/rendering/renderablesphere.cpp   |   14 +-
 modules/base/rendering/renderabletrail.cpp    |   16 +-
 .../renderablefieldlinessequence.cpp          |   19 +-
 openspace.cfg                                 |    1 -
 src/CMakeLists.txt                            |    7 -
 src/engine/configuration.cpp                  |   27 +-
 src/rendering/abufferrenderer.cpp             | 1062 -----------------
 src/rendering/renderengine.cpp                |  212 +---
 src/rendering/renderengine_lua.inl            |   24 -
 16 files changed, 64 insertions(+), 1674 deletions(-)
 delete mode 100644 include/openspace/rendering/abufferrenderer.h
 delete mode 100644 include/openspace/rendering/renderer.h
 delete mode 100644 src/rendering/abufferrenderer.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4b73947d7..c17d3703a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,8 +132,6 @@ if (MSVC)
   set(GHOUL_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS ${OPENSPACE_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS} CACHE BOOL "" FORCE)
 endif ()
 
-option(OPENSPACE_WITH_ABUFFER_RENDERER "Compile ABuffer Renderer" OFF)
-
 if (UNIX)
   if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++")
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index eed5c055c5..daf0ac7ee4 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -98,16 +98,14 @@ struct Configuration {
     bool usePerProfileCache = false;
 
     bool isRenderingOnMasterDisabled = false;
-    glm::dvec3 globalRotation = glm::dvec3(0.0);
-    glm::dvec3 screenSpaceRotation = glm::dvec3(0.0);
-    glm::dvec3 masterRotation = glm::dvec3(0.0);
+    glm::vec3 globalRotation = glm::vec3(0.0);
+    glm::vec3 screenSpaceRotation = glm::vec3(0.0);
+    glm::vec3 masterRotation = glm::vec3(0.0);
     bool isConsoleDisabled = false;
     bool bypassLauncher = false;
 
     std::map<std::string, ghoul::Dictionary> moduleConfigurations;
 
-    std::string renderingMethod = "Framebuffer";
-
     struct OpenGLDebugContext {
         bool isActive = false;
         bool isSynchronous = true;
diff --git a/include/openspace/rendering/abufferrenderer.h b/include/openspace/rendering/abufferrenderer.h
deleted file mode 100644
index 5769c1e28c..0000000000
--- a/include/openspace/rendering/abufferrenderer.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_CORE___ABUFFERRENDERER___H__
-#define __OPENSPACE_CORE___ABUFFERRENDERER___H__
-
-#ifdef OPENSPACE_WITH_ABUFFER_RENDERER
-
-#include <openspace/rendering/renderer.h>
-#include <openspace/rendering/raycasterlistener.h>
-
-#include <ghoul/glm.h>
-#include <ghoul/misc/dictionary.h>
-#include <ghoul/opengl/ghoul_gl.h>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace ghoul::filesystem { class File; }
-
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
-
-namespace openspace {
-
-struct RaycasterTask;
-class RenderableVolume;
-class Camera;
-class Scene;
-struct RaycastData;
-
-class ABufferRenderer : public Renderer, public RaycasterListener {
-public:
-    virtual ~ABufferRenderer() = default;
-
-    void initialize() override;
-    void deinitialize() override;
-
-    void setResolution(glm::ivec2 res) override;
-    void setNAaSamples(int nAaSamples) override;
-    void setBlurrinessLevel(int level) override;
-    void setHDRExposure(float hdrExposure) override;
-    void setGamma(float gamma) override;
-    void setMaxWhite(float maxWhite) override;
-    void setToneMapOperator(int tmOp) override;
-    void setBloomThreMin(float minV) override;
-    void setBloomThreMax(float maxV) override;
-    void setBloomOrigFactor(float origFactor) override;
-    void setBloomNewFactor(float newFactor) override;
-    void setKey(float key) override;
-    void setYwhite(float white) override;
-    void setTmoSaturation(float sat) override;
-    void setHue(float hue) override;
-    void setValue(float value) override;
-    void setSaturation(float sat) override;
-    void setLightness(float lightness) override;
-    void setColorSpace(unsigned int colorspace) override;
-
-    void enableBloom(bool enable) override;
-    void enableHistogram(bool enable) override;
-
-    int nAaSamples() const override;
-    const std::vector<double>& mSSAPattern() const override;
-
-    using Renderer::preRaycast;
-    void preRaycast(const RaycasterTask& raycasterTask);
-    using Renderer::postRaycast;
-    void postRaycast(const RaycasterTask& raycasterTask);
-
-    void update() override;
-    void render(Scene* scene, Camera* camera, float blackoutFactor) override;
-
-    /**
-     * Update render data
-     * Responsible for calling renderEngine::setRenderData
-     */
-    virtual void updateRendererData() override;
-    virtual void raycastersChanged(VolumeRaycaster& raycaster,
-        IsAttached attached) override;
-
-private:
-    void clear();
-    void updateResolution();
-    void updateRaycastData();
-    void updateResolveDictionary();
-    void updateMSAASamplingPattern();
-    void saveTextureToMemory(GLenum color_buffer_attachment, int width, int height,
-        std::vector<double> & memory) const;
-
-    glm::ivec2 _resolution = glm::ivec2(0);
-
-    bool _dirtyResolution = true;
-    bool _dirtyRendererData = true;
-    bool _dirtyRaycastData = true;
-    bool _dirtyResolveDictionary = true;
-
-    std::unique_ptr<ghoul::opengl::ProgramObject> _resolveProgram = nullptr;
-
-    /**
-     * When a volume is attached or detached from the scene graph,
-     * the resolve program needs to be recompiled.
-     * The _volumes map keeps track of which volumes that can
-     * be rendered using the current resolve program, along with their raycast data
-     * (id, namespace, etc)
-     */
-    std::map<VolumeRaycaster*, RaycastData> _raycastData;
-    std::map<
-        VolumeRaycaster*, std::unique_ptr<ghoul::opengl::ProgramObject>
-    > _boundsPrograms;
-    std::vector<std::string> _helperPaths;
-
-    ghoul::Dictionary _resolveDictionary;
-
-    GLuint _mainColorTexture;
-    GLuint _mainDepthTexture;
-
-    GLuint _mainFramebuffer;
-    GLuint _screenQuad;
-    GLuint _anchorPointerTexture;
-    GLuint _anchorPointerTextureInitializer;
-    GLuint _atomicCounterBuffer;
-    GLuint _fragmentBuffer;
-    GLuint _fragmentTexture;
-    GLuint _vertexPositionBuffer;
-    int _nAaSamples;
-    int _blurrinessLevel = 1;
-
-    float _hdrExposure = 0.4f;
-    float _hdrBackground = 2.8f;
-    float _gamma = 2.2f;
-    float _maxWhite = 1.f;
-    float _blackoutFactor;
-    bool _bloomEnabled = false;
-    float _bloomThresholdMin = 0.0;
-    float _bloomThresholdMax = 1.0;
-    float _bloomOrigFactor = 1.0;
-    float _bloomNewFactor = 1.0;
-    int _toneMapOperator = 0;
-    bool _histogramEnabled = false;
-    int _numberOfBins = 1024; // JCC TODO: Add a parameter control for this.
-    float _tmoKey = 0.18f;
-    float _tmoYwhite = 1e6f;
-    float _tmoSaturation = 1.0f;
-    float _hue = 1.f;
-    float _saturation = 1.f;
-    float _value = 1.f;
-    float _lightness = 1.f;
-    unsigned int _colorSpace = 1;
-
-    std::vector<double> _mSAAPattern;
-
-    ghoul::Dictionary _rendererData;
-};
-
-} // namespace openspace
-
-#endif // OPENSPACE_WITH_ABUFFER_RENDERER
-
-#endif // __OPENSPACE_CORE___ABUFFERRENDERER___H__
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index d76c2c5d88..f88e6460c3 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -25,8 +25,6 @@
 #ifndef __OPENSPACE_CORE___FRAMEBUFFERRENDERER___H__
 #define __OPENSPACE_CORE___FRAMEBUFFERRENDERER___H__
 
-#include <openspace/rendering/renderer.h>
-#include <openspace/rendering/renderengine.h>
 #include <openspace/rendering/raycasterlistener.h>
 #include <openspace/rendering/deferredcasterlistener.h>
 
@@ -56,14 +54,14 @@ struct RaycasterTask;
 class Scene;
 struct UpdateStructures;
 
-class FramebufferRenderer : public Renderer, public RaycasterListener,
+class FramebufferRenderer : public RaycasterListener,
                             public DeferredcasterListener
 {
 public:
     virtual ~FramebufferRenderer() = default;
 
-    void initialize() override;
-    void deinitialize() override;
+    void initialize();
+    void deinitialize();
 
     void updateResolution();
     void updateRaycastData();
@@ -72,33 +70,33 @@ public:
     void updateFXAA();
     void updateDownscaledVolume();
 
-    void setResolution(glm::ivec2 res) override;
-    void setHDRExposure(float hdrExposure) override;
-    void setGamma(float gamma) override;
-    void setHue(float hue) override;
-    void setValue(float value) override;
-    void setSaturation(float sat) override;
+    void setResolution(glm::ivec2 res);
+    void setHDRExposure(float hdrExposure);
+    void setGamma(float gamma);
+    void setHue(float hue);
+    void setValue(float value);
+    void setSaturation(float sat);
 
-    void enableFXAA(bool enable) override;
-    void setDisableHDR(bool disable) override;
+    void enableFXAA(bool enable);
+    void setDisableHDR(bool disable);
 
-    void update() override;
+    void update();
     void performRaycasterTasks(const std::vector<RaycasterTask>& tasks,
         const glm::ivec4& viewport);
     void performDeferredTasks(const std::vector<DeferredcasterTask>& tasks,
         const glm::ivec4& viewport);
-    void render(Scene* scene, Camera* camera, float blackoutFactor) override;
+    void render(Scene* scene, Camera* camera, float blackoutFactor);
 
     /**
      * Update render data
      * Responsible for calling renderEngine::setRenderData
      */
-    virtual void updateRendererData() override;
+    virtual void updateRendererData();
 
     virtual void raycastersChanged(VolumeRaycaster& raycaster,
-        RaycasterListener::IsAttached attached) override;
+        RaycasterListener::IsAttached attached);
     virtual void deferredcastersChanged(Deferredcaster& deferredcaster,
-        DeferredcasterListener::IsAttached isAttached) override;
+        DeferredcasterListener::IsAttached isAttached);
 
 private:
     using RaycasterProgObjMap = std::map<
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index d32734712c..388e0c8044 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -33,6 +33,7 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/triggerproperty.h>
+#include <openspace/rendering/framebufferrenderer.h>
 #include <chrono>
 #include <filesystem>
 
@@ -54,7 +55,6 @@ namespace scripting { struct LuaLibrary; }
 class Camera;
 class RaycasterManager;
 class DeferredcasterManager;
-class Renderer;
 class Scene;
 class SceneManager;
 class ScreenLog;
@@ -63,12 +63,6 @@ struct ShutdownInformation;
 
 class RenderEngine : public properties::PropertyOwner {
 public:
-    enum class RendererImplementation {
-        Framebuffer = 0,
-        ABuffer,
-        Invalid
-    };
-
     RenderEngine();
     ~RenderEngine();
 
@@ -80,9 +74,6 @@ public:
     Scene* scene();
     void updateScene();
 
-    const Renderer& renderer() const;
-    RendererImplementation rendererImplementation() const;
-
     ghoul::opengl::OpenGLStateCache& openglStateCache();
 
     void updateShaderPrograms();
@@ -120,24 +111,11 @@ public:
 
     void removeRenderProgram(ghoul::opengl::ProgramObject* program);
 
-    /**
-    * Set raycasting uniforms on the program object, and setup raycasting.
-    */
-    void preRaycast(ghoul::opengl::ProgramObject& programObject);
-
-    /**
-    * Tear down raycasting for the specified program object.
-    */
-    void postRaycast(ghoul::opengl::ProgramObject& programObject);
-
     /**
      * Set the camera to use for rendering
      */
     void setCamera(Camera* camera);
 
-
-    void setRendererFromString(const std::string& renderingMethod);
-
     /**
      * Lets the renderer update the data to be brought into the rendererer programs
      * as a 'rendererData' variable in the dictionary.
@@ -176,9 +154,6 @@ public:
     uint64_t frameNumber() const;
 
 private:
-    void setRenderer(std::unique_ptr<Renderer> renderer);
-    RendererImplementation rendererFromString(const std::string& renderingMethod) const;
-
     void renderScreenLog();
     void renderVersionInformation();
     void renderCameraInformation();
@@ -188,8 +163,7 @@ private:
     Camera* _camera = nullptr;
     Scene* _scene = nullptr;
 
-    std::unique_ptr<Renderer> _renderer;
-    RendererImplementation _rendererImplementation = RendererImplementation::Invalid;
+    FramebufferRenderer _renderer;
     ghoul::Dictionary _rendererData;
     ghoul::Dictionary _resolveData;
     ScreenLog* _log = nullptr;
diff --git a/include/openspace/rendering/renderer.h b/include/openspace/rendering/renderer.h
deleted file mode 100644
index 6a9243592d..0000000000
--- a/include/openspace/rendering/renderer.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_CORE___RENDERER___H__
-#define __OPENSPACE_CORE___RENDERER___H__
-
-#include <ghoul/glm.h>
-#include <vector>
-
-namespace ghoul { class Dictionary; }
-namespace ghoul::filesystem { class File; }
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
-
-namespace openspace {
-
-class RenderableVolume;
-class Camera;
-class Scene;
-
-class Renderer {
-public:
-    virtual ~Renderer() = default;
-
-    virtual void initialize() = 0;
-    virtual void deinitialize() = 0;
-
-    virtual void setResolution(glm::ivec2 res) = 0;
-    virtual void setHDRExposure(float hdrExposure) = 0;
-    virtual void setGamma(float gamma) = 0;
-    virtual void setHue(float hue) = 0;
-    virtual void setValue(float value) = 0;
-    virtual void setSaturation(float sat) = 0;
-    virtual void enableFXAA(bool enable) = 0;
-    virtual void setDisableHDR(bool disable) = 0;
-
-    /**
-    * Set raycasting uniforms on the program object, and setup raycasting.
-    */
-    virtual void preRaycast(ghoul::opengl::ProgramObject& /*programObject*/) {};
-
-    /**
-    * Tear down raycasting for the specified program object.
-    */
-    virtual void postRaycast(ghoul::opengl::ProgramObject& /*programObject*/) {};
-
-
-    virtual void update() = 0;
-
-    virtual void render(Scene* scene, Camera* camera, float blackoutFactor) = 0;
-    /**
-     * Update render data
-     * Responsible for calling renderEngine::setRenderData
-     */
-    virtual void updateRendererData() = 0;
-};
-
-} // openspace
-
-#endif // __OPENSPACE_CORE___RENDERER___H__
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 86401eb031..f8079ec26e 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -255,21 +255,7 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
 
     _shader->setUniform("multiplyColor", _multiplyColor);
 
-    bool usingFramebufferRenderer = global::renderEngine->rendererImplementation() ==
-                                    RenderEngine::RendererImplementation::Framebuffer;
-
-    bool usingABufferRenderer = global::renderEngine->rendererImplementation() ==
-                                RenderEngine::RendererImplementation::ABuffer;
-
-    if (usingABufferRenderer) {
-        _shader->setUniform(
-            "additiveBlending",
-            _blendMode == static_cast<int>(BlendMode::Additive)
-        );
-    }
-
-    bool additiveBlending =
-        (_blendMode == static_cast<int>(BlendMode::Additive)) && usingFramebufferRenderer;
+    bool additiveBlending = (_blendMode == static_cast<int>(BlendMode::Additive));
     if (additiveBlending) {
         glDepthMask(false);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE);
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 4d05f81f3d..be23335a4e 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -398,24 +398,14 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
         glDisable(GL_CULL_FACE);
     }
 
-    bool usingFramebufferRenderer = global::renderEngine->rendererImplementation() ==
-                                    RenderEngine::RendererImplementation::Framebuffer;
-
-    bool usingABufferRenderer = global::renderEngine->rendererImplementation() ==
-                                RenderEngine::RendererImplementation::ABuffer;
-
-    if (usingABufferRenderer && _useAdditiveBlending) {
-        _shader->setUniform("additiveBlending", true);
-    }
-
-    if (usingFramebufferRenderer && _useAdditiveBlending) {
+    if (_useAdditiveBlending) {
         glBlendFunc(GL_SRC_ALPHA, GL_ONE);
         glDepthMask(false);
     }
 
     _sphere->render();
 
-    if (usingFramebufferRenderer && _useAdditiveBlending) {
+    if (_useAdditiveBlending) {
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         glDepthMask(true);
     }
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 63e7d99764..509be6db13 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -430,14 +430,8 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     /*glm::ivec2 resolution = global::renderEngine.renderingResolution();
     _programObject->setUniform(_uniformCache.resolution, resolution);*/
 
-    const bool usingFramebufferRenderer =
-        global::renderEngine->rendererImplementation() ==
-        RenderEngine::RendererImplementation::Framebuffer;
-
-    if (usingFramebufferRenderer) {
-        glDepthMask(false);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-    }
+    glDepthMask(false);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 
     const bool renderLines = (_appearance.renderingModes == RenderingModeLines) ||
                              (_appearance.renderingModes == RenderingModeLinesPoints);
@@ -508,10 +502,8 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
 
     glBindVertexArray(0);
 
-    if (usingFramebufferRenderer) {
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glDepthMask(true);
-    }
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glDepthMask(true);
 
     _programObject->deactivate();
 }
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 95e075a9a6..8f58744cf4 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -1112,22 +1112,9 @@ void RenderableFieldlinesSequence::render(const RenderData& data, RendererTasks&
 
         bool additiveBlending = false;
         if (_pColorABlendEnabled) {
-            const auto renderer = global::renderEngine->rendererImplementation();
-            const bool usingFBufferRenderer = renderer ==
-                                        RenderEngine::RendererImplementation::Framebuffer;
-
-            const bool usingABufferRenderer = renderer ==
-                                        RenderEngine::RendererImplementation::ABuffer;
-
-            if (usingABufferRenderer) {
-                _shaderProgram->setUniform("usingAdditiveBlending", _pColorABlendEnabled);
-            }
-
-            additiveBlending = usingFBufferRenderer;
-            if (additiveBlending) {
-                glDepthMask(false);
-                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-            }
+            additiveBlending = true;
+            glDepthMask(false);
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE);
         }
 
         glBindVertexArray(_vertexArrayObject);
diff --git a/openspace.cfg b/openspace.cfg
index 3a5e56d9e0..b1afa57fd7 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -236,7 +236,6 @@ GlobalRotation = { 0.0, 0.0, 0.0 }
 MasterRotation = { 0.0, 0.0, 0.0 }
 ScreenSpaceRotation = { 0.0, 0.0, 0.0 }
 
-RenderingMethod = "Framebuffer"
 OpenGLDebugContext = {
     Activate = true,
     FilterIdentifier = {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 23d6ff8de2..3d5ef003ca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -108,7 +108,6 @@ set(OPENSPACE_SOURCE
   ${OPENSPACE_BASE_DIR}/src/properties/vector/vec3property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/vector/vec4property.cpp
   ${OPENSPACE_BASE_DIR}/src/query/query.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/abufferrenderer.cpp
   ${OPENSPACE_BASE_DIR}/src/rendering/dashboard.cpp
   ${OPENSPACE_BASE_DIR}/src/rendering/dashboard_lua.inl
   ${OPENSPACE_BASE_DIR}/src/rendering/dashboarditem.cpp
@@ -284,7 +283,6 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec3property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec4property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/query/query.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/abufferrenderer.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboard.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboarditem.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboardtextitem.h
@@ -298,7 +296,6 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycasterlistener.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycastermanager.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderable.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderer.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderengine.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/texturecomponent.h
@@ -464,10 +461,6 @@ endif ()
 set_openspace_compile_settings(openspace-core)
 target_link_libraries(openspace-core PUBLIC Ghoul spice external-curl)
 
-if (OPENSPACE_WITH_ABUFFER_RENDERER)
-  target_compile_definitions(openspace-core PUBLIC "OPENSPACE_WITH_ABUFFER_RENDERER")
-endif ()
-
 # Just in case, create the bin directory
 add_custom_command(
   TARGET openspace-core
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 7194824f06..ad7b113f67 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -161,15 +161,6 @@ namespace {
         // resolution ('framebuffer'). This value defaults to 'window'
         std::optional<Scaling> onScreenTextScaling;
 
-        // List from RenderEngine::setRendererFromString
-        enum class RenderingMethod {
-            Framebuffer,
-            ABuffer
-        };
-        // The renderer that is use after startup. The renderer 'ABuffer' requires support
-        // for at least OpenGL 4.3
-        std::optional<RenderingMethod> renderingMethod;
-
         // Toggles whether the master in a multi-application setup should be rendering or
         // just managing the state of the network. This is desired in cases where the
         // master computer does not have the resources to render a scene
@@ -178,16 +169,16 @@ namespace {
         // Applies a global view rotation. Use this to rotate the position of the focus
         // node away from the default location on the screen. This setting persists even
         // when a new focus node is selected. Defined using roll, pitch, yaw in radians
-        std::optional<glm::dvec3> globalRotation;
+        std::optional<glm::vec3> globalRotation;
 
         // Applies a view rotation for only the master node, defined using roll, pitch yaw
         // in radians. This can be used to compensate the master view direction for tilted
         // display systems in clustered immersive environments
-        std::optional<glm::dvec3> masterRotation;
+        std::optional<glm::vec3> masterRotation;
 
         // Applies a global rotation for all screenspace renderables. Defined using roll,
         // pitch, yaw in radians
-        std::optional<glm::dvec3> screenSpaceRotation;
+        std::optional<glm::vec3> screenSpaceRotation;
 
         // If this value is set to 'true' the ingame console is disabled, locking the
         // system down against random access
@@ -415,18 +406,6 @@ void parseLuaState(Configuration& configuration) {
     c.globalRotation = p.globalRotation.value_or(c.globalRotation);
     c.masterRotation = p.masterRotation.value_or(c.masterRotation);
     c.screenSpaceRotation = p.screenSpaceRotation.value_or(c.screenSpaceRotation);
-    if (p.renderingMethod.has_value()) {
-        switch (*p.renderingMethod) {
-            case Parameters::RenderingMethod::Framebuffer:
-                c.renderingMethod = "Framebuffer";
-                break;
-            case Parameters::RenderingMethod::ABuffer:
-                c.renderingMethod = "ABuffer";
-                break;
-            default:
-                throw ghoul::MissingCaseException();
-        }
-    }
     c.isConsoleDisabled = p.disableInGameConsole.value_or(c.isConsoleDisabled);
     if (p.logging.has_value()) {
         if (p.logging->logLevel.has_value()) {
diff --git a/src/rendering/abufferrenderer.cpp b/src/rendering/abufferrenderer.cpp
deleted file mode 100644
index 4b4f4d4654..0000000000
--- a/src/rendering/abufferrenderer.cpp
+++ /dev/null
@@ -1,1062 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifdef OPENSPACE_WITH_ABUFFER_RENDERER
-
-#include <openspace/rendering/abufferrenderer.h>
-
-#include <openspace/engine/globals.h>
-#include <openspace/engine/windowdelegate.h>
-#include <openspace/performance/performancemanager.h>
-#include <openspace/performance/performancemeasurement.h>
-#include <openspace/rendering/raycastermanager.h>
-#include <openspace/rendering/renderengine.h>
-#include <openspace/rendering/renderable.h>
-#include <openspace/rendering/volumeraycaster.h>
-#include <openspace/rendering/deferredcaster.h>
-#include <openspace/scene/scene.h>
-#include <openspace/util/camera.h>
-#include <openspace/util/updatestructures.h>
-#include <openspace/util/timemanager.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/profiling.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/textureunit.h>
-
-namespace {
-    constexpr const char* _loggerCat = "ABufferRenderer";
-    constexpr const char* BoundsFragmentShaderPath =
-        "${SHADERS}/abuffer/boundsabuffer.frag";
-    constexpr const char* RenderFragmentShaderPath =
-        "${SHADERS}/abuffer/renderabuffer.frag";
-
-    constexpr int MaxRaycasters = 32;
-    constexpr int MaxLayers = 32;
-    constexpr int MaxAverageLayers = 8;
-} // namespace
-
-namespace openspace {
-
-void ABufferRenderer::initialize() {
-    LINFO("Initializing ABufferRenderer");
-    const GLfloat vertexData[] = {
-        // x     y
-        -1.f, -1.f,
-         1.f,  1.f,
-        -1.f,  1.f,
-        -1.f, -1.f,
-         1.f, -1.f,
-         1.f,  1.f,
-    };
-
-    glGenVertexArrays(1, &_screenQuad);
-    glBindVertexArray(_screenQuad);
-
-    glGenBuffers(1, &_vertexPositionBuffer);
-    glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
-
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 2, nullptr);
-    glEnableVertexAttribArray(0);
-
-    glGenTextures(1, &_anchorPointerTexture);
-    glGenBuffers(1, &_anchorPointerTextureInitializer);
-    glGenBuffers(1, &_atomicCounterBuffer);
-    glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, _atomicCounterBuffer);
-    glBufferData(GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint), nullptr, GL_DYNAMIC_COPY);
-    glGenBuffers(1, &_fragmentBuffer);
-    glGenTextures(1, &_fragmentTexture);
-
-    glGenTextures(1, &_mainColorTexture);
-    glGenTextures(1, &_mainDepthTexture);
-    glGenFramebuffers(1, &_mainFramebuffer);
-
-    GLint defaultFbo;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFbo);
-
-    updateResolution();
-    updateRendererData();
-    updateRaycastData();
-    updateResolveDictionary();
-    updateMSAASamplingPattern();
-
-    glBindFramebuffer(GL_FRAMEBUFFER, _mainFramebuffer);
-    glFramebufferTexture2D(
-        GL_FRAMEBUFFER,
-        GL_COLOR_ATTACHMENT0,
-        GL_TEXTURE_2D_MULTISAMPLE,
-        _mainColorTexture,
-        0
-    );
-    glFramebufferTexture2D(
-        GL_FRAMEBUFFER,
-        GL_DEPTH_ATTACHMENT,
-        GL_TEXTURE_2D_MULTISAMPLE,
-        _mainDepthTexture,
-        0
-    );
-
-    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    if (status != GL_FRAMEBUFFER_COMPLETE) {
-        LERROR("Main framebuffer is not complete");
-    }
-
-    glBindFramebuffer(GL_FRAMEBUFFER, defaultFbo);
-
-    try {
-        ghoul::Dictionary dict;
-        dict.setValue("resolveData", _resolveDictionary);
-        dict.setValue("rendererData", _rendererData);
-
-        _resolveProgram = ghoul::opengl::ProgramObject::Build(
-            "ABuffer Resolve",
-            absPath("${SHADERS}/abuffer/resolveabuffer.vert"),
-            absPath("${SHADERS}/abuffer/resolveabuffer.frag"),
-            dict
-        );
-    } catch (const ghoul::RuntimeError& e) {
-        LERRORC(e.component, e.message);
-    }
-
-    global::raycasterManager.addListener(*this);
-}
-
-void ABufferRenderer::deinitialize() {
-    LINFO("Deinitializing ABufferRenderer");
-    glDeleteBuffers(1, &_fragmentBuffer);
-    glDeleteTextures(1, &_fragmentTexture);
-
-    glDeleteTextures(1, &_anchorPointerTexture);
-    glDeleteBuffers(1, &_anchorPointerTextureInitializer);
-    glDeleteBuffers(1, &_atomicCounterBuffer);
-
-    glDeleteBuffers(1, &_vertexPositionBuffer);
-    glDeleteVertexArrays(1, &_screenQuad);
-
-    global::raycasterManager.removeListener(*this);
-}
-
-void ABufferRenderer::raycastersChanged(VolumeRaycaster&, IsAttached) {
-    _dirtyRaycastData = true;
-}
-
-void ABufferRenderer::update() {
-    PerfMeasure("ABufferRenderer::update");
-
-    // Make sure that the fragment buffer has the correct resoliution
-    // according to the output render buffer size
-    if (_dirtyResolution) {
-        updateResolution();
-        updateMSAASamplingPattern();
-    }
-
-    // Make sure that the renderengine gets the correct render data
-    // to feed into all render programs.
-    // This will trigger a recompilation of all the shader programs
-    // involved in rendering geometries.
-    if (_dirtyRendererData) {
-        updateRendererData();
-    }
-
-    // Make sure that all raycaster data is up to date.
-    if (_dirtyRaycastData) {
-        updateRaycastData();
-    }
-
-    // Make sure that the resolve dictionary is up to date.
-    // The resolve dictionary contains information for all
-    // ray casters, including shader include paths.
-
-    if (_dirtyResolveDictionary) {
-        updateResolveDictionary();
-        ghoul::Dictionary dict;
-        dict.setValue("resolveData", _resolveDictionary);
-        dict.setValue("rendererData", _rendererData);
-        _resolveProgram->setDictionary(dict);
-    }
-
-    // If the resolve dictionary changed (or a file changed on disk)
-    // then rebuild the resolve program.
-    if (_resolveProgram->isDirty()) {
-        try {
-            _resolveProgram->rebuildFromFile();
-        } catch (const ghoul::RuntimeError& error) {
-            LERRORC(error.component, error.message);
-        }
-    }
-    using K = VolumeRaycaster* const;
-    using V = std::unique_ptr<ghoul::opengl::ProgramObject>;
-    for (std::pair<K, V>& program : _boundsPrograms) {
-        if (program.second->isDirty()) {
-            try {
-                program.second->rebuildFromFile();
-            } catch (const ghoul::RuntimeError& e) {
-                LERRORC(e.component, e.message);
-            }
-        }
-    }
-}
-
-void ABufferRenderer::updateMSAASamplingPattern() {
-    // @CLEANUP(abock): This should probably be merged with the same code from the
-    //                  framebuffer renderer?
-    LINFO("Updating MSAA Sampling Pattern");
-
-    constexpr const int GridSize = 32;
-    GLfloat step = 2.f / static_cast<GLfloat>(GridSize);
-    GLfloat sizeX = -1.f;
-    GLfloat sizeY = 1.f;
-
-    constexpr const int NVertex = 4 * 6;
-    // openPixelSizeVertexData
-    GLfloat vertexData[GridSize * GridSize * NVertex];
-
-    for (int y = 0; y < GridSize; ++y) {
-        for (int x = 0; x < GridSize; ++x) {
-            vertexData[y * GridSize * NVertex + x * NVertex] = sizeX;
-            vertexData[y * GridSize * NVertex + x * NVertex + 1] = sizeY - step;
-            vertexData[y * GridSize * NVertex + x * NVertex + 2] = 0.f;
-            vertexData[y * GridSize * NVertex + x * NVertex + 3] = 1.f;
-
-            vertexData[y * GridSize * NVertex + x * NVertex + 4] = sizeX + step;
-            vertexData[y * GridSize * NVertex + x * NVertex + 5] = sizeY;
-            vertexData[y * GridSize * NVertex + x * NVertex + 6] = 0.f;
-            vertexData[y * GridSize * NVertex + x * NVertex + 7] = 1.f;
-
-            vertexData[y * GridSize * NVertex + x * NVertex + 8] = sizeX;
-            vertexData[y * GridSize * NVertex + x * NVertex + 9] = sizeY;
-            vertexData[y * GridSize * NVertex + x * NVertex + 10] = 0.f;
-            vertexData[y * GridSize * NVertex + x * NVertex + 11] = 1.f;
-
-            vertexData[y * GridSize * NVertex + x * NVertex + 12] = sizeX;
-            vertexData[y * GridSize * NVertex + x * NVertex + 13] = sizeY - step;
-            vertexData[y * GridSize * NVertex + x * NVertex + 14] = 0.f;
-            vertexData[y * GridSize * NVertex + x * NVertex + 15] = 1.f;
-
-            vertexData[y * GridSize * NVertex + x * NVertex + 16] = sizeX + step;
-            vertexData[y * GridSize * NVertex + x * NVertex + 17] = sizeY - step;
-            vertexData[y * GridSize * NVertex + x * NVertex + 18] = 0.f;
-            vertexData[y * GridSize * NVertex + x * NVertex + 19] = 1.f;
-
-            vertexData[y * GridSize * NVertex + x * NVertex + 20] = sizeX + step;
-            vertexData[y * GridSize * NVertex + x * NVertex + 21] = sizeY;
-            vertexData[y * GridSize * NVertex + x * NVertex + 22] = 0.f;
-            vertexData[y * GridSize * NVertex + x * NVertex + 23] = 1.f;
-
-            sizeX += step;
-        }
-        sizeX = -1.f;
-        sizeY -= step;
-    }
-
-    GLuint pixelSizeQuadVAO = 0;
-    glGenVertexArrays(1, &pixelSizeQuadVAO);
-    glBindVertexArray(pixelSizeQuadVAO);
-
-    GLuint pixelSizeQuadVBO = 0;
-    glGenBuffers(1, &pixelSizeQuadVBO);
-    glBindBuffer(GL_ARRAY_BUFFER, pixelSizeQuadVBO);
-
-    glBufferData(
-        GL_ARRAY_BUFFER,
-        sizeof(GLfloat) * GridSize * GridSize * NVertex,
-        vertexData,
-        GL_STATIC_DRAW
-    );
-
-    // Position
-    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, nullptr);
-    glEnableVertexAttribArray(0);
-
-    // Saves current state
-    GLint defaultFbo;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFbo);
-    GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT, viewport);
-
-    // Main framebuffer
-
-    GLuint pixelSizeTexture = 0;
-    glGenTextures(1, &pixelSizeTexture);
-    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, pixelSizeTexture);
-
-    constexpr const GLsizei OnePixel = 1;
-    glTexImage2DMultisample(
-        GL_TEXTURE_2D_MULTISAMPLE,
-        _nAaSamples,
-        GL_RGBA32F,
-        OnePixel,
-        OnePixel,
-        true
-    );
-
-    glViewport(0, 0, OnePixel, OnePixel);
-
-    GLuint pixelSizeFramebuffer = 0;
-    glGenFramebuffers(1, &pixelSizeFramebuffer);
-    glBindFramebuffer(GL_FRAMEBUFFER, pixelSizeFramebuffer);
-    glFramebufferTexture2D(
-        GL_FRAMEBUFFER,
-        GL_COLOR_ATTACHMENT0,
-        GL_TEXTURE_2D_MULTISAMPLE,
-        pixelSizeTexture,
-        0
-    );
-
-    GLenum textureBuffers[1] = { GL_COLOR_ATTACHMENT0 };
-    glDrawBuffers(1, textureBuffers);
-
-    glClearColor(0.f, 0.f, 0.f, 1.f);
-    glClear(GL_COLOR_BUFFER_BIT);
-
-    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    if (status != GL_FRAMEBUFFER_COMPLETE) {
-        LERROR("MSAA Sampling pattern framebuffer is not complete");
-        return;
-    }
-
-    std::unique_ptr<ghoul::opengl::ProgramObject> pixelSizeProgram =
-        ghoul::opengl::ProgramObject::Build(
-            "OnePixel MSAA",
-            absPath("${SHADERS}/framebuffer/pixelSizeMSAA.vert"),
-            absPath("${SHADERS}/framebuffer/pixelSizeMSAA.frag")
-        );
-
-    pixelSizeProgram->activate();
-
-    // Draw sub-pixel grid
-    glEnable(GL_SAMPLE_SHADING);
-    glBindVertexArray(pixelSizeQuadVAO);
-    glDisable(GL_DEPTH_TEST);
-    glDepthMask(false);
-    glDrawArrays(GL_TRIANGLES, 0, GridSize * GridSize * 6);
-    glBindVertexArray(0);
-    glDepthMask(true);
-    glEnable(GL_DEPTH_TEST);
-    glDisable(GL_SAMPLE_SHADING);
-
-    pixelSizeProgram->deactivate();
-
-    // Now we render the Nx1 quad strip
-    GLuint nOneStripFramebuffer = 0;
-    GLuint nOneStripVAO = 0;
-    GLuint nOneStripVBO = 0;
-    GLuint nOneStripTexture = 0;
-
-    sizeX = -1.f;
-    step = 2.f / static_cast<GLfloat>(_nAaSamples);
-
-    std::vector<GLfloat> nOneStripVertexData(_nAaSamples * (NVertex + 12));
-
-    for (int x = 0; x < _nAaSamples; ++x) {
-        nOneStripVertexData[x * (NVertex + 12)] = sizeX;
-        nOneStripVertexData[x * (NVertex + 12) + 1] = -1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 2] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 3] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 4] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 5] = 0.f;
-
-        nOneStripVertexData[x * (NVertex + 12) + 6] = sizeX + step;
-        nOneStripVertexData[x * (NVertex + 12) + 7] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 8] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 9] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 10] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 11] = 1.f;
-
-        nOneStripVertexData[x * (NVertex + 12) + 12] = sizeX;
-        nOneStripVertexData[x * (NVertex + 12) + 13] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 14] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 15] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 16] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 17] = 0.f;
-
-        nOneStripVertexData[x * (NVertex + 12) + 18] = sizeX;
-        nOneStripVertexData[x * (NVertex + 12) + 19] = -1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 20] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 21] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 22] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 23] = 0.f;
-
-        nOneStripVertexData[x * (NVertex + 12) + 24] = sizeX + step;
-        nOneStripVertexData[x * (NVertex + 12) + 25] = -1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 26] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 27] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 28] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 29] = 1.f;
-
-        nOneStripVertexData[x * (NVertex + 12) + 30] = sizeX + step;
-        nOneStripVertexData[x * (NVertex + 12) + 31] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 32] = 0.f;
-        nOneStripVertexData[x * (NVertex + 12) + 33] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 34] = 1.f;
-        nOneStripVertexData[x * (NVertex + 12) + 35] = 1.f;
-
-        sizeX += step;
-    }
-
-    glGenVertexArrays(1, &nOneStripVAO);
-    glBindVertexArray(nOneStripVAO);
-    glGenBuffers(1, &nOneStripVBO);
-    glBindBuffer(GL_ARRAY_BUFFER, nOneStripVBO);
-    glBufferData(
-        GL_ARRAY_BUFFER,
-        sizeof(GLfloat) * _nAaSamples * (NVertex + 12),
-        nOneStripVertexData.data(),
-        GL_STATIC_DRAW
-    );
-
-    // position
-    glVertexAttribPointer(
-        0,
-        4,
-        GL_FLOAT,
-        GL_FALSE,
-        sizeof(GLfloat) * 6,
-        nullptr
-    );
-    glEnableVertexAttribArray(0);
-
-    // texture coords
-    glVertexAttribPointer(
-        1,
-        2,
-        GL_FLOAT,
-        GL_FALSE,
-        sizeof(GLfloat) * 6,
-        reinterpret_cast<GLvoid*>(sizeof(GLfloat) * 4)
-    );
-    glEnableVertexAttribArray(1);
-
-    // fbo texture buffer
-    glGenTextures(1, &nOneStripTexture);
-    glBindTexture(GL_TEXTURE_2D, nOneStripTexture);
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_RGBA32F,
-        _nAaSamples,
-        OnePixel,
-        0,
-        GL_RGBA,
-        GL_FLOAT,
-        nullptr
-    );
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-    glGenFramebuffers(1, &nOneStripFramebuffer);
-    glBindFramebuffer(GL_FRAMEBUFFER, nOneStripFramebuffer);
-    glFramebufferTexture2D(
-        GL_FRAMEBUFFER,
-        GL_COLOR_ATTACHMENT0,
-        GL_TEXTURE_2D,
-        nOneStripTexture,
-        0
-    );
-
-    status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    if (status != GL_FRAMEBUFFER_COMPLETE) {
-        LERROR("nOneStrip framebuffer is not complete");
-    }
-
-    glViewport(0, 0, _nAaSamples, OnePixel);
-
-    std::unique_ptr<ghoul::opengl::ProgramObject> nOneStripProgram =
-        ghoul::opengl::ProgramObject::Build(
-            "OneStrip MSAA",
-            absPath("${SHADERS}/framebuffer/nOneStripMSAA.vert"),
-            absPath("${SHADERS}/framebuffer/nOneStripMSAA.frag")
-        );
-
-    nOneStripProgram->activate();
-
-    ghoul::opengl::TextureUnit pixelSizeTextureUnit;
-    pixelSizeTextureUnit.activate();
-    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, pixelSizeTexture);
-    nOneStripProgram->setUniform("pixelSizeTexture", pixelSizeTextureUnit);
-
-    // render strip
-    glDrawBuffers(1, textureBuffers);
-
-    glClearColor(0.f, 1.f, 0.f, 1.f);
-    glClear(GL_COLOR_BUFFER_BIT);
-    glBindVertexArray(nOneStripVAO);
-    glDisable(GL_DEPTH_TEST);
-    glDepthMask(false);
-    for (int sample = 0; sample < _nAaSamples; ++sample) {
-        nOneStripProgram->setUniform("currentSample", sample);
-        glDrawArrays(GL_TRIANGLES, sample * 6, 6);
-    }
-    /*nOneStripProgram->setUniform("currentSample", 0);
-    glDrawArrays(GL_TRIANGLES, 0, 6 * _nAaSamples);*/
-    glDepthMask(true);
-    glEnable(GL_DEPTH_TEST);
-    glBindVertexArray(0);
-
-    saveTextureToMemory(GL_COLOR_ATTACHMENT0, _nAaSamples, 1, _mSAAPattern);
-    // Convert back to [-1, 1] range and then scales to the current viewport size:
-    for (int d = 0; d < _nAaSamples; ++d) {
-        _mSAAPattern[d * 3] = (2.0 * _mSAAPattern[d * 3] - 1.0) /
-                              static_cast<double>(viewport[2]);
-        _mSAAPattern[(d * 3) + 1] = (2.0 * _mSAAPattern[(d * 3) + 1] - 1.0) /
-                                    static_cast<double>(viewport[3]);
-        _mSAAPattern[(d * 3) + 2] = 0.0;
-    }
-
-    nOneStripProgram->deactivate();
-
-    // Restores default state
-    glBindFramebuffer(GL_FRAMEBUFFER, defaultFbo);
-    glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
-
-    // Deletes unused buffers
-    glDeleteFramebuffers(1, &pixelSizeFramebuffer);
-    glDeleteTextures(1, &pixelSizeTexture);
-    glDeleteBuffers(1, &pixelSizeQuadVBO);
-    glDeleteVertexArrays(1, &pixelSizeQuadVAO);
-
-    glDeleteFramebuffers(1, &nOneStripFramebuffer);
-    glDeleteTextures(1, &nOneStripTexture);
-    glDeleteBuffers(1, &nOneStripVBO);
-    glDeleteVertexArrays(1, &nOneStripVAO);
-}
-
-void ABufferRenderer::render(Scene* scene, Camera* camera, float blackoutFactor) {
-    ZoneScoped
-
-    const bool doPerformanceMeasurements = global::performanceManager.isEnabled();
-
-    PerfMeasure("ABufferRenderer::render");
-
-    if (!scene || !camera) {
-        return;
-    }
-
-    ghoul::opengl::TextureUnit mainColorTextureUnit;
-    mainColorTextureUnit.activate();
-    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _mainColorTexture);
-
-    ghoul::opengl::TextureUnit mainDepthTextureUnit;
-    mainDepthTextureUnit.activate();
-    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _mainDepthTexture);
-
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    GLint defaultFbo;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFbo);
-    glBindFramebuffer(GL_FRAMEBUFFER, _mainFramebuffer);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    // Reset
-    clear();
-    glEnable(GL_DEPTH_TEST);
-    glEnable(GL_BLEND);
-
-    // Step 1: Render geometries to the fragment buffer
-
-    // Bind head-pointer image for read-write
-    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, _atomicCounterBuffer);
-    glBindImageTexture(0, _anchorPointerTexture, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R32UI);
-    glBindImageTexture(1, _fragmentTexture, 0, GL_FALSE, 0, GL_READ_WRITE, GL_RGBA32UI);
-
-    // Render the scene to the fragment buffer. Collect renderer tasks (active raycasters)
-    int renderBinMask = static_cast<int>(Renderable::RenderBin::Background) |
-        static_cast<int>(Renderable::RenderBin::Opaque) |
-        static_cast<int>(Renderable::RenderBin::PreDeferredTransparent) |
-        static_cast<int>(Renderable::RenderBin::PostDeferredTransparent) |
-        static_cast<int>(Renderable::RenderBin::Overlay);
-
-    Time time = global::timeManager.time();
-    RenderData data{ *camera, psc(), time, doPerformanceMeasurements, renderBinMask, {} };
-    RendererTasks tasks;
-    scene->render(data, tasks);
-    _blackoutFactor = blackoutFactor;
-
-    glBindFramebuffer(GL_FRAMEBUFFER, defaultFbo);
-
-
-    // Step 2: Perform raycasting tasks requested by the scene
-    for (const RaycasterTask& raycasterTask : tasks.raycasterTasks) {
-        VolumeRaycaster* raycaster = raycasterTask.raycaster;
-        ghoul::opengl::ProgramObject* program = _boundsPrograms[raycaster].get();
-        if (program) {
-            program->activate();
-            program->setUniform("_exit_", false);
-            raycaster->renderEntryPoints(raycasterTask.renderData, *program);
-            program->setUniform("_exit_", true);
-            raycaster->renderExitPoints(raycasterTask.renderData, *program);
-            program->deactivate();
-        }
-        else {
-            LWARNING("Raycaster is not attached when trying to perform raycaster task");
-        }
-    }
-
-
-    // Step 3: Resolve the buffer
-    _resolveProgram->activate();
-
-    // TEMPORARY GAMMA CORRECTION.
-
-    glm::vec3 cameraPos = data.camera.position().vec3();
-    float maxComponent = std::max(
-        std::max(std::abs(cameraPos.x), std::abs(cameraPos.y)), std::abs(cameraPos.z)
-    );
-    float logDistance = std::log(glm::length(cameraPos / maxComponent) * maxComponent)
-        / std::log(10.f);
-
-    const float minLogDist = 15.f;
-    const float maxLogDist = 20.f;
-
-    float t = (logDistance - minLogDist) / (maxLogDist - minLogDist);
-    t = glm::clamp(t, 0.0f, 1.0f);
-    const float gamma = 1.f * (1.f - t) + 2.2f * t;
-
-    _resolveProgram->setUniform("gamma", gamma);
-
-    // END TEMPORARY GAMMA CORRECTION.
-
-    _resolveProgram->setUniform("mainColorTexture", mainColorTextureUnit.unitNumber());
-    _resolveProgram->setUniform("mainDepthTexture", mainDepthTextureUnit.unitNumber());
-    _resolveProgram->setUniform("blackoutFactor", _blackoutFactor);
-    _resolveProgram->setUniform("nAaSamples", _nAaSamples);
-
-    for (const RaycasterTask& raycasterTask : tasks.raycasterTasks) {
-        preRaycast(raycasterTask);
-    }
-
-    glBindVertexArray(_screenQuad);
-    glDrawArrays(GL_TRIANGLES, 0, 6);
-
-    for (const RaycasterTask& raycasterTask : tasks.raycasterTasks) {
-        postRaycast(raycasterTask);
-    }
-
-    _resolveProgram->deactivate();
-}
-
-void ABufferRenderer::preRaycast(const RaycasterTask& raycasterTask) {
-    VolumeRaycaster& raycaster = *raycasterTask.raycaster;
-    const RaycastData& raycastData = _raycastData[&raycaster];
-    const RenderData& renderData = raycasterTask.renderData;
-
-    raycaster.preRaycast(raycastData, *_resolveProgram);
-
-    glm::vec3 localCameraPosition;
-    bool isCameraInside = raycaster.isCameraInside(renderData, localCameraPosition);
-    int uniformIndex = raycastData.id + 1; // uniforms are indexed from 1 (not from 0)
-    _resolveProgram->setUniform(
-        "insideRaycaster" + std::to_string(uniformIndex),
-        isCameraInside
-    );
-    if (isCameraInside) {
-        _resolveProgram->setUniform(
-            "cameraPosInRaycaster" + std::to_string(uniformIndex),
-            localCameraPosition
-        );
-    }
-}
-
-void ABufferRenderer::postRaycast(const RaycasterTask& raycasterTask) {
-    VolumeRaycaster& raycaster = *raycasterTask.raycaster;
-    const RaycastData& raycastData = _raycastData[&raycaster];
-
-    raycaster.postRaycast(raycastData, *_resolveProgram);
-}
-
-void ABufferRenderer::setResolution(glm::ivec2 res) {
-    if (res != _resolution) {
-        _resolution = std::move(res);
-        _dirtyResolution = true;
-    }
-}
-
-void ABufferRenderer::setNAaSamples(int nAaSamples) {
-    _nAaSamples = nAaSamples;
-    if (_nAaSamples == 0) {
-        _nAaSamples = 1;
-    }
-    if (_nAaSamples > 8) {
-        LERROR("Framebuffer renderer does not support more than 8 MSAA samples.");
-        _nAaSamples = 8;
-    }
-    _dirtyResolution = true;
-}
-
-void ABufferRenderer::setBlurrinessLevel(int level) {
-    ghoul_assert(
-        level > 0 && nAaSamples < 4,
-        "Blurriness level has to be between 1 and 3"
-    );
-    _blurrinessLevel = level;
-}
-
-void ABufferRenderer::setHDRExposure(float hdrExposure) {
-    _hdrExposure = hdrExposure;
-    if (_hdrExposure < 0.f) {
-        LERROR("HDR Exposure constant must be greater than zero.");
-        _hdrExposure = 1.0;
-    }
-}
-
-void ABufferRenderer::setGamma(float gamma) {
-    _gamma = gamma;
-    if (_gamma < 0.f) {
-        LERROR("Gamma value must be greater than zero.");
-        _gamma = 2.2f;
-    }
-}
-
-void ABufferRenderer::setMaxWhite(float maxWhite) {
-    _maxWhite = maxWhite;
-}
-
-void ABufferRenderer::setToneMapOperator(int tmOp) {
-    _toneMapOperator = tmpOp;
-};
-
-void ABufferRenderer::setToneMapOperator(int tmOp) {
-    _toneMapOperator = tmOp;
-}
-
-void ABufferRenderer::setBloomThreMin(float minV) {
-    _bloomThresholdMin = minV;
-}
-
-void ABufferRenderer::setBloomThreMax(float maxV) {
-    _bloomThresholdMax = maxV;
-}
-
-void ABufferRenderer::setBloomOrigFactor(float origFactor) {
-    _bloomOrigFactor = origFactor;
-}
-
-void ABufferRenderer::setBloomNewFactor(float newFactor) {
-    _bloomNewFactor = newFactor;
-}
-
-void ABufferRenderer::setKey(float key) {
-    _tmoKey = key;
-}
-
-void ABufferRenderer::setYwhite(float white) {
-    _tmoYwhite = white;
-}
-
-void ABufferRenderer::setTmoSaturation(float sat) {
-    _tmoSaturation = sat;
-}
-
-void ABufferRenderer::setHue(float hue) {
-    _hue = hue;
-}
-
-void ABufferRenderer::setValue(float value) {
-    _value = value;
-}
-
-void ABufferRenderer::setSaturation(float sat) {
-    _saturation = sat;
-}
-
-void ABufferRenderer::setLightness(float lightness) {
-    _lightness = lightness;
-}
-
-void ABufferRenderer::setColorSpace(unsigned int colorspace) {
-    _colorSpace = colorspace;
-}
-
-void ABufferRenderer::enableBloom(bool enable) {
-    _bloomEnabled = enable;
-}
-
-void ABufferRenderer::enableHistogram(bool enable) {
-    _histogramEnabled = enable;
-}
-
-int ABufferRenderer::nAaSamples() const {
-    return _nAaSamples;
-}
-
-const std::vector<double>& ABufferRenderer::mSSAPattern() const {
-    return _mSAAPattern;
-}
-
-void ABufferRenderer::clear() {
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _anchorPointerTextureInitializer);
-    glBindTexture(GL_TEXTURE_2D, _anchorPointerTexture);
-
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_R32UI,
-        _resolution.x,
-        _resolution.y,
-        0,
-        GL_RED_INTEGER,
-        GL_UNSIGNED_INT,
-        nullptr
-    );
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-
-    static const GLuint zero = 1;
-    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, _atomicCounterBuffer);
-    glBufferSubData(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(zero), &zero);
-    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, 0);
-}
-
-void ABufferRenderer::updateResolution() {
-    PerfMeasure("ABufferRenderer::updateResolution");
-
-    int totalPixels = _resolution.x * _resolution.y;
-    glBindTexture(GL_TEXTURE_2D, _anchorPointerTexture);
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_R32UI,
-        _resolution.x,
-        _resolution.y,
-        0,
-        GL_RED_INTEGER,
-        GL_UNSIGNED_INT,
-        nullptr
-    );
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _anchorPointerTextureInitializer);
-    glBufferData(
-        GL_PIXEL_UNPACK_BUFFER,
-        totalPixels * sizeof(GLuint),
-        nullptr,
-        GL_STATIC_DRAW
-    );
-
-    GLuint* data = reinterpret_cast<GLuint*>(
-        glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY)
-    );
-    memset(data, 0x00, totalPixels * sizeof(GLuint));
-    glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-
-    glBindBuffer(GL_TEXTURE_BUFFER, _fragmentBuffer);
-    glBufferData(
-        GL_TEXTURE_BUFFER,
-        MaxAverageLayers*totalPixels * sizeof(GLuint) * 4,
-        nullptr,
-        GL_DYNAMIC_COPY
-    );
-
-    glBindTexture(GL_TEXTURE_BUFFER, _fragmentTexture);
-    glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA32UI, _fragmentBuffer);
-    glBindTexture(GL_TEXTURE_BUFFER, 0);
-
-    glBindImageTexture(1, _fragmentTexture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA32UI);
-
-    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _mainColorTexture);
-
-    glTexImage2DMultisample(
-        GL_TEXTURE_2D_MULTISAMPLE,
-        _nAaSamples,
-        GL_RGBA,
-        _resolution.x,
-        _resolution.y,
-        true
-    );
-
-    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _mainDepthTexture);
-    glTexImage2DMultisample(
-        GL_TEXTURE_2D_MULTISAMPLE,
-        _nAaSamples,
-        GL_DEPTH_COMPONENT32F,
-        _resolution.x,
-        _resolution.y,
-        true
-    );
-
-    _dirtyResolution = false;
-}
-
-void ABufferRenderer::updateResolveDictionary() {
-    ghoul::Dictionary dict;
-    ghoul::Dictionary raycastersDict;
-
-    for (const std::pair<VolumeRaycaster*, RaycastData>& raycastPair : _raycastData) {
-        ghoul::Dictionary innerDict;
-        int id = raycastPair.second.id;
-        std::string namespaceName = raycastPair.second.namespaceName;
-        std::string raycastPath = raycastPair.first->raycasterPath();
-
-        innerDict.setValue("id", id);
-        innerDict.setValue("namespace", namespaceName);
-        innerDict.setValue("bitmask", 1 << id);
-        innerDict.setValue("raycastPath", raycastPath);
-
-        raycastersDict.setValue(std::to_string(id), innerDict);
-    }
-
-    dict.setValue("raycasters", raycastersDict);
-
-    ghoul::Dictionary helperPathsDict;
-    for (size_t i = 0; i < _helperPaths.size(); ++i) {
-        helperPathsDict.setValue(std::to_string(i), _helperPaths[i]);
-    }
-
-    dict.setValue("helperPaths", helperPathsDict);
-    dict.setValue("raycastingEnabled", !_raycastData.empty());
-    dict.setValue("storeSorted", true);
-    dict.setValue("nRaycasters", static_cast<unsigned long long>(_raycastData.size()));
-
-    _resolveDictionary = dict;
-
-    global::renderEngine.setResolveData(dict);
-
-    _dirtyResolveDictionary = false;
-}
-
-void ABufferRenderer::updateRaycastData() {
-    PerfMeasure("ABufferRenderer::updateRaycastData");
-
-    _raycastData.clear();
-    _boundsPrograms.clear();
-    _helperPaths.clear();
-
-    const std::vector<VolumeRaycaster*>& raycasters =
-        global::raycasterManager.raycasters();
-
-    std::map<std::string, int> namespaceIndices;
-    // raycaster ids are positive integers starting at 0. (for raycasters,
-    // fragment type is id+1)
-    int nextId = 0;
-    int nextNamespaceIndex = 0;
-
-    for (VolumeRaycaster* raycaster : raycasters) {
-        if (nextId > MaxRaycasters) {
-            int nIgnored = MaxRaycasters - static_cast<int>(raycasters.size());
-            LWARNING(fmt::format(
-                "ABufferRenderer does not support more than 32 raycasters. "
-                "Ignoring {} raycasters",
-                nIgnored
-            ));
-            break;
-        }
-
-        RaycastData data;
-        data.id = nextId++;
-
-        std::string helperPath = raycaster->helperPath();
-        // Each new helper path generates a new namespace,
-        // to avoid glsl name collisions between raycaster implementaitons.
-        // Assign a new namespace or find an already created index.
-
-        if (helperPath.empty()) {
-            data.namespaceName = "NAMESPACE_" + std::to_string(nextNamespaceIndex++);
-        }
-        else {
-            auto iter = namespaceIndices.find(helperPath);
-            if (iter == namespaceIndices.end()) {
-                int namespaceIndex = nextNamespaceIndex++;
-                data.namespaceName = std::to_string(namespaceIndex);
-                namespaceIndices[helperPath] = namespaceIndex;
-                _helperPaths.push_back(helperPath);
-            }
-            else {
-                data.namespaceName = "NAMESPACE_" + std::to_string(iter->second);
-            }
-        }
-
-        _raycastData[raycaster] = data;
-        std::string vsPath = raycaster->boundsVertexShaderPath();
-        std::string fsPath = raycaster->boundsFragmentShaderPath();
-        ghoul::Dictionary dict;
-
-        // set path to the current renderer's main fragment shader
-        dict.setValue("rendererData", _rendererData);
-        // parameterize the main fragment shader program with specific contents.
-        // fsPath should point to a shader file defining a Fragment getFragment() function
-        // instead of a void main() setting glFragColor, glFragDepth, etc.
-        dict.setValue("fragmentPath", fsPath);
-        dict.setValue("fragmentType", data.id + 1);
-        try {
-            _boundsPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
-                "Volume " + std::to_string(data.id) + " bounds",
-                vsPath,
-                BoundsFragmentShaderPath,
-                dict
-            );
-        }
-        catch (ghoul::RuntimeError& error) {
-            LERRORC(error.component, error.message);
-        }
-    }
-
-    _dirtyRaycastData = false;
-    _dirtyResolveDictionary = true;
-}
-
-void ABufferRenderer::updateRendererData() {
-    PerfMeasure("ABufferRenderer::updateRendererData");
-
-    ghoul::Dictionary dict;
-    dict.setValue("fragmentRendererPath", std::string(RenderFragmentShaderPath));
-    dict.setValue("maxLayers", MaxLayers);
-    dict.setValue("maxTotalFragments", MaxLayers * _resolution.x * _resolution.y);
-
-    _rendererData = dict;
-
-    global::renderEngine.setRendererData(dict);
-    _dirtyRendererData = false;
-}
-
-void ABufferRenderer::saveTextureToMemory(GLenum color_buffer_attachment, int width,
-                                          int height, std::vector<double>& memory) const
-{
-    memory.clear();
-
-    memory.reserve(width * height * 3);
-    std::vector<float> tmpMemory(width * height * 3);
-
-    if (color_buffer_attachment != GL_DEPTH_ATTACHMENT) {
-        glReadBuffer(color_buffer_attachment);
-        glReadPixels(0, 0, width, height, GL_RGB, GL_FLOAT, tmpMemory.data());
-
-    }
-    else {
-        glReadPixels(0, 0, width, height, GL_DEPTH_COMPONENT, GL_FLOAT, tmpMemory.data());
-    }
-
-    for (int i = 0; i < width * height * 3; ++i) {
-        memory[i] = static_cast<double>(tmpMemory[i]);
-    }
-}
-
-} // namespace openspace
-
-#else
-int _StubToPreventLinkerWarningAboutMissingExportSymbols;
-#endif // OPENSPACE_WITH_ABUFFER_RENDERER
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 21d63a2c28..a61e71fd9e 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -32,7 +32,6 @@
 #include <openspace/interaction/navigationhandler.h>
 #include <openspace/interaction/orbitalnavigator.h>
 #include <openspace/mission/missionmanager.h>
-#include <openspace/rendering/abufferrenderer.h>
 #include <openspace/rendering/dashboard.h>
 #include <openspace/rendering/deferredcastermanager.h>
 #include <openspace/rendering/helper.h>
@@ -302,57 +301,27 @@ RenderEngine::RenderEngine()
     addProperty(_showVersionInfo);
     addProperty(_showCameraInfo);
 
-    _enableFXAA.onChange([this]() {
-        if (_renderer) {
-            _renderer->enableFXAA(_enableFXAA);
-        }
-        });
+    _enableFXAA.onChange([this]() { _renderer.enableFXAA(_enableFXAA); });
     addProperty(_enableFXAA);
 
     _disableHDRPipeline.onChange([this]() {
-        if (_renderer) {
-            _renderer->setDisableHDR(_disableHDRPipeline);
-        }
+        _renderer.setDisableHDR(_disableHDRPipeline);
     });
     addProperty(_disableHDRPipeline);
 
-    _hdrExposure.onChange([this]() {
-        if (_renderer) {
-            _renderer->setHDRExposure(_hdrExposure);
-        }
-    });
+    _hdrExposure.onChange([this]() { _renderer.setHDRExposure(_hdrExposure); });
     addProperty(_hdrExposure);
 
-    _gamma.onChange([this]() {
-        if (_renderer) {
-            _renderer->setGamma(_gamma);
-        }
-    });
+    _gamma.onChange([this]() { _renderer.setGamma(_gamma); });
     addProperty(_gamma);
 
-    _hue.onChange([this]() {
-        if (_renderer) {
-            const float h = _hue / 360.f;
-            _renderer->setHue(h);
-        }
-    });
-
+    _hue.onChange([this]() { _renderer.setHue(_hue / 360.f); });
     addProperty(_hue);
 
-    _saturation.onChange([this]() {
-        if (_renderer) {
-            _renderer->setSaturation(_saturation);
-        }
-    });
-
+    _saturation.onChange([this]() { _renderer.setSaturation(_saturation); });
     addProperty(_saturation);
 
-    _value.onChange([this]() {
-        if (_renderer) {
-            _renderer->setValue(_value);
-        }
-    });
-
+    _value.onChange([this]() { _renderer.setValue(_value); });
     addProperty(_value);
 
     addProperty(_globalBlackOutFactor);
@@ -414,39 +383,16 @@ RenderEngine::RenderEngine()
 
 RenderEngine::~RenderEngine() {} // NOLINT
 
-void RenderEngine::setRendererFromString(const std::string& renderingMethod) {
-    ZoneScoped
-
-    _rendererImplementation = rendererFromString(renderingMethod);
-
-    std::unique_ptr<Renderer> newRenderer = nullptr;
-    switch (_rendererImplementation) {
-        case RendererImplementation::Framebuffer:
-            newRenderer = std::make_unique<FramebufferRenderer>();
-            break;
-        case RendererImplementation::ABuffer:
-#ifdef OPENSPACE_WITH_ABUFFER_RENDERER
-            newRenderer = std::make_unique<ABufferRenderer>();
-#endif // OPENSPACE_WITH_ABUFFER_RENDERER
-            break;
-        case RendererImplementation::Invalid:
-            LFATAL(fmt::format("Rendering method '{}' not available", renderingMethod));
-            return;
-    }
-
-    setRenderer(std::move(newRenderer));
-}
-
 void RenderEngine::initialize() {
     ZoneScoped
 
     // We have to perform these initializations here as the OsEng has not been initialized
     // in our constructor
-    _globalRotation = static_cast<glm::vec3>(global::configuration->globalRotation);
-    _screenSpaceRotation =
-        static_cast<glm::vec3>(global::configuration->screenSpaceRotation);
-    _masterRotation = static_cast<glm::vec3>(global::configuration->masterRotation);
+    _globalRotation = global::configuration->globalRotation;
+    _screenSpaceRotation = global::configuration->screenSpaceRotation;
+    _masterRotation = global::configuration->masterRotation;
     _disableMasterRendering = global::configuration->isRenderingOnMasterDisabled;
+    _screenshotUseDate = global::configuration->shouldUseScreenshotDate;
 
 #ifdef GHOUL_USE_DEVIL
     ghoul::io::TextureReader::ref().addReader(
@@ -499,8 +445,6 @@ void RenderEngine::initialize() {
             );
         }
     }
-
-    _screenshotUseDate = global::configuration->shouldUseScreenshotDate;
 }
 
 void RenderEngine::initializeGL() {
@@ -508,21 +452,10 @@ void RenderEngine::initializeGL() {
 
     LTRACE("RenderEngine::initializeGL(begin)");
 
-    std::string renderingMethod = global::configuration->renderingMethod;
-    if (renderingMethod == "ABuffer") {
-        using Version = ghoul::systemcapabilities::Version;
-
-        // The default rendering method has a requirement of OpenGL 4.3, so if we are
-        // below that, we will fall back to frame buffer operation
-        if (OpenGLCap.openGLVersion() < Version{ 4,3,0 }) {
-            LINFO("Falling back to framebuffer implementation due to OpenGL limitations");
-            renderingMethod = "Framebuffer";
-        }
-    }
-
-    LINFO(fmt::format("Setting renderer from string: {}", renderingMethod));
-    setRendererFromString(renderingMethod);
-
+    _renderer.setResolution(renderingResolution());
+    _renderer.enableFXAA(_enableFXAA);
+    _renderer.setHDRExposure(_hdrExposure);
+    _renderer.initialize();
 
     // set the close clip plane and the far clip plane to extreme values while in
     // development
@@ -532,45 +465,15 @@ void RenderEngine::initializeGL() {
     // initialized window
     _horizFieldOfView = static_cast<float>(global::windowDelegate->getHorizFieldOfView());
 
+    configuration::Configuration::FontSizes fontSize = global::configuration->fontSize;
     {
-        ZoneScopedN("Font: FrameInfo")
-        TracyGpuZone("Font: FrameInfo")
-        _fontFrameInfo = global::fontManager->font(
-            KeyFontMono,
-            global::configuration->fontSize.frameInfo
-        );
-    }
-    {
-        ZoneScopedN("Font: Shutdown")
-        TracyGpuZone("Font: Shutdown")
-        _fontShutdown = global::fontManager->font(
-            KeyFontMono,
-            global::configuration->fontSize.shutdown
-        );
-    }
-    {
-        ZoneScopedN("Font: CameraInfo")
-        TracyGpuZone("Font: CameraInfo")
-        _fontCameraInfo = global::fontManager->font(
-            KeyFontMono,
-            global::configuration->fontSize.cameraInfo
-        );
-    }
-    {
-        ZoneScopedN("Font: VersionInfo")
-        TracyGpuZone("Font: VersionInfo")
-        _fontVersionInfo = global::fontManager->font(
-            KeyFontMono,
-            global::configuration->fontSize.versionInfo
-        );
-    }
-    {
-        ZoneScopedN("Font: Log")
-        TracyGpuZone("Font: Log")
-        _fontLog = global::fontManager->font(
-            KeyFontLight,
-            global::configuration->fontSize.log
-        );
+        ZoneScopedN("Fonts")
+        TracyGpuZone("Fonts")
+        _fontFrameInfo = global::fontManager->font(KeyFontMono, fontSize.frameInfo);
+        _fontShutdown = global::fontManager->font(KeyFontMono, fontSize.shutdown);
+        _fontCameraInfo = global::fontManager->font(KeyFontMono, fontSize.cameraInfo);
+        _fontVersionInfo = global::fontManager->font(KeyFontMono, fontSize.versionInfo);
+        _fontLog = global::fontManager->font(KeyFontLight, fontSize.log);
     }
 
     {
@@ -588,7 +491,7 @@ void RenderEngine::initializeGL() {
 void RenderEngine::deinitializeGL() {
     ZoneScoped
 
-    _renderer = nullptr;
+    _renderer.deinitialize();
 }
 
 void RenderEngine::updateScene() {
@@ -633,7 +536,7 @@ void RenderEngine::updateRenderer() {
     const bool windowResized = global::windowDelegate->windowHasResized();
 
     if (windowResized) {
-        _renderer->setResolution(renderingResolution());
+        _renderer.setResolution(renderingResolution());
 
         using FR = ghoul::fontrendering::FontRenderer;
         FR::defaultRenderer().setFramebufferSize(fontResolution());
@@ -643,7 +546,7 @@ void RenderEngine::updateRenderer() {
             static_cast<float>(global::windowDelegate->getHorizFieldOfView());
     }
 
-    _renderer->update();
+    _renderer.update();
 }
 
 void RenderEngine::updateScreenSpaceRenderables() {
@@ -737,9 +640,9 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         _lastFrameTime = now + std::chrono::microseconds(static_cast<int>(delta));
     }
 
-    const bool masterEnabled = delegate.isMaster() ? !_disableMasterRendering : true;
-    if (masterEnabled && !delegate.isGuiWindow() && _globalBlackOutFactor > 0.f) {
-        _renderer->render(
+    const bool renderingEnabled = delegate.isMaster() ? !_disableMasterRendering : true;
+    if (renderingEnabled && !delegate.isGuiWindow() && _globalBlackOutFactor > 0.f) {
+        _renderer.render(
             _scene,
             _camera,
             _globalBlackOutFactor
@@ -776,7 +679,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         RenderFont(*_fontFrameInfo, penPosition, res);
     }
 
-    if (masterEnabled && !delegate.isGuiWindow() && _globalBlackOutFactor > 0.f) {
+    if (renderingEnabled && !delegate.isGuiWindow() && _globalBlackOutFactor > 0.f) {
         ZoneScopedN("Render Screenspace Renderable")
 
         std::vector<ScreenSpaceRenderable*> ssrs;
@@ -968,14 +871,6 @@ void RenderEngine::setCamera(Camera* camera) {
     _camera = camera;
 }
 
-const Renderer& RenderEngine::renderer() const {
-    return *_renderer;
-}
-
-RenderEngine::RendererImplementation RenderEngine::rendererImplementation() const {
-    return _rendererImplementation;
-}
-
 ghoul::opengl::OpenGLStateCache& RenderEngine::openglStateCache() {
     if (_openglStateCache == nullptr) {
         _openglStateCache = ghoul::opengl::OpenGLStateCache::instance();
@@ -1127,39 +1022,10 @@ unsigned int RenderEngine::latestScreenshotNumber() const {
     return _latestScreenshotNumber;
 }
 
-void RenderEngine::preRaycast(ghoul::opengl::ProgramObject& programObject) {
-    _renderer->preRaycast(programObject);
-}
-
-void RenderEngine::postRaycast(ghoul::opengl::ProgramObject& programObject) {
-    _renderer->postRaycast(programObject);
-}
-
-void RenderEngine::setRenderer(std::unique_ptr<Renderer> renderer) {
-    ZoneScoped
-
-    if (_renderer) {
-        _renderer->deinitialize();
-    }
-
-    _renderer = std::move(renderer);
-    _renderer->setResolution(renderingResolution());
-    _renderer->enableFXAA(_enableFXAA);
-    _renderer->setHDRExposure(_hdrExposure);
-    _renderer->initialize();
-}
-
 scripting::LuaLibrary RenderEngine::luaLibrary() {
     return {
         "",
         {
-            {
-                "setRenderer",
-                &luascriptfunctions::setRenderer,
-                {},
-                "string",
-                "Sets the renderer (ABuffer or FrameBuffer)"
-            },
             {
                 "addScreenSpaceRenderable",
                 &luascriptfunctions::addScreenSpaceRenderable,
@@ -1266,24 +1132,6 @@ std::vector<ScreenSpaceRenderable*> RenderEngine::screenSpaceRenderables() const
     return res;
 }
 
-RenderEngine::RendererImplementation RenderEngine::rendererFromString(
-                                                 const std::string& renderingMethod) const
-{
-    const std::map<std::string, RenderEngine::RendererImplementation> RenderingMethods = {
-#ifdef OPENSPACE_WITH_ABUFFER_RENDERER
-        { "ABuffer", RendererImplementation::ABuffer },
-#endif // OPENSPACE_WITH_ABUFFER_RENDERER
-        { "Framebuffer", RendererImplementation::Framebuffer }
-    };
-
-    if (RenderingMethods.find(renderingMethod) != RenderingMethods.end()) {
-        return RenderingMethods.at(renderingMethod);
-    }
-    else {
-        return RendererImplementation::Invalid;
-    }
-}
-
 void RenderEngine::renderCameraInformation() {
     ZoneScoped
 
diff --git a/src/rendering/renderengine_lua.inl b/src/rendering/renderengine_lua.inl
index 9bb26d0fcd..b011722f42 100644
--- a/src/rendering/renderengine_lua.inl
+++ b/src/rendering/renderengine_lua.inl
@@ -26,30 +26,6 @@
 
 namespace openspace::luascriptfunctions {
 
-/**
-* \ingroup LuaScripts
-* setRenderer(string):
-* Set renderer
-*/
-int setRenderer(lua_State* L) {
-    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::setRenderer");
-
-    const int type = lua_type(L, -1);
-    if (type != LUA_TSTRING) {
-        return ghoul::lua::luaError(L, "Expected argument of type 'string'");
-    }
-
-    const std::string& renderer = ghoul::lua::value<std::string>(
-        L,
-        1,
-        ghoul::lua::PopValue::Yes
-    );
-    global::renderEngine->setRendererFromString(renderer);
-
-    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
-    return 0;
-}
-
 int addScreenSpaceRenderable(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::addScreenSpaceRenderable");
 

From f6d74870bb2105b6216d807a90dfcf8cb608e760 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 30 Jul 2021 12:24:46 +0200
Subject: [PATCH 34/47] Don't disable the CEF UI when turning off Master
 rendering (#1699)

---
 src/rendering/framebufferrenderer.cpp | 2 +-
 src/rendering/renderengine.cpp        | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 1a92b2f781..1f9913fe13 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -1254,7 +1254,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
         TracyGpuZone("Apply TMO")
         GLDebugGroup group("Apply TMO");
 
-        applyTMO(blackoutFactor, glm::ivec4(viewport[0], viewport[1], viewport[2], viewport[3]));
+        applyTMO(blackoutFactor, viewport);
     }
 
     if (_enableFXAA) {
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index a61e71fd9e..6168dfce2f 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -27,6 +27,7 @@
 #include <openspace/openspace.h>
 #include <openspace/engine/configuration.h>
 #include <openspace/engine/globals.h>
+#include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/navigationhandler.h>
@@ -649,6 +650,14 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         );
     }
 
+    // The CEF webbrowser fix has to be called at least once per frame and we are doing
+    // that in the renderer::render method.  So if we disable the rendering, that fix is
+    // no longer called as we lose access to the Web UI.  Since we are calling the fix
+    // many times anyway, we can just add one call to it here and not lose much
+    if (global::callback::webBrowserPerformanceHotfix) {
+        (*global::callback::webBrowserPerformanceHotfix)();
+    }
+
     if (_showFrameInformation) {
         ZoneScopedN("Show Frame Information")
 

From 5b3a66156c403b39a2bb96870ae21c3f72faef65 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 30 Jul 2021 14:48:08 +0200
Subject: [PATCH 35/47] Remove unnecessary template specification for
 lock_guard

---
 ext/ghoul                                       | 2 +-
 include/openspace/util/concurrentjobmanager.inl | 4 ++--
 modules/sync/syncs/httpsynchronization.cpp      | 2 +-
 modules/sync/syncs/urlsynchronization.cpp       | 2 +-
 src/network/parallelpeer.cpp                    | 8 ++++----
 src/rendering/loadingscreen.cpp                 | 8 ++++----
 src/scene/sceneinitializer.cpp                  | 8 ++++----
 src/scripting/scriptengine.cpp                  | 6 +++---
 src/util/camera.cpp                             | 2 +-
 src/util/httprequest.cpp                        | 4 ++--
 src/util/synchronizationwatcher.cpp             | 2 +-
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 0a7f66f9a1..57e96a6a8d 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 0a7f66f9a1cb050b9d6e803257ab1320259fa53d
+Subproject commit 57e96a6a8d10003eb22aaa471de8eec60d89df2c
diff --git a/include/openspace/util/concurrentjobmanager.inl b/include/openspace/util/concurrentjobmanager.inl
index a49dff3da9..0816b910c2 100644
--- a/include/openspace/util/concurrentjobmanager.inl
+++ b/include/openspace/util/concurrentjobmanager.inl
@@ -36,7 +36,7 @@ template<typename P>
 void ConcurrentJobManager<P>::enqueueJob(std::shared_ptr<Job<P>> job) {
     threadPool.enqueue([this, job]() {
         job->execute();
-        std::lock_guard<std::mutex> lock(_finishedJobsMutex);
+        std::lock_guard lock(_finishedJobsMutex);
         _finishedJobs.push(job);
     });
 }
@@ -50,7 +50,7 @@ template<typename P>
 std::shared_ptr<Job<P>> ConcurrentJobManager<P>::popFinishedJob() {
     ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop!");
 
-    std::lock_guard<std::mutex> lock(_finishedJobsMutex);
+    std::lock_guard lock(_finishedJobsMutex);
     return _finishedJobs.pop();
 }
 
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 18f2a34c7f..08bbb66953 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -228,7 +228,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
                 return !_shouldCancel;
             }
 
-            std::lock_guard<std::mutex> guard(sizeDataMutex);
+            std::lock_guard guard(sizeDataMutex);
 
             sizeData[line] = { p.totalBytesKnown, p.totalBytes, p.downloadedBytes };
 
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index d53d79ca49..f0c418b02c 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -192,7 +192,7 @@ void UrlSynchronization::start() {
                 &startedAllDownloads, &nDownloads](HttpRequest::Progress p)
             {
                 if (p.totalBytesKnown) {
-                    std::lock_guard<std::mutex> guard(fileSizeMutex);
+                    std::lock_guard guard(fileSizeMutex);
                     fileSizes[url] = p.totalBytes;
 
                     if (!_nTotalBytesKnown && startedAllDownloads &&
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 08bee3b496..49c6024433 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -199,7 +199,7 @@ void ParallelPeer::sendAuthentication() {
 }
 
 void ParallelPeer::queueInMessage(const ParallelConnection::Message& message) {
-    std::lock_guard<std::mutex> unqlock(_receiveBufferMutex);
+    std::lock_guard unqlock(_receiveBufferMutex);
     _receiveBuffer.push_back(message);
 }
 
@@ -221,7 +221,7 @@ void ParallelPeer::handleMessage(const ParallelConnection::Message& message) {
 }
 
 void ParallelPeer::analyzeTimeDifference(double messageTimestamp) {
-    std::lock_guard<std::mutex> latencyLock(_latencyMutex);
+    std::lock_guard latencyLock(_latencyMutex);
 
     const double timeDiff = global::windowDelegate->applicationTime() - messageTimestamp;
     if (_latencyDiffs.empty()) {
@@ -235,7 +235,7 @@ void ParallelPeer::analyzeTimeDifference(double messageTimestamp) {
 }
 
 double ParallelPeer::convertTimestamp(double messageTimestamp) {
-    std::lock_guard<std::mutex> latencyLock(_latencyMutex);
+    std::lock_guard latencyLock(_latencyMutex);
     return messageTimestamp + _initialTimeDiff + _bufferTime;
 }
 
@@ -495,7 +495,7 @@ void ParallelPeer::sendScript(std::string script) {
 void ParallelPeer::resetTimeOffset() {
     global::navigationHandler->keyframeNavigator().clearKeyframes();
     global::timeManager->clearKeyframes();
-    std::lock_guard<std::mutex> latencyLock(_latencyMutex);
+    std::lock_guard latencyLock(_latencyMutex);
     _latencyDiffs.clear();
 }
 
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index fcb131de23..451751a54b 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -283,7 +283,7 @@ void LoadingScreen::render() {
     glm::vec2 messageLl = glm::vec2(0.f);
     glm::vec2 messageUr = glm::vec2(0.f);
     if (_showMessage) {
-        std::lock_guard<std::mutex> guard(_messageMutex);
+        std::lock_guard guard(_messageMutex);
 
         const glm::vec2 bboxMessage = _messageFont->boundingBox(_message);
 
@@ -298,7 +298,7 @@ void LoadingScreen::render() {
     }
 
     if (_showNodeNames) {
-        std::lock_guard<std::mutex> guard(_itemsMutex);
+        std::lock_guard guard(_itemsMutex);
 
         std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
 
@@ -485,7 +485,7 @@ void LoadingScreen::render() {
 }
 
 void LoadingScreen::postMessage(std::string message) {
-    std::lock_guard<std::mutex> guard(_messageMutex);
+    std::lock_guard guard(_messageMutex);
     _message = std::move(message);
 }
 
@@ -535,7 +535,7 @@ void LoadingScreen::updateItem(const std::string& itemIdentifier,
         // also would create any of the text information
         return;
     }
-    std::lock_guard<std::mutex> guard(_itemsMutex);
+    std::lock_guard guard(_itemsMutex);
 
     auto it = std::find_if(
         _items.begin(),
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index 1e92860d26..9334cb3e62 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -66,7 +66,7 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
         }
 
         node->initialize();
-        std::lock_guard<std::mutex> g(_mutex);
+        std::lock_guard g(_mutex);
         _initializedNodes.push_back(node);
         _initializingNodes.erase(node);
 
@@ -94,19 +94,19 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
         );
     }
 
-    std::lock_guard<std::mutex> g(_mutex);
+    std::lock_guard g(_mutex);
     _initializingNodes.insert(node);
     _threadPool.enqueue(initFunction);
 }
 
 std::vector<SceneGraphNode*> MultiThreadedSceneInitializer::takeInitializedNodes() {
-    std::lock_guard<std::mutex> g(_mutex);
+    std::lock_guard g(_mutex);
     std::vector<SceneGraphNode*> nodes = std::move(_initializedNodes);
     return nodes;
 }
 
 bool MultiThreadedSceneInitializer::isInitializing() const {
-    std::lock_guard<std::mutex> g(_mutex);
+    std::lock_guard g(_mutex);
     return !_initializingNodes.empty();
 }
 
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index d34b2a1afe..dc917b8de8 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -694,7 +694,7 @@ void ScriptEngine::preSync(bool isMaster) {
         return;
     }
 
-    std::lock_guard<std::mutex> guard(_slaveScriptsMutex);
+    std::lock_guard guard(_slaveScriptsMutex);
     while (!_incomingScripts.empty()) {
         QueueItem item = std::move(_incomingScripts.front());
         _incomingScripts.pop();
@@ -728,7 +728,7 @@ void ScriptEngine::encode(SyncBuffer* syncBuffer) {
 void ScriptEngine::decode(SyncBuffer* syncBuffer) {
     ZoneScoped
 
-    std::lock_guard<std::mutex> guard(_slaveScriptsMutex);
+    std::lock_guard guard(_slaveScriptsMutex);
     size_t nScripts;
     syncBuffer->decode(nScripts);
 
@@ -757,7 +757,7 @@ void ScriptEngine::postSync(bool isMaster) {
         }
     }
     else {
-        std::lock_guard<std::mutex> guard(_slaveScriptsMutex);
+        std::lock_guard guard(_slaveScriptsMutex);
         while (!_slaveScriptQueue.empty()) {
             try {
                 runScript(_slaveScriptQueue.front());
diff --git a/src/util/camera.cpp b/src/util/camera.cpp
index 4091bdb45b..551f129099 100644
--- a/src/util/camera.cpp
+++ b/src/util/camera.cpp
@@ -258,7 +258,7 @@ const glm::mat4& Camera::SgctInternal::projectionMatrix() const {
 
 const glm::mat4& Camera::SgctInternal::viewProjectionMatrix() const {
     //if (_cachedViewProjectionMatrix.isDirty) {
-        std::lock_guard<std::mutex> _lock(_mutex);
+        std::lock_guard _lock(_mutex);
         _cachedViewProjectionMatrix.datum = _projectionMatrix * _viewMatrix;
         _cachedViewProjectionMatrix.isDirty = false;
     //}
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 2250aa80f9..fe5c982b7d 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -245,7 +245,7 @@ AsyncHttpDownload::AsyncHttpDownload(AsyncHttpDownload&& d)
 {}
 
 void AsyncHttpDownload::start(HttpRequest::RequestOptions opt) {
-    std::lock_guard<std::mutex> guard(_stateChangeMutex);
+    std::lock_guard guard(_stateChangeMutex);
     if (hasStarted()) {
         return;
     }
@@ -286,7 +286,7 @@ void AsyncHttpDownload::download(HttpRequest::RequestOptions opt) {
     _httpRequest.onProgress([this](HttpRequest::Progress p) {
         // Return a non-zero value to cancel download
         // if onProgress returns false.
-        //std::lock_guard<std::mutex> guard(_mutex);
+        //std::lock_guard guard(_mutex);
         const bool shouldContinue = callOnProgress(p);
         if (!shouldContinue) {
             return 1;
diff --git a/src/util/synchronizationwatcher.cpp b/src/util/synchronizationwatcher.cpp
index 5c14833970..98c724219d 100644
--- a/src/util/synchronizationwatcher.cpp
+++ b/src/util/synchronizationwatcher.cpp
@@ -41,7 +41,7 @@ SynchronizationWatcher::WatchHandle SynchronizationWatcher::watchSynchronization
         [this, synchronization, watchHandle, cb = std::move(callback)]
         (ResourceSynchronization::State state)
         {
-            std::lock_guard<std::mutex> g(_mutex);
+            std::lock_guard g(_mutex);
             _pendingNotifications.push_back({ synchronization, state, watchHandle, cb });
         }
     );

From c96764aa1c6c8f1d7d7603e255c787fb718a7565 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 30 Jul 2021 14:56:55 +0200
Subject: [PATCH 36/47] Remove Clang warnings

---
 .../rendering/atmospheredeferredcaster.cpp      | 17 ++++++++++-------
 modules/base/rendering/renderablelabels.cpp     | 14 +++++++-------
 modules/base/rendering/renderableprism.cpp      | 10 ++++++++--
 .../rendering/renderabledumeshes.cpp            |  8 --------
 .../src/dashboarditemglobelocation.cpp          |  2 --
 .../globebrowsing/src/globelabelscomponent.cpp  |  2 +-
 modules/space/translation/spicetranslation.cpp  |  2 +-
 .../dashboard/dashboarditeminstruments.cpp      |  2 ++
 .../spacecraftinstruments/util/labelparser.cpp  |  3 +--
 .../spacecraftinstruments/util/labelparser.h    |  3 +--
 10 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 3bc7f14edc..8bc8f1061c 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -90,7 +90,10 @@ namespace {
             return;
         }
 
-        std::vector<unsigned char> px(size.x * size.y * 3, unsigned char(255));
+        std::vector<unsigned char> px(
+            size.x * size.y * 3,
+            static_cast<unsigned char>(255)
+        );
 
         glReadBuffer(colorBufferAttachment);
         glReadPixels(0, 0, size.x, size.y, GL_RGB, GL_UNSIGNED_BYTE, px.data());
@@ -198,9 +201,9 @@ namespace {
     GLuint createTexture(const glm::ivec3& size, std::string_view name, int components) {
         ghoul_assert(components == 3 || components == 4, "Only 3-4 components supported");
 
-        GLuint texture;
-        glGenTextures(1, &texture);
-        glBindTexture(GL_TEXTURE_3D, texture);
+        GLuint t;
+        glGenTextures(1, &t);
+        glBindTexture(GL_TEXTURE_3D, t);
         glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -221,9 +224,9 @@ namespace {
             nullptr
         );
         if (glbinding::Binding::ObjectLabel.isResolved()) {
-            glObjectLabel(GL_TEXTURE, texture, name.size(), name.data());
+            glObjectLabel(GL_TEXTURE, t, static_cast<GLsizei>(name.size()), name.data());
         }
-        return texture;
+        return t;
     }
 } // namespace
 
@@ -239,9 +242,9 @@ AtmosphereDeferredcaster::AtmosphereDeferredcaster(float textureScale,
     , _nuSamples(static_cast<int>(8 * textureScale))
     , _muSamples(static_cast<int>(128 * textureScale))
     , _rSamples(static_cast<int>(32 * textureScale))
+    , _textureSize(_muSSamples * _nuSamples, _muSamples, _rSamples)
     , _shadowConfArray(std::move(shadowConfigArray))
     , _saveCalculationTextures(saveCalculatedTextures)
-    , _textureSize(_muSSamples * _nuSamples, _muSamples, _rSamples)
 {
     std::memset(_uniformNameBuffer, '\0', sizeof(_uniformNameBuffer));
     std::strcpy(_uniformNameBuffer, "shadowDataArray[");
diff --git a/modules/base/rendering/renderablelabels.cpp b/modules/base/rendering/renderablelabels.cpp
index 5125e2bed7..1d482d9d7d 100644
--- a/modules/base/rendering/renderablelabels.cpp
+++ b/modules/base/rendering/renderablelabels.cpp
@@ -224,21 +224,21 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
-    , _size(SizeInfo, 8.f, 0.5f, 30.f)
     , _fontSize(FontSizeInfo, 50.f, 1.f, 100.f)
+    , _size(SizeInfo, 8.f, 0.5f, 30.f)
     , _minMaxSize(MinMaxSizeInfo, glm::ivec2(8, 20), glm::ivec2(0), glm::ivec2(100))
-    , _enableFadingEffect(EnableFadingEffectInfo, false)
     , _text(TextInfo, "")
-    , _fadeDistances(FadeDistancesInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(100.f))
+    , _enableFadingEffect(EnableFadingEffectInfo, false)
     , _fadeWidths(FadeWidthsInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(100.f))
-    , _orientationOption(
-        OrientationOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _fadeDistances(FadeDistancesInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(100.f))
     , _fadeUnitOption(
         FadeUnitOptionInfo,
         properties::OptionProperty::DisplayType::Dropdown
     )
+    , _orientationOption(
+        OrientationOptionInfo,
+        properties::OptionProperty::DisplayType::Dropdown
+    )
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index 20f610d3c8..c14798a604 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -215,7 +215,10 @@ void RenderablePrism::updateVertexData() {
     for (int i = 0; i < 2; ++i) {
         float h = i * _length; // z value, 0 to _length
 
-        for (int j = 0, k = 0; j < _nShapeSegments && k < unitVertices.size(); ++j, k += 2) {
+        for (int j = 0, k = 0;
+             j < _nShapeSegments && k < static_cast<int>(unitVertices.size());
+             ++j, k += 2)
+        {
             float ux = unitVertices[k];
             float uy = unitVertices[k + 1];
 
@@ -239,7 +242,10 @@ void RenderablePrism::updateVertexData() {
         _vertexArray.push_back(_length);
     }
     else {
-        for (int j = 0, k = 0; j < _nLines && k < unitVerticesLines.size(); ++j, k += 2) {
+        for (int j = 0, k = 0;
+             j < _nLines && k < static_cast<int>(unitVerticesLines.size());
+             ++j, k += 2)
+        {
             float ux = unitVerticesLines[k];
             float uy = unitVerticesLines[k + 1];
 
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 9fc7d78962..c28b0d5a0a 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -515,7 +515,6 @@ bool RenderableDUMeshes::readSpeckFile() {
     // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
     std::string line;
     while (true) {
-        std::streampos position = file.tellg();
         std::getline(file, line);
 
         if (file.eof()) {
@@ -534,16 +533,9 @@ bool RenderableDUMeshes::readSpeckFile() {
 
         std::size_t found = line.find("mesh");
         if (found == std::string::npos) {
-        //if (line.substr(0, 4) != "mesh") {
-            // we read a line that doesn't belong to the header, so we have to jump back
-            // before the beginning of the current line
-            //file.seekg(position);
-            //break;
             continue;
         }
         else {
-
-        //if (line.substr(0, 4) == "mesh") {
             // mesh lines are structured as follows:
             // mesh -t texnum -c colorindex -s style {
             // where textnum is the index of the texture;
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index 650e8557a0..f318a64a14 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -39,8 +39,6 @@
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/misc/profiling.h>
 
-#pragma optimize ("", off)
-
 namespace {
     constexpr const char* KeyFontMono = "Mono";
     constexpr const float DefaultFontSize = 10.f;
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index ed3548ba9d..7f27aa1a37 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -203,8 +203,8 @@ GlobeLabelsComponent::GlobeLabelsComponent()
     : properties::PropertyOwner({ "Labels" })
     , _enabled(EnabledInfo, false)
     , _fontSize(FontSizeInfo, 30.f, 1.f, 300.f)
-    , _minMaxSize(MinMaxSizeInfo, glm::ivec2(1, 1000), glm::ivec2(1), glm::ivec2(1000))
     , _size(SizeInfo, 2.5, 0, 30)
+    , _minMaxSize(MinMaxSizeInfo, glm::ivec2(1, 1000), glm::ivec2(1), glm::ivec2(1000))
     , _heightOffset(HeightOffsetInfo, 100.f, 0.f, 10000.f)
     , _color(ColorInfo, glm::vec3(1.f, 1.f, 0.f), glm::vec3(0.f), glm::vec3(1.f))
     , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 98cf2231ef..427409069e 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -101,8 +101,8 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
     : _target(TargetInfo)
     , _observer(ObserverInfo)
     , _frame(FrameInfo, DefaultReferenceFrame)
-    , _cachedFrame(DefaultReferenceFrame)
     , _fixedDate(FixedDateInfo)
+    , _cachedFrame(DefaultReferenceFrame)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index 69a86f3129..aa4d5a8dfe 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -105,8 +105,10 @@ DashboardItemInstruments::DashboardItemInstruments(const ghoul::Dictionary& dict
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _activeColor.setViewOption(properties::Property::ViewOptions::Color);
+    _activeColor = p.activeColor.value_or(_activeColor);
     addProperty(_activeColor);
     _activeFlash.setViewOption(properties::Property::ViewOptions::Color);
+    _activeFlash = p.flashColor.value_or(_activeFlash);
     addProperty(_activeFlash);
 }
 
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index 4baf2c41df..0f41396d03 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -42,8 +42,7 @@ namespace {
 
 namespace openspace {
 
-LabelParser::LabelParser(std::string name, std::string fileName,
-                         const ghoul::Dictionary& dictionary)
+LabelParser::LabelParser(std::string fileName, const ghoul::Dictionary& dictionary)
     : _fileName(std::move(fileName))
 {
     // get the different instrument types
diff --git a/modules/spacecraftinstruments/util/labelparser.h b/modules/spacecraftinstruments/util/labelparser.h
index 7478fb236f..b6a22dfdd2 100644
--- a/modules/spacecraftinstruments/util/labelparser.h
+++ b/modules/spacecraftinstruments/util/labelparser.h
@@ -31,8 +31,7 @@ namespace openspace {
 
 class LabelParser : public SequenceParser {
 public:
-    LabelParser(std::string name, std::string fileName,
-        const ghoul::Dictionary& translationDictionary);
+    LabelParser(std::string fileName, const ghoul::Dictionary& translationDictionary);
 
     bool create() override;
 

From 90157ce463475fc66409aa6961eab1c14783420a Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 30 Jul 2021 15:01:21 +0200
Subject: [PATCH 37/47] Warnings and compile fixes for MSVC

---
 .../src/dashboarditemglobelocation.cpp        | 20 +++++++++----------
 .../dashboard/dashboarditeminstruments.cpp    |  4 ++--
 .../util/projectioncomponent.cpp              | 18 +++--------------
 tests/test_configuration.cpp                  | 12 +++--------
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index f318a64a14..2189b46524 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -229,17 +229,17 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
             const bool isEast = lon > 0.0;
             lon = std::abs(lon);
 
-            const float latDeg = std::trunc(lat);
-            const float latDegRemainder = lat - latDeg;
-            const float latMin = std::trunc(latDegRemainder * 60.f);
-            const float latMinRemainder = latDegRemainder * 60.f - latMin;
-            const float latSec = latMinRemainder * 60.f;
+            const double latDeg = std::trunc(lat);
+            const double latDegRemainder = lat - latDeg;
+            const double latMin = std::trunc(latDegRemainder * 60.f);
+            const double latMinRemainder = latDegRemainder * 60.f - latMin;
+            const double latSec = latMinRemainder * 60.f;
 
-            const float lonDeg = std::trunc(lon);
-            const float lonDegRemainder = lon - lonDeg;
-            const float lonMin = std::trunc(lonDegRemainder * 60.f);
-            const float lonMinRemainder = lonDegRemainder * 60.f - lonMin;
-            const float lonSec = lonMinRemainder * 60.f;
+            const double lonDeg = std::trunc(lon);
+            const double lonDegRemainder = lon - lonDeg;
+            const double lonMin = std::trunc(lonDegRemainder * 60.f);
+            const double lonMinRemainder = lonDegRemainder * 60.f - lonMin;
+            const double lonSec = lonMinRemainder * 60.f;
 
 
             end = fmt::format_to(
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index aa4d5a8dfe..a5c2ab1f3b 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -74,10 +74,10 @@ namespace {
 
     struct [[codegen::Dictionary(DashboardItemInstruments)]] Parameters {
         // [[codegen::verbatim(ActiveColorInfo.description)]]
-        std::optional<glm::dvec3> activeColor [[codegen::color()]];
+        std::optional<glm::vec3> activeColor [[codegen::color()]];
 
         // [[codegen::verbatim(FlashColorInfo.description)]]
-        std::optional<glm::dvec3> flashColor [[codegen::color()]];
+        std::optional<glm::vec3> flashColor [[codegen::color()]];
     };
 #include "dashboarditeminstruments_codegen.cpp"
 } // namespace
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 3e48f3eba8..b51cf27352 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -253,21 +253,13 @@ void ProjectionComponent::initialize(const std::string& identifier,
                 break;
             case Parameters::Type::ImageSequence:
                 parsers.push_back(
-                    std::make_unique<LabelParser>(
-                        identifier,
-                        std::move(source),
-                        translations
-                    )
+                    std::make_unique<LabelParser>(std::move(source), translations)
                 );
                 break;
             case Parameters::Type::Hybrid:
                 // first read labels
                 parsers.push_back(
-                    std::make_unique<LabelParser>(
-                        identifier,
-                        std::move(source),
-                        translations
-                    )
+                    std::make_unique<LabelParser>(std::move(source), translations)
                 );
 
                 if (p.eventFile.has_value()) {
@@ -297,11 +289,7 @@ void ProjectionComponent::initialize(const std::string& identifier,
             case Parameters::Type::ImageAndInstrumentTimes:
             {
                 parsers.push_back(
-                    std::make_unique<LabelParser>(
-                        identifier,
-                        std::move(source),
-                        translations
-                    )
+                    std::make_unique<LabelParser>(std::move(source), translations)
                 );
 
                 if (!p.timesSequence.has_value()) {
diff --git a/tests/test_configuration.cpp b/tests/test_configuration.cpp
index 25aa84be4f..c01cd9ab66 100644
--- a/tests/test_configuration.cpp
+++ b/tests/test_configuration.cpp
@@ -315,19 +315,19 @@ TEST_CASE("Configuration: isRenderingOnMasterDisabled", "[configuration]") {
 TEST_CASE("Configuration: globalRotation", "[configuration]") {
     constexpr const char Extra[] = R"(GlobalRotation = { 1.0, 2.0, 3.0 })";
     const Configuration c = loadConfiguration("globalRotation", Extra);
-    CHECK(c.globalRotation == glm::dvec3(1.0, 2.0, 3.0));
+    CHECK(c.globalRotation == glm::vec3(1.0, 2.0, 3.0));
 }
 
 TEST_CASE("Configuration: screenSpaceRotation", "[configuration]") {
     constexpr const char Extra[] = R"(ScreenSpaceRotation = { 1.0, 2.0, 3.0 })";
     const Configuration c = loadConfiguration("screenSpaceRotation", Extra);
-    CHECK(c.screenSpaceRotation == glm::dvec3(1.0, 2.0, 3.0));
+    CHECK(c.screenSpaceRotation == glm::vec3(1.0, 2.0, 3.0));
 }
 
 TEST_CASE("Configuration: masterRotation", "[configuration]") {
     constexpr const char Extra[] = R"(MasterRotation = { 1.0, 2.0, 3.0 })";
     const Configuration c = loadConfiguration("masterRotation", Extra);
-    CHECK(c.masterRotation == glm::dvec3(1.0, 2.0, 3.0));
+    CHECK(c.masterRotation == glm::vec3(1.0, 2.0, 3.0));
 }
 
 TEST_CASE("Configuration: isConsoleDisabled", "[configuration]") {
@@ -381,12 +381,6 @@ ModuleConfigurations = {
     }
 }
 
-TEST_CASE("Configuration: renderingMethod", "[configuration]") {
-    constexpr const char Extra[] = R"(RenderingMethod = "ABuffer")";
-    const Configuration c = loadConfiguration("renderingMethod", Extra);
-    CHECK(c.renderingMethod == "ABuffer");
-}
-
 TEST_CASE("Configuration: openGLDebugContext", "[configuration]") {
     Configuration defaultConf;
     {

From dfca605d63b5e267d5c8306bec8f558eb2a5af52 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 30 Jul 2021 15:37:03 +0200
Subject: [PATCH 38/47] Add the optional ability to print a stacktrace with an
 OpenGL error (closes #1700)

---
 include/openspace/engine/configuration.h |  1 +
 openspace.cfg                            |  1 +
 src/engine/configuration.cpp             |  8 ++++++++
 src/engine/openspaceengine.cpp           | 10 ++++++++++
 tests/test_configuration.cpp             |  4 ++++
 5 files changed, 24 insertions(+)

diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index daf0ac7ee4..f20b2d8900 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -108,6 +108,7 @@ struct Configuration {
 
     struct OpenGLDebugContext {
         bool isActive = false;
+        bool printStacktrace = false;
         bool isSynchronous = true;
         struct IdentifierFilter {
             std::string type;
diff --git a/openspace.cfg b/openspace.cfg
index b1afa57fd7..6828473069 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -238,6 +238,7 @@ ScreenSpaceRotation = { 0.0, 0.0, 0.0 }
 
 OpenGLDebugContext = {
     Activate = true,
+    PrintStacktrace = false,
     FilterIdentifier = {
         { Type = "Other", Source = "API", Identifier = 131185 },
         -- API_ID_RECOMPILE_FRAGMENT_SHADER performance warning has been generated. Fragment shader recompiled due to state change
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index ad7b113f67..454ee1f6a3 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -223,6 +223,11 @@ namespace {
             // Determines whether the OpenGL context should be a debug context
             bool activate;
 
+            // If this is set to 'true', everytime an OpenGL error is logged, the full
+            // stacktrace leading to the error is printed as well, making debugging under
+            // production situations much easier
+            std::optional<bool> printStacktrace;
+
             // Determines whether the OpenGL debug callbacks are performed synchronously.
             // If set to 'true' the callbacks are in the same thread as the context and in
             // the scope of the OpenGL function that triggered the message. The default
@@ -478,6 +483,9 @@ void parseLuaState(Configuration& configuration) {
     if (p.openGLDebugContext.has_value()) {
         const Parameters::OpenGLDebugContext& l = *p.openGLDebugContext;
         c.openGLDebugContext.isActive = l.activate;
+        c.openGLDebugContext.printStacktrace = l.printStacktrace.value_or(
+            c.openGLDebugContext.printStacktrace
+        );
         c.openGLDebugContext.isSynchronous = l.synchronous.value_or(
             c.openGLDebugContext.isSynchronous
         );
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index b75e828183..576b6ad730 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -74,6 +74,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/logging/visualstudiooutputlog.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/misc/stacktrace.h>
 #include <ghoul/misc/stringconversion.h>
 #include <ghoul/opengl/debugcontext.h>
 #include <ghoul/opengl/shaderpreprocessor.h>
@@ -560,6 +561,15 @@ void OpenSpaceEngine::initializeGL() {
                 default:
                     throw ghoul::MissingCaseException();
             }
+
+            if (global::configuration->openGLDebugContext.printStacktrace) {
+                std::string stackString = "Stacktrace\n";
+                std::vector<std::string> stack = ghoul::stackTrace();
+                for (size_t i = 0; i < stack.size(); i++) {
+                    stackString += fmt::format("{}: {}\n", i, stack[i]);
+                }
+                LDEBUGC(category, stackString);
+            }
         };
         ghoul::opengl::debug::setDebugCallback(callback);
     }
diff --git a/tests/test_configuration.cpp b/tests/test_configuration.cpp
index c01cd9ab66..b3266665d5 100644
--- a/tests/test_configuration.cpp
+++ b/tests/test_configuration.cpp
@@ -388,6 +388,7 @@ TEST_CASE("Configuration: openGLDebugContext", "[configuration]") {
         constexpr const char Extra[] = R"(OpenGLDebugContext = { Activate = true })";
         const Configuration c = loadConfiguration("openGLDebugContext1", Extra);
         CHECK(c.openGLDebugContext.isActive == true);
+        CHECK(c.openGLDebugContext.printStacktrace == false);
         CHECK(
             c.openGLDebugContext.isSynchronous ==
             defaultConf.openGLDebugContext.isSynchronous
@@ -451,6 +452,7 @@ OpenGLDebugContext = { Activate = true, Synchronous = true }
         constexpr const char Extra[] = R"(
 OpenGLDebugContext = {
     Activate = true,
+    PrintStacktrace = true,
     FilterIdentifier = {
         { Identifier = 1, Source = "API", Type = "Error" },
         { Identifier = 2, Source = "Window System", Type = "Deprecated" },
@@ -467,6 +469,7 @@ OpenGLDebugContext = {
 )";
         const Configuration c = loadConfiguration("openGLDebugContext3", Extra);
         CHECK(c.openGLDebugContext.isActive == true);
+        CHECK(c.openGLDebugContext.printStacktrace == true);
         CHECK(
             c.openGLDebugContext.isSynchronous ==
             defaultConf.openGLDebugContext.isSynchronous
@@ -515,6 +518,7 @@ OpenGLDebugContext = { Activate = true, FilterSeverity = { "High", "Medium" } }
 )";
         const Configuration c = loadConfiguration("openGLDebugContext4", Extra);
         CHECK(c.openGLDebugContext.isActive == true);
+        CHECK(c.openGLDebugContext.printStacktrace == false);
         CHECK(
             c.openGLDebugContext.isSynchronous ==
             defaultConf.openGLDebugContext.isSynchronous

From 2e746e14f1f15bc105bd7890cf974d42a346f971 Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Fri, 30 Jul 2021 13:41:49 -0600
Subject: [PATCH 39/47] Formatting changes per code review

---
 include/openspace/util/timeline.h    | 38 ++++++++++++++--------------
 src/interaction/sessionrecording.cpp |  6 ++---
 src/scene/scene.cpp                  |  3 +--
 src/util/timemanager.cpp             |  6 ++---
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index 1a9820d4be..86363f6d5b 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -32,16 +32,16 @@
 namespace openspace {
 
 /**
-* Base class for keyframes
-*/
+ * Base class for keyframes
+ */
 struct KeyframeBase {
     size_t id;
     double timestamp;
 };
 
 /**
-* Templated class for keyframes containing data
-*/
+ * Templated class for keyframes containing data
+ */
 template <typename T>
 struct Keyframe : public KeyframeBase {
     Keyframe(size_t i, double t, T d);
@@ -54,8 +54,8 @@ struct Keyframe : public KeyframeBase {
 };
 
 /**
-* Templated class for timelines
-*/
+ * Templated class for timelines
+ */
 template <typename T>
 class Timeline {
 public:
@@ -81,28 +81,28 @@ private:
 };
 
 /**
-* Return true if the timestamp of a is smaller the timestamp of b.
-*/
+ * Return true if the timestamp of a is smaller the timestamp of b.
+ */
 bool compareKeyframeTimes(const KeyframeBase& a, const KeyframeBase& b);
 
 /**
-* Return true if a is smaller than the timestamp of b.
-*/
+ * Return true if a is smaller than the timestamp of b.
+ */
 bool compareTimeWithKeyframeTime(double a, const KeyframeBase& b);
 
 /**
-* Return true if the timestamp of a is smaller than b.
-*/
+ * Return true if the timestamp of a is smaller than b.
+ */
 bool compareKeyframeTimeWithTime(const KeyframeBase& a, double b);
 
 /**
-* Return true if the timestamp of a is smaller than or equal to b.
-* This is used only in the mode of saving render frames during session recording
-* playback. This was necessary to correct a small timing issue caused by fixing
-* the application time according to the playback framerate. In normal operation,
-* the application time at the instant the keyframes are evaluated is always a
-* little bit newer than the first keyframe in the timeline.
-*/
+ * Return true if the timestamp of a is smaller than or equal to b.
+ * This is used only in the mode of saving render frames during session recording
+ * playback. This was necessary to correct a small timing issue caused by fixing
+ * the application time according to the playback framerate. In normal operation,
+ * the application time at the instant the keyframes are evaluated is always a
+ * little bit newer than the first keyframe in the timeline.
+ */
 bool compareKeyframeTimeWithTime_playbackWithFrames(const KeyframeBase& a, double b);
 
 } // namespace openspace
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 8dd838f449..ac65118e80 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -1178,13 +1178,11 @@ double SessionRecording::fixedDeltaTimeDuringFrameOutput() const {
 }
 
 std::chrono::steady_clock::time_point
-SessionRecording::currentPlaybackInterpolationTime() const
-{
+SessionRecording::currentPlaybackInterpolationTime() const {
     return _saveRenderingCurrentRecordedTime_interpolation;
 }
 
-double SessionRecording::currentApplicationInterpolationTime() const
-{
+double SessionRecording::currentApplicationInterpolationTime() const {
     return _saveRenderingCurrentApplicationTime_interpolation;
 }
 
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 786b652d67..0ecbe18f32 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -474,8 +474,7 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
     return rawNodePointer;
 }
 
-std::chrono::steady_clock::time_point Scene::currentTimeForInterpolation()
-{
+std::chrono::steady_clock::time_point Scene::currentTimeForInterpolation() {
     if (global::sessionRecording->isSavingFramesDuringPlayback()) {
         return global::sessionRecording->currentPlaybackInterpolationTime();
     }
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index ceb192313f..e97cdc80b6 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -843,8 +843,7 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
     addKeyframe(now + interpolationDuration, futureKeyframe);
 }
 
-double TimeManager::currentApplicationTimeForInterpolation() const
-{
+double TimeManager::currentApplicationTimeForInterpolation() const {
     if (global::sessionRecording->isSavingFramesDuringPlayback()) {
         return global::sessionRecording->currentApplicationInterpolationTime();
     }
@@ -853,8 +852,7 @@ double TimeManager::currentApplicationTimeForInterpolation() const
     }
 }
 
-double TimeManager::previousApplicationTimeForInterpolation() const
-{
+double TimeManager::previousApplicationTimeForInterpolation() const {
     //If playing back with frames, this function needs to be called when a time rate
     // interpolation (either speed change or pause) begins and ends. If the application
     // time of the interpolation keyframe timestamp (when it was added to timeline) is

From f035ba57f8ca98a924fbb97f71a4d25a7c77b26c Mon Sep 17 00:00:00 2001
From: GPayne <payne.gene@gmail.com>
Date: Fri, 30 Jul 2021 14:37:49 -0600
Subject: [PATCH 40/47] Added casts to prevent conversion warnings

---
 .../ext/launcher/src/profile/keybindingsdialog.cpp          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
index a51afcb5fe..b4cb0c7cb6 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
@@ -379,7 +379,7 @@ void KeybindingsDialog::listItemAdded() {
     _documentationEdit->setText(QString::fromStdString(_data.back().documentation));
     _localCheck->setChecked(false);
     _scriptEdit->setText(QString::fromStdString(_data.back().script));
-    _currentKeybindingSelection = _data.size() - 1;
+    _currentKeybindingSelection = static_cast<int>(_data.size() - 1);
     _editModeNewItem = true;
 }
 
@@ -393,12 +393,12 @@ void KeybindingsDialog::checkForNumberKeyConflict(int key) {
 
 void KeybindingsDialog::checkForBindingConflict(int selectedModKey, int selectedKey) {
     const QString localWarn = "Warning: New selection conflicts with binding '";
-    if (_currentKeybindingSelection >= _data.size()) {
+    if (_currentKeybindingSelection >= static_cast<int>(_data.size())) {
         return;
     }
     KeyModifier newModifier = static_cast<KeyModifier>(selectedModKey);
     Key newKey = static_cast<Key>(selectedKey);
-    for (int i = 0; i < _data.size(); ++i) {
+    for (int i = 0; i < static_cast<int>(_data.size()); ++i) {
         if (i == _currentKeybindingSelection) {
             continue;
         }

From 53c05ef1af7c664874f6ddfa58164c4341316b9e Mon Sep 17 00:00:00 2001
From: Micah <micahnyc@gmail.com>
Date: Tue, 3 Aug 2021 11:24:16 -0400
Subject: [PATCH 41/47] updated globetranslation example to code changes

---
 data/assets/examples/globetranslation.asset | 31 ++++++---------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset
index aedc5f5901..1bf8d0089a 100644
--- a/data/assets/examples/globetranslation.asset
+++ b/data/assets/examples/globetranslation.asset
@@ -2,19 +2,11 @@ local assetHelper = asset.require('util/asset_helper')
 local earth = asset.require('scene/solarsystem/planets/earth/earth')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 
-
-local textures = asset.syncedResource({
-  Name = "New Horizons Textures",
-  Type = "HttpSynchronization",
-  Identifier = "newhorizons_textures",
-  Version = 3
-})
-
 local models = asset.syncedResource({
   Name = "New Horizons Model",
   Type = "HttpSynchronization",
   Identifier = "newhorizons_model",
-  Version = 1
+  Version = 2
 })
 
 local Example_Fixed_Height = {
@@ -24,19 +16,15 @@ local Example_Fixed_Height = {
     Translation = {
       Type = "GlobeTranslation",
       Globe = earth.Earth.Identifier,
-      Longitude = 0.0,
-      Latitude = 0.0,
-      FixedAltitude = 10000000.0
+      Longitude = -74.006,
+      Latitude = 40.7128,
+      Altitude = 100000.0
     }
   },
   Renderable = {
     Type = "RenderableModel",
     Body = "NEW HORIZONS",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/NewHorizonsCleanModel.obj",
-      ColorTexture = textures .. "/NHTexture.jpg"
-    }}
+    GeometryFile = models .. "/NewHorizonsCleanModel.obj"
   },
   GUI = {
     Path = "/Example"
@@ -51,17 +39,14 @@ local Example_Adaptive_Height = {
       Type = "GlobeTranslation",
       Globe = earth.Earth.Identifier,
       Longitude = -74.006,
-      Latitude = 40.7128
+      Latitude = 40.7128,
+      UseHeightmap = true
     }
   },
   Renderable = {
     Type = "RenderableModel",
     Body = "NEW HORIZONS",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/NewHorizonsCleanModel.obj",
-      ColorTexture = textures .. "/NHTexture.jpg"
-    }}
+    GeometryFile = models .. "/NewHorizonsCleanModel.obj"
   },
   GUI = {
     Path = "/Example"

From 96c0b36c54d5c1184f3bcb57a973453221cbd531 Mon Sep 17 00:00:00 2001
From: Micah <micahnyc@gmail.com>
Date: Tue, 3 Aug 2021 12:37:38 -0400
Subject: [PATCH 42/47] update pioneer model to include textures

---
 .../scene/solarsystem/missions/pioneer/pioneermodel.asset | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
index 2663f7fb32..f414337170 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
@@ -5,16 +5,12 @@ local modelFolder = asset.syncedResource({
   Name = "Pioneer 10/11 Models",
   Type = "HttpSynchronization",
   Identifier = "pioneer_10_11_model",
-  Version = 2
+  Version = 3
 })
 
 local ModelRenderable = {
   Type = "RenderableModel",
-  Geometry = {{
-    Type = "MultiModelGeometry",
-    GeometryFile = modelFolder .. "/Pioneer.obj",
-    ColorTexture = modelFolder .. "/gray.png"
-  }},
+  GeometryFile = modelFolder .. "/pioneer.fbx",
   LightSources = assetHelper.getDefaultLightSources(
     sunTransforms.SolarSystemBarycenter.Identifier
   )

From 8211b4a1133abfe88d1fe14d074864b1c1b32a5a Mon Sep 17 00:00:00 2001
From: Micah <micahnyc@gmail.com>
Date: Tue, 3 Aug 2021 14:38:05 -0400
Subject: [PATCH 43/47] update apollo boulders for new model code

---
 .../missions/apollo/17/boulder_models.asset    |  2 +-
 .../missions/apollo/17/bouldersstation2.asset  | 18 +++---------------
 .../missions/apollo/17/bouldersstation6.asset  | 18 +++---------------
 .../missions/apollo/17/bouldersstation7.asset  |  6 +-----
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/apollo/17/boulder_models.asset b/data/assets/scene/solarsystem/missions/apollo/17/boulder_models.asset
index 79e51abc09..9e5e6545e8 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/boulder_models.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/boulder_models.asset
@@ -2,7 +2,7 @@ local models = asset.syncedResource({
   Name = "Apollo Boulders Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_boulders",
-  Version = 1
+  Version = 2
 })
 
 asset.export('models', models)
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
index ecf428a649..79d44f2fe0 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
@@ -47,11 +47,7 @@ local Station2Boulder1Model = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/b1-v2.obj",
-      ColorTexture = models .. "/b1-v2_u1_v1.jpeg"
-    }},
+    GeometryFile = models .. "/b1-v2.obj",
     RotationVector = { 243.243256 ,206.270264, 309.677429 },
     LightSources = LightSources,
     PerformShading = false,
@@ -93,11 +89,7 @@ local Station2Boulder2Model = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/b2model.obj",
-      ColorTexture = models .. "/b2model_u1_v1.jpeg"
-    }},
+    GeometryFile = models .. "/b2model.obj",
     RotationVector = { 66.162155, 7.783780, 114.193550 },
     LightSources = LightSources,
     PerformShading = false,
@@ -139,11 +131,7 @@ local Station2Boulder3Model = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/b3model.obj",
-      ColorTexture = models .. "/b3model_u1_v1.jpeg"
-    }},
+    GeometryFile = models .. "/b3model.obj",
     RotationVector = { 161.513519 ,243.243256, 65.806450 },
     LightSources = LightSources,
     PerformShading = false,
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
index 4f476305d2..8574725776 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
@@ -58,11 +58,7 @@ local Station6Frag1Model = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/A17-S6-frag1.obj",
-      ColorTexture = models .. "/A17-S6-frag1.png"
-    }},
+    GeometryFile = models .. "/A17-S6-frag1.obj",
     RotationVector = { 235.909088,165.000000,286.299194 },
     LightSources = LightSources,
     PerformShading = false,
@@ -105,11 +101,7 @@ local Station6Frag2Model = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/station6_boulder_frag2.obj",
-      ColorTexture = models .. "/frag2crop_u1_v1.jpeg"
-    }},
+    GeometryFile = models .. "/station6_boulder_frag2.obj",
     RotationVector = { 336.959991,210.239990,325.984253 },
     LightSources = LightSources,
     PerformShading = false,
@@ -140,11 +132,7 @@ local Station6Frag3Model = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/station6_boulder_frag3.obj",
-      ColorTexture = models .. "/frag3crop_u1_v1.jpeg"
-    }},
+    GeometryFile = models .. "/station6_boulder_frag3.obj",
     RotationVector = { 293.181824,255.000000,4.090910 },
     LightSources = LightSources,
     PerformShading = false,
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
index 26605a4a2a..7a185e33d8 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
@@ -47,11 +47,7 @@ local Station7BoulderModel = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Geometry = {{
-      Type = "MultiModelGeometry",
-      GeometryFile = models .. "/b7model.obj",
-      ColorTexture = models .. "/b7model_u1_v1.jpeg"
-    }},
+    GeometryFile = models .. "/b7model.obj",
     RotationVector = { 1.945950,274.378387,212.903214 },
     LightSources = LightSources,
     PerformShading = false,

From 88708e3bf40162d32724d86c309658568029c593 Mon Sep 17 00:00:00 2001
From: Micah <micahnyc@gmail.com>
Date: Tue, 3 Aug 2021 15:44:03 -0400
Subject: [PATCH 44/47] fixed an issue when loading specified SGCT config
 files; issue/1624

---
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 460313f531..89eb9ce8b8 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -478,7 +478,7 @@ std::string LauncherWindow::selectedWindowConfig() const {
     int idx = _windowConfigBox->currentIndex();
     if (idx == 0) {
         return _sgctConfigName;
-    } else if (idx > _userAssetCount) {
+    } else if (idx > _userConfigCount) {
         return "${CONFIG}/" + _windowConfigBox->currentText().toStdString();
     }
     else {

From f4a1baeeb14870654b67c85a6567f38eb7950bb4 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 4 Aug 2021 13:46:16 +0200
Subject: [PATCH 45/47] Reload UI after adding screenspace renderables or
 assets (closes #1703)

---
 scripts/drag_drop_handler.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua
index fc51b0935c..65ad51302f 100644
--- a/scripts/drag_drop_handler.lua
+++ b/scripts/drag_drop_handler.lua
@@ -29,16 +29,18 @@ is_image_file = function(extension)
          extension == ".pic" or extension == ".pnm"
 end
 
+local ReloadUIScript = [[ if openspace.hasProperty('Modules.CefWebGui.Reload') then openspace.setPropertyValue('Modules.CefWebGui.Reload', nil) end ]]
+
 if is_image_file(extension) then
   identifier = basename_without_extension:gsub(" ", "_")
   return [[openspace.addScreenSpaceRenderable({
     Identifier = "]] .. identifier .. [[",
     Type = "ScreenSpaceImageLocal",
     TexturePath = "]] .. filename .. [["
-  });]]
+  });]] .. ReloadUIScript
 elseif extension == ".asset" then
   return [[openspace.printInfo("Adding asset: ']] .. filename .. [[' (drag-and-drop)");
-    openspace.asset.add("]] .. filename .. [[");]]
+    openspace.asset.add("]] .. filename .. [[");]] .. ReloadUIScript
 elseif extension == ".osrec" or extension == ".osrectxt" then
   return [[openspace.sessionRecording.startPlayback("]] .. basename .. [[")]]
 end

From 7efacd139acfa3d6ec2527cd51da014292e570c5 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 5 Aug 2021 17:19:24 +0200
Subject: [PATCH 46/47] Update version number to 0.17.1

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c17d3703a9..f66c1d9122 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ project(OpenSpace)
 
 set(OPENSPACE_VERSION_MAJOR 0)
 set(OPENSPACE_VERSION_MINOR 17)
-set(OPENSPACE_VERSION_PATCH 0)
+set(OPENSPACE_VERSION_PATCH 1)
 set(OPENSPACE_VERSION_STRING "Beta-10")
 
 set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")

From c5b71d13a5b9d893448f7ddddbc7ecb6df4e1044 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 5 Aug 2021 17:20:55 +0200
Subject: [PATCH 47/47] Update CREDITS.md

---
 CREDITS.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index c7201a953d..f12695c25d 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -4,17 +4,17 @@ Emil Axelsson
 Kalle Bladin
 Jonathas Costa
 Gene Payne
-Jonas Strandstedt
-Michal Marcinkowski
-Elon Olsson
 Emma Broman
+Jonas Strandstedt
 Micah Acinapura
+Michal Marcinkowski
+Malin Ejdbo
+Elon Olsson
 Joakim Kilby
 Lovisa Hassler
 Mikael Petterson 
 Erik Sundén
 Stefan Lindblad
-Malin Ejdbo
 Corrie Roe
 Eric Myers