Merge branch 'develop' into feature/iSWA

shaders/PowerScaling/powerScalingMath.hglsl

@@ -150,19 +150,19 @@ float pscToLinear(vec2 position) {
  * Note: This needs to be a monotonic function, so that the value can
  * still be used for depth comparison.
  */
-float normalizeFloat(float input) {
-    if (input > 1.0) {
-        return input / pow(10, 27);
+float normalizeFloat(float inpt) {
+    if (inpt > 1.0) {
+        return inpt / pow(10, 27);
     } else {
-        return input - 1.0;
+        return inpt - 1.0;
     }
 }
 
-float denormalizeFloat(float input) {
-    if (input < 0.0) {
-        return input + 1.0;
+float denormalizeFloat(float inpt) {
+    if (inpt < 0.0) {
+        return inpt + 1.0;
     } else {
-        return input * pow(10, 27);
+        return inpt * pow(10, 27);
     }
 }
 

src/engine/downloadmanager.cpp

@@ -290,7 +290,7 @@ std::vector<DownloadManager::FileFuture*> DownloadManager::downloadRequestFiles(
             ++nFiles;
 #ifdef __APPLE__
             // @TODO: Fix this so that the ifdef is not necessary anymore ---abock
-            std::string file = ghoul::filesystem::File(line, true).filename();
+          std::string file = ghoul::filesystem::File(line, ghoul::filesystem::File::RawPath::Yes).filename();
 #else
             std::string file = ghoul::filesystem::File(line).filename();
 #endif

src/rendering/raycastermanager.cpp

@@ -25,6 +25,7 @@
 #include <openspace/rendering/raycastermanager.h>
 #include <openspace/rendering/raycasterlistener.h>
 #include <algorithm>
+#include <string>
 
 namespace {
 	const std::string _loggerCat = "RaycasterManager";