mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added additional absPath where necessary

Browse Source
This commit is contained in:
Alexander Bock
2017-12-18 14:47:58 -05:00
parent 0b0ad54028
commit 966df322cf
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+3 -3
View File
@@ -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
+2 -1
View File
@@ -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>
@@ -298,7 +299,7 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
#endif // GLOBEBROWSING_USE_GDAL
},
{
"${MODULE_GLOBEBROWSING}/scripts/layer_support.lua"
absPath("${MODULE_GLOBEBROWSING}/scripts/layer_support.lua")
},
{
// Documentation