Updated Ghoul version

Adapted to changed Ghoul API
Reenable fading of ScreenLog messages
This commit is contained in:
Alexander Bock
2015-12-11 16:50:21 -05:00
parent e5a3a7a80b
commit ae55078ff8
5 changed files with 4 additions and 5 deletions

View File

@@ -150,6 +150,7 @@ bool RenderableStars::initialize() {
"${MODULE_BASE}/shaders/star_vs.glsl",
"${MODULE_BASE}/shaders/star_fs.glsl",
"${MODULE_BASE}/shaders/star_ge.glsl");
if (!_program)
return false;
completeSuccess &= loadData();

View File

@@ -65,4 +65,4 @@ vec4 z_normalization(vec4 v_in) {
return v_out;
}
#endif
#endif

View File

@@ -272,7 +272,7 @@ bool OpenSpaceEngine::create(
_engine->_console->initialize();
// Register the provided shader directories
ghoul::opengl::ShaderPreprocessor::addIncludePath("${SHADERS}");
ghoul::opengl::ShaderPreprocessor::addIncludePath(absPath("${SHADERS}"));
_engine->_syncBuffer = new SyncBuffer(1024);

View File

@@ -656,8 +656,6 @@ void RenderEngine::render(const glm::mat4 &projectionMatrix, const glm::mat4 &vi
alpha = (p <= 0.f) ? 0.f : pow(p, 0.3f);
}
alpha = 1.f;
// Since all log entries are ordered, once one exceeds alpha, all have
if (alpha <= 0.0)
break;