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

Runtime fix for SpacecraftInstruments module

Browse Source
This commit is contained in:
Alexander Bock
2017-08-16 09:10:03 -04:00
parent 82fd196ddd
commit 4513c4e1e2
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
View File

@@ -139,8 +139,8 @@ void RenderableCrawlingLine::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
_program = renderEngine.buildRenderProgram(
"RenderableCrawlingLine",
"${MODULE_NEWHORIZONS}/shaders/crawlingline_vs.glsl",
"${MODULE_NEWHORIZONS}/shaders/crawlingline_fs.glsl"
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/crawlingline_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/crawlingline_fs.glsl"
);
glGenVertexArrays(1, &_vao);

4
modules/spacecraftinstruments/rendering/renderablefov.cpp
View File

@@ -301,8 +301,8 @@ void RenderableFov::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
_programObject = renderEngine.buildRenderProgram(
"FovProgram",
"${MODULE_NEWHORIZONS}/shaders/fov_vs.glsl",
"${MODULE_NEWHORIZONS}/shaders/fov_fs.glsl"
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/fov_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/fov_fs.glsl"
);
// Fetch information about the specific instrument

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

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

8
modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
View File

@@ -204,14 +204,14 @@ RenderablePlanetProjection::~RenderablePlanetProjection() {}
void RenderablePlanetProjection::initialize() {
_programObject = OsEng.renderEngine().buildRenderProgram(
"projectiveProgram",
"${MODULE_NEWHORIZONS}/shaders/renderablePlanet_vs.glsl",
"${MODULE_NEWHORIZONS}/shaders/renderablePlanet_fs.glsl"
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderablePlanet_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderablePlanet_fs.glsl"
);
_fboProgramObject = ghoul::opengl::ProgramObject::Build(
"fboPassProgram",
"${MODULE_NEWHORIZONS}/shaders/renderablePlanetProjection_vs.glsl",
"${MODULE_NEWHORIZONS}/shaders/renderablePlanetProjection_fs.glsl"
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderablePlanetProjection_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderablePlanetProjection_fs.glsl"
);
loadTextures();

4
modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
View File

@@ -267,8 +267,8 @@ void RenderableShadowCylinder::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
_shader = renderEngine.buildRenderProgram(
"ShadowCylinderProgram",
"${MODULE_NEWHORIZONS}/shaders/terminatorshadow_vs.glsl",
"${MODULE_NEWHORIZONS}/shaders/terminatorshadow_fs.glsl"
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/terminatorshadow_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/terminatorshadow_fs.glsl"
);
}

4
modules/spacecraftinstruments/util/projectioncomponent.cpp
View File

@@ -382,8 +382,8 @@ bool ProjectionComponent::initializeGL() {
if (_dilation.isEnabled) {
_dilation.program = ghoul::opengl::ProgramObject::Build(
"Dilation",
"${MODULE_NEWHORIZONS}/shaders/dilation_vs.glsl",
"${MODULE_NEWHORIZONS}/shaders/dilation_fs.glsl"
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/dilation_vs.glsl",
"${MODULE_SPACECRAFTINSTRUMENTS}/shaders/dilation_fs.glsl"
);
const GLfloat plane[] = {