TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temp disables fullscreen on Windows platform due to various system behavioral issues with it

Browse source 
Integrates the HDR's bloom toggle into the Shader Quality setting
This commit is contained in:
Areloch 2022-09-03 14:40:10 -05:00
parent f4a6a0f7ae
commit 628532d006
5 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/BaseGame/game/core/gui/scripts/canvas.tscript
View file

@ -54,7 +54,10 @@ $WORD::FULLSCREEN = 2;
$WORD::BITDEPTH = 3; $WORD::BITDEPTH = 3;
$WORD::REFRESH = 4; $WORD::REFRESH = 4;
$WORD::AA = 5; $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::ModeWindowed = 0;
$Video::ModeBorderless = 1; $Video::ModeBorderless = 1;
$Video::ModeFullscreen = 2; $Video::ModeFullscreen = 2;

4
Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript
View file

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

2
Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript
View file

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

6
Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
View file

@ -538,6 +538,12 @@ function updateGraphicsSettings()
DecalLifetimeGroup.applySetting($pref::Graphics::DecalLifetime); DecalLifetimeGroup.applySetting($pref::Graphics::DecalLifetime);
if($pref::Graphics::GroundCoverDensity !$= getCurrentQualityLevel(GroundCoverDensityGroup)) if($pref::Graphics::GroundCoverDensity !$= getCurrentQualityLevel(GroundCoverDensityGroup))
GroundCoverDensityGroup.applySetting($pref::Graphics::GroundCoverDensity); 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() function updateDisplaySettings()

2
Templates/BaseGame/game/data/defaults.tscript
View file

@ -208,3 +208,5 @@ $pref::PostFX::EnableVignette = 1;
$pref::PostFX::EnableLightRays = 1; $pref::PostFX::EnableLightRays = 1;
$pref::PostFX::EnableHDR = 1; $pref::PostFX::EnableHDR = 1;
$pref::PostFX::EnableSSAO = 1; $pref::PostFX::EnableSSAO = 1;
$pref::PostFX::EnableHDRBloom = 1;