From d2ae5f1ca26d3617fa02aa866e12860865ab0ece Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Mon, 10 Feb 2020 11:27:02 +0100
Subject: [PATCH] Fix rendering issue due to uninitialized variables

---
 apps/OpenSpace/ext/sgct         |  2 +-
 ext/ghoul                       |  2 +-
 src/rendering/loadingscreen.cpp | 28 ++++++++++++++++------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 5173eceff5..3622605062 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 5173eceff5ac3c8f049acaa38a74c74674e4881d
+Subproject commit 3622605062ae61736426e3d8d26e98524ec1fc97
diff --git a/ext/ghoul b/ext/ghoul
index cf53166024..1f4dcc7863 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit cf5316602430a55fa9bab9b90fc29cc739304969
+Subproject commit 1f4dcc78638a6354a88456e87982a3e3b65d8a38
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index fc4c6748f4..179dfb9e33 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -46,23 +46,27 @@ namespace {
     constexpr const float MessageFontSize = 22.f;
     constexpr const float ItemFontSize = 10.f;
 
-    const glm::vec2 LogoCenter = { 0.f, 0.525f };  // in NDC
-    const glm::vec2 LogoSize = { 0.275f, 0.275 };  // in NDC
+    constexpr const glm::vec2 LogoCenter = glm::vec2(0.f, 0.525f);  // in NDC
+    constexpr const glm::vec2 LogoSize = glm::vec2(0.275f, 0.275);  // in NDC
 
-    const glm::vec2 ProgressbarCenter = { 0.f, -0.75f };  // in NDC
-    const glm::vec2 ProgressbarSize = { 0.7f, 0.0075f };  // in NDC
+    constexpr const glm::vec2 ProgressbarCenter = glm::vec2(0.f, -0.75f);  // in NDC
+    constexpr const glm::vec2 ProgressbarSize = glm::vec2(0.7f, 0.0075f);  // in NDC
     constexpr const float ProgressbarLineWidth = 0.0025f;  // in NDC
 
-    const glm::vec4 ProgressbarOutlineColor = { 0.9f, 0.9f, 0.9f, 1.f };
+    constexpr const glm::vec4 ProgressbarOutlineColor =
+        glm::vec4(0.9f, 0.9f, 0.9f, 1.f);
 
-    const glm::vec4 PhaseColorConstruction = { 0.7f, 0.7f, 0.f, 1.f };
-    const glm::vec4 PhaseColorSynchronization = { 0.9f, 0.9f, 0.9f, 1.f };
-    const glm::vec4 PhaseColorInitialization = { 0.1f, 0.75f, 0.1f, 1.f };
+    constexpr const glm::vec4 PhaseColorConstruction = glm::vec4(0.7f, 0.7f, 0.f, 1.f);
+    constexpr const glm::vec4 PhaseColorSynchronization =
+        glm::vec4(0.9f, 0.9f, 0.9f, 1.f);
+    constexpr const glm::vec4 PhaseColorInitialization =
+        glm::vec4(0.1f, 0.75f, 0.1f, 1.f);
 
-    const glm::vec4 ItemStatusColorStarted = { 0.5f, 0.5f, 0.5f, 1.f };
-    const glm::vec4 ItemStatusColorInitializing = { 0.7f, 0.7f, 0.f, 1.f };
-    const glm::vec4 ItemStatusColorFinished = { 0.1f, 0.75f, 0.1f, 1.f };
-    const glm::vec4 ItemStatusColorFailed = { 0.8f, 0.1f, 0.1f, 1.f };
+    constexpr const glm::vec4 ItemStatusColorStarted = glm::vec4(0.5f, 0.5f, 0.5f, 1.f);
+    constexpr const glm::vec4 ItemStatusColorInitializing =
+        glm::vec4(0.7f, 0.7f, 0.f, 1.f);
+    constexpr const glm::vec4 ItemStatusColorFinished = glm::vec4(0.1f, 0.75f, 0.1f, 1.f);
+    constexpr const glm::vec4 ItemStatusColorFailed = glm::vec4(0.8f, 0.1f, 0.1f, 1.f);
 
     constexpr const float ItemStandoffDistance = 5.f; // in pixels