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

Renamed globalOpacity to globalblackout

Browse Source 
Start application in blackout and fade in after scenegraph has been loaded
This commit is contained in:
Alexander Bock
2015-02-25 09:37:55 +01:00
parent 76fc799717
commit 862c8ffd96
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.cpp
View File

@@ -239,12 +239,10 @@ void mainLogCallback(const char* msg){
void postFXPass(){
glUniform1i(_postFXTexLoc, 0);
if (OsEng.isMaster()){
glUniform1f(_postFXOpacityLoc, 1.f);
}
else{
glUniform1f(_postFXOpacityLoc, OsEng.ref().renderEngine()->globalOpacity());
}
if (OsEng.isMaster())
glUniform1f(_postFXOpacityLoc, 1.f);
else
glUniform1f(_postFXOpacityLoc, OsEng.ref().renderEngine()->globalBlackOutFactor());
}
void setupPostFX(){
@@ -258,4 +256,4 @@ void setupPostFX(){
_postFXOpacityLoc = shader->getUniformLocation("Opacity");
shader->unbind();
_sgctEngine->addPostFX(fx[0]);
}
}