Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Gamma Correction in inGame options with direct feedback.

This commit is contained in:
Titus Tscharntke 2012-03-13 18:59:33 +00:00
parent 5f95b08c17
commit 38bd33acf9
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/glest_game/graphics/renderer.cpp
View File

@ -6362,7 +6362,10 @@ void Renderer::loadConfig() {
throw runtime_error("this->program == NULL");
}
//if(this->program != NULL) {
this->program->getWindow()->setGamma(gammaValue);
if(gammaValue!=0.0){
this->program->getWindow()->setGamma(gammaValue);
SDL_SetGamma(gammaValue, gammaValue, gammaValue);
}
//}
//load shadows

34
source/glest_game/menu/menu_state_options.cpp
View File

@ -166,10 +166,12 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
listBoxGammaCorrection.registerGraphicComponent(containerName,"listBoxGammaCorrection");
listBoxGammaCorrection.init(currentColumnStart, currentLine, 170);
for (float f=0.0;f<3.1f;f=f+0.1f) {
for (float f=0.5;f<3.0f;f=f+0.1f) {
listBoxGammaCorrection.pushBackItem(floatToStr(f));
}
listBoxGammaCorrection.setSelectedItem(floatToStr(config.getFloat("GammaValue","0.0")));
float gammaValue=config.getFloat("GammaValue","1.0");
if(gammaValue==0.0f) gammaValue=1.0f;
listBoxGammaCorrection.setSelectedItem(floatToStr(gammaValue));
currentLine-=lineOffset;
@ -747,15 +749,6 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
return;
}
string currentGammaCorrection=config.getString("GammaValue","0.0");
string selectedGammaCorrection=listFontSizeAdjustment.getSelectedItem();
if(currentGammaCorrection!=selectedGammaCorrection){
mainMessageBoxState=1;
Lang &lang= Lang::getInstance();
showMessageBox(lang.get("RestartNeeded"), lang.get("GammaCorrection"), false);
return;
}
bool currentFullscreenWindowed=config.getBool("Windowed");
bool selectedFullscreenWindowed = checkBoxFullscreenWindowed.getValue();
if(currentFullscreenWindowed!=selectedFullscreenWindowed){
@ -771,6 +764,19 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
}
else if(buttonAbort.mouseClick(x, y)){
soundRenderer.playFx(coreData.getClickSoundA());
// reset the gamma to former value
string currentGammaCorrection=config.getString("GammaValue","1.0");
string selectedGammaCorrection=listFontSizeAdjustment.getSelectedItem();
if(currentGammaCorrection!=selectedGammaCorrection){
float gammaValue=strToFloat(currentGammaCorrection);
if(gammaValue==0.0f) gammaValue=1.0f;
if(gammaValue!=0.0){
program->getWindow()->setGamma(gammaValue);
SDL_SetGamma(gammaValue, gammaValue, gammaValue);
}
}
mainMenu->setState(new MenuStateRoot(program, mainMenu));
return;
}
@ -801,7 +807,11 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
listBoxShadows.mouseClick(x, y);
listBoxFilter.mouseClick(x, y);
if(listBoxGammaCorrection.mouseClick(x, y)){
program->getWindow()->setGamma(strToFloat(listBoxGammaCorrection.getSelectedItem()));
float gammaValue=strToFloat(listBoxGammaCorrection.getSelectedItem());
if(gammaValue!=0.0){
program->getWindow()->setGamma(gammaValue);
SDL_SetGamma(gammaValue, gammaValue, gammaValue);
}
}
checkBoxTextures3D.mouseClick(x, y);
checkBoxUnitParticles.mouseClick(x, y);