diff --git a/Templates/BaseGame/game/core/postFX/scripts/Bloom/BloomPostFX.tscript b/Templates/BaseGame/game/core/postFX/scripts/Bloom/BloomPostFX.tscript index cccc9f288..06e810fec 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/Bloom/BloomPostFX.tscript +++ b/Templates/BaseGame/game/core/postFX/scripts/Bloom/BloomPostFX.tscript @@ -85,12 +85,7 @@ singleton GFXStateBlockData( BloomPostFX_SampleStateBlock : PFX_DefaultStateBloc }; singleton GFXStateBlockData( BloomPostFX_Add_SampleStateBlock : PFX_DefaultStateBlock ) -{ - alphaDefined = true; - alphaTestEnable = true; - alphaTestRef = 1; - alphaTestFunc = GFXCmpGreaterEqual; - +{ // Do a one to one blend. blendDefined = true; blendEnable = true; diff --git a/Templates/BaseGame/game/core/postFX/scripts/Bloom/bloomStrengthP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/Bloom/bloomStrengthP.hlsl index 8cf4f99eb..79d17f535 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/Bloom/bloomStrengthP.hlsl +++ b/Templates/BaseGame/game/core/postFX/scripts/Bloom/bloomStrengthP.hlsl @@ -45,7 +45,6 @@ float4 main(PFXVertToPix IN) : TORQUE_TARGET0 #if defined(USE_DIRT) upSample.rgb += upSample.rgb * dirt; - //upSample.rgb = dirt; #endif return upSample; diff --git a/Templates/BaseGame/game/core/postFX/scripts/Bloom/bloomThresholdP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/Bloom/bloomThresholdP.hlsl index 92c4f5943..5a8b44143 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/Bloom/bloomThresholdP.hlsl +++ b/Templates/BaseGame/game/core/postFX/scripts/Bloom/bloomThresholdP.hlsl @@ -29,7 +29,6 @@ float4 main(PFXVertToPix IN) : TORQUE_TARGET0 { float4 screenColor = TORQUE_TEX2D(inputTex, IN.uv0); float brightness = max(screenColor.r, max(screenColor.g, screenColor.b)); - float contribution = pow(brightness, threshold * 10.0f); - contribution /= max(brightness, 0.0001f); + float contribution = saturate(brightness - threshold); return screenColor * contribution; } diff --git a/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript index 5ba779126..8c7334b66 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript +++ b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript @@ -1,11 +1,14 @@ $PostFX::BloomPostFX::Enabled = "1"; -$PostFX::BloomPostFX::threshold = "0.721153855"; -$PostFX::BloomPostFX::intensity = "0.5"; -$PostFX::BloomPostFX::radius = "8"; +$PostFX::BloomPostFX::threshold = "0.403846145"; +$PostFX::BloomPostFX::intensity = "1"; +$PostFX::BloomPostFX::radius = "4"; $PostFX::BloomPostFX::dirtEnabled = "1"; $PostFX::BloomPostFX::dirtScale = 2048; -$PostFX::BloomPostFX::dirtIntensity = "2"; +$PostFX::BloomPostFX::dirtIntensity = "10"; $PostFX::BloomPostFX::dirtImage = "core/postFX/images/lensDirt.png"; +$PostFX::BloomPostFX::dirtEdgeMinDist = "0.125"; +$PostFX::BloomPostFX::dirtEdgeMaxDist = "0.75"; +$PostFX::BloomPostFX::dirtEdgeMinVal = "0.057692308"; $PostFX::HDRPostFX::Enabled = 1; $PostFX::HDRPostFX::exposureValue = 1; $PostFX::HDRPostFX::minLuminace = 0.001;