Merge pull request #880 from Areloch/FullscreenFix_and_BloomPref

Fullscreen 'Fix' and Bloom Pref

Templates/BaseGame/game/core/gui/scripts/canvas.tscript

@@ -54,7 +54,10 @@ $WORD::FULLSCREEN = 2;
 $WORD::BITDEPTH = 3;
 $WORD::REFRESH = 4;
 $WORD::AA = 5;
-$Video::ModeTags = "Windowed\tBorderless\tFullscreen";
+if($platform $= "windows")
+   $Video::ModeTags = "Windowed\tBorderless";
+else
+   $Video::ModeTags = "Windowed\tBorderless\tFullscreen";
 $Video::ModeWindowed = 0;
 $Video::ModeBorderless = 1;
 $Video::ModeFullscreen = 2;

Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript

@@ -294,7 +294,7 @@ function HDRPostFX::setShaderConsts( %this )
    
    // /----- BLOOM CONSTS -----/
    %bloom = %this->hdrbloom;
-   %bloom.skip = !$PostFX::HDRPostFX::enableBloom;
+   %bloom.skip = (!$PostFX::HDRPostFX::enableBloom || !$pref::PostFX::EnableHDRBloom);
 
    %bloom.setShaderConst("$threshold", $PostFX::HDRPostFX::threshold);
 
@@ -305,7 +305,7 @@ function HDRPostFX::setShaderConsts( %this )
    }
 
    %strength = $PostFX::HDRPostFX::intensity;
-   if (!$PostFX::HDRPostFX::enableBloom)
+   if (!$PostFX::HDRPostFX::enableBloom || !$pref::PostFX::EnableHDRBloom)
       %strength = 0.0;
    
    %bloomFinal = %this->hdrbloom_end;

Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript

@@ -599,6 +599,7 @@ new SimGroup( ShaderQualityGroup )
       
       key["$pref::Video::disablePixSpecular"] = false;
       key["$pref::Video::disableNormalmapping"] = false;
+      key["$pref::PostFX::EnableHDRBloom"] = true;
    };
    new ArrayObject()
    {
@@ -609,6 +610,7 @@ new SimGroup( ShaderQualityGroup )
       
       key["$pref::Video::disablePixSpecular"] = true;
       key["$pref::Video::disableNormalmapping"] = true;
+      key["$pref::PostFX::EnableHDRBloom"] = false;
    };
 };
 

Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript

@@ -538,6 +538,12 @@ function updateGraphicsSettings()
       DecalLifetimeGroup.applySetting($pref::Graphics::DecalLifetime);
    if($pref::Graphics::GroundCoverDensity !$= getCurrentQualityLevel(GroundCoverDensityGroup))
       GroundCoverDensityGroup.applySetting($pref::Graphics::GroundCoverDensity);
+   if($pref::Graphics::ShaderQuality !$= getCurrentQualityLevel(ShaderQualityGroup))
+   {
+      ShaderQualityGroup.applySetting($pref::Graphics::ShaderQuality);
+      //this has ties into postFX behaviors, so we'll force an update to it here
+      updatePostFXSettings();
+   }
 }
 
 function updateDisplaySettings()

Templates/BaseGame/game/data/defaults.tscript

@@ -207,4 +207,6 @@ $PostFXManager::Settings::EnableDOF = 1;
 $pref::PostFX::EnableVignette = 1;
 $pref::PostFX::EnableLightRays = 1;
 $pref::PostFX::EnableHDR = 1;
-$pref::PostFX::EnableSSAO = 1;
+$pref::PostFX::EnableSSAO = 1;
+
+$pref::PostFX::EnableHDRBloom = 1;