mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update Ghoul repository

Browse Source 
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
This commit is contained in:
Alexander Bock
2017-12-13 21:55:29 -05:00
parent 167222c814
commit 23a446cb2c
53 changed files with 200 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
View File

@@ -182,21 +182,31 @@ bool RenderableModelProjection::isReady() const {
void RenderableModelProjection::initializeGL() {
RenderEngine& renderEngine = OsEng.renderEngine();
_programObject = renderEngine.buildRenderProgram("ModelShader",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModel_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModel_fs.glsl");
_programObject = renderEngine.buildRenderProgram(
"ModelShader",
absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModel_vs.glsl"),
absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModel_fs.glsl")
);
_fboProgramObject = ghoul::opengl::ProgramObject::Build("ProjectionPass",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelProjection_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelProjection_fs.glsl");
_fboProgramObject = ghoul::opengl::ProgramObject::Build(
"ProjectionPass",
absPath(
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelProjection_vs.glsl"
),
absPath(
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelProjection_fs.glsl"
)
);
_fboProgramObject->setIgnoreUniformLocationError(
ghoul::opengl::ProgramObject::IgnoreError::Yes
);
_depthFboProgramObject = ghoul::opengl::ProgramObject::Build("DepthPass",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelDepth_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelDepth_fs.glsl");
_depthFboProgramObject = ghoul::opengl::ProgramObject::Build(
"DepthPass",
absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelDepth_vs.glsl"),
absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModelDepth_fs.glsl")
);
loadTextures();