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

Allowing OS to start even if the ring shader doesn't compile.

Browse Source
This commit is contained in:
Jonathas Costa
2020-02-21 11:36:06 -05:00
parent daf9b66328
commit d0c9716872
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/src/ringscomponent.cpp
+19 -13
View File
@@ -258,18 +258,23 @@ bool RingsComponent::isReady() const {
void RingsComponent::initializeGL() {
compileShadowShader();
_geometryOnlyShader = global::renderEngine.buildRenderProgram(
"RingsGeomOnlyProgram",
absPath("${MODULE_GLOBEBROWSING}/shaders/rings_geom_vs.glsl"),
absPath("${MODULE_GLOBEBROWSING}/shaders/rings_geom_fs.glsl")
);
try {
//global::renderEngine.removeRenderProgram(_geometryOnlyShader.get());
_geometryOnlyShader = global::renderEngine.buildRenderProgram(
"RingsGeomOnlyProgram",
absPath("${MODULE_GLOBEBROWSING}/shaders/rings_geom_vs.glsl"),
absPath("${MODULE_GLOBEBROWSING}/shaders/rings_geom_fs.glsl")
);
ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
ghoul::opengl::updateUniformLocations(
*_geometryOnlyShader,
_geomUniformCache,
GeomUniformNames
);
ghoul::opengl::updateUniformLocations(
*_geometryOnlyShader,
_geomUniformCache,
GeomUniformNames
);
}
catch (const ghoul::RuntimeError& e) {
LERROR(e.message);
}
glGenVertexArrays(1, &_quad);
glGenBuffers(1, &_vertexPositionBuffer);
@@ -374,7 +379,7 @@ void RingsComponent::draw(const RenderData& data,
}
void RingsComponent::update(const UpdateData& data) {
if (_shader->isDirty()) {
if (_shader && _shader->isDirty()) {
compileShadowShader();
}
@@ -483,11 +488,12 @@ void RingsComponent::compileShadowShader() {
absPath("${MODULE_GLOBEBROWSING}/shaders/rings_fs.glsl"),
dict
);
ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
}
catch (const ghoul::RuntimeError& e) {
LERROR(e.message);
}
ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
}
bool RingsComponent::isEnabled() const {