Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

modules/digitaluniverse/rendering/renderablebillboardscloud.cpp

@@ -1361,9 +1361,9 @@ void RenderableBillboardsCloud::loadPolygonGeometryForRendering() {
 void RenderableBillboardsCloud::renderPolygonGeometry(GLuint vao) {
     std::unique_ptr<ghoul::opengl::ProgramObject> program = 
         ghoul::opengl::ProgramObject::Build("RenderableBillboardsCloud_Polygon",
-        "${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_vs.glsl",
-        "${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_fs.glsl",
-        "${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_gs.glsl");
+        absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_vs.glsl"),
+        absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_fs.glsl"),
+        absPath("${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_gs.glsl"));
 
     program->activate();
     static const float black[] = { 0.0f, 0.0f, 0.0f, 0.0f };

modules/globebrowsing/globebrowsingmodule.cpp

@@ -48,6 +48,7 @@
 #include <openspace/interaction/navigationhandler.h>
 #include <openspace/util/factorymanager.h>
 
+#include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/templatefactory.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/systemcapabilities/generalcapabilitiescomponent.h>
@@ -306,7 +307,7 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
 #endif  // GLOBEBROWSING_USE_GDAL
         },
         {
-            "${MODULE_GLOBEBROWSING}/scripts/layer_support.lua"
+            absPath("${MODULE_GLOBEBROWSING}/scripts/layer_support.lua")
         },
         {
             // Documentation

modules/touch/include/touchmarker.h

@@ -65,9 +65,9 @@ class TouchMarker : public properties::PropertyOwner {
 
         std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 
-        GLuint _quad;
-        GLuint _vertexPositionBuffer;
-        int _numFingers;
+        GLuint _quad = 0;
+        GLuint _vertexPositionBuffer = 0;
+        int _numFingers = 0;
 };
 
 } // openspace namespace

scripts/configuration_helper.lua

@@ -290,7 +290,7 @@ function generateSettings(arg)
 
     local refresh = ""
     if arg["refreshRate"] then
-        refresh = "refreshRate=" .. arg["refreshRate"] .. " "
+        refresh = "refreshRate=\"" .. arg["refreshRate"] .. "\" "
     end
 
 

src/engine/openspaceengine.cpp

@@ -874,8 +874,7 @@ void OpenSpaceEngine::loadFonts() {
     _fontManager = std::make_unique<ghoul::fontrendering::FontManager>(FontAtlasSize);
 
     for (const std::string& key : fonts.keys()) {
-        std::string font = fonts.value<std::string>(key);
-        font = absPath(font);
+        std::string font = absPath(fonts.value<std::string>(key));
 
         if (!FileSys.fileExists(font)) {
             LERROR("Could not find font '" << font << "'");

src/scripting/scriptengine.cpp

@@ -280,7 +280,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
 
     for (const std::string& script : library.scripts) {
         // First we run the script to set its values in the current state
-        ghoul::lua::runScriptFile(state, absPath(script));
+        ghoul::lua::runScriptFile(state, script);
 
         library.documentations.clear();
 

src/util/openspacemodule.cpp

@@ -106,7 +106,7 @@ std::string OpenSpaceModule::modulePath() const {
     else { // Otherwise, it might be one of the external directories
         for (const char* dir : ModulePaths) {
             const std::string path = std::string(dir) + '/' + moduleName;
-            if (FileSys.directoryExists(path)) {
+            if (FileSys.directoryExists(absPath(path))) {
                 return absPath(path);
             }
         }