2
0
Эх сурвалжийг харах

Merge pull request #925 from Azaezel/alpha402/bloomHack

bloom fix fallback
Brian Roberts 2 жил өмнө
parent
commit
a56a7312b3

+ 1 - 1
Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomStrengthP.glsl

@@ -48,7 +48,7 @@ void main()
     vec3 dirt = texture(dirtTex, IN_uv0 / (dirtParams.xy * oneOverTargetSize)).rgb * dirtParams.z * edge;
   #endif
   
-  vec4 upSample = texture(inputTex, IN_uv0) * strength;
+  vec4 upSample = texture(inputTex, IN_uv0) * (strength+1.0);
   
   #ifdef USE_DIRT
     upSample.rgb += upSample.rgb * dirt;

+ 1 - 1
Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/bloomStrengthP.hlsl

@@ -42,7 +42,7 @@ float4 main(PFXVertToPix IN) : TORQUE_TARGET0
     float3 dirt = TORQUE_TEX2D(dirtTex, IN.uv0 / (dirtParams.xy * oneOverTargetSize)).rgb * dirtParams.z * edge;
   #endif
   
-  float4 upSample = TORQUE_TEX2D(inputTex, IN.uv0) * strength;
+  float4 upSample = TORQUE_TEX2D(inputTex, IN.uv0) * (strength+1.0);
   
   #ifdef USE_DIRT
     upSample.rgb += upSample.rgb * dirt;

+ 12 - 12
Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript

@@ -1,26 +1,26 @@
 $PostFX::HDRPostFX::Enabled = 1;
 $PostFX::HDRPostFX::exposureValue = "1.5";
-$PostFX::HDRPostFX::whitePoint = "4";
+$PostFX::HDRPostFX::whitePoint = "2";
 $PostFX::HDRPostFX::logContrast = 1;
 $PostFX::HDRPostFX::saturationValue = "1";
 $PostFX::HDRPostFX::colorFilter = "1 1 1 1";
-$PostFX::HDRPostFX::minLuminace = 0.001;
+$PostFX::HDRPostFX::minLuminace = "0";
 $PostFX::HDRPostFX::whiteCutoff = 1;
 $PostFX::HDRPostFX::adaptRate = "0.8";
 $PostFX::HDRPostFX::tonemapMode = "ACES";
-$PostFX::HDRPostFX::enableAutoExposure = "1";
-$PostFX::HDRPostFX::keyValue = "0.115";
+$PostFX::HDRPostFX::enableAutoExposure = "0";
+$PostFX::HDRPostFX::keyValue = "0.200000003";
 $PostFX::HDRPostFX::enableBloom = "1";
-$PostFX::HDRPostFX::threshold = "0.3";
-$PostFX::HDRPostFX::intensity = "0.5";
+$PostFX::HDRPostFX::threshold = "1";
+$PostFX::HDRPostFX::intensity = "1";
 $PostFX::HDRPostFX::radius = "5";
-$PostFX::HDRPostFX::enableDirt = 1;
+$PostFX::HDRPostFX::enableDirt = "1";
 $PostFX::HDRPostFX::dirtScale = 2048;
-$PostFX::HDRPostFX::dirtIntensity = 2;
-$PostFX::HDRPostFX::dirtImage = "core/postFX/images/lensDirt.png";
-$PostFX::HDRPostFX::dirtEdgeMinDist = 0.125;
-$PostFX::HDRPostFX::dirtEdgeMaxDist = 0.75;
-$PostFX::HDRPostFX::dirtEdgeMinVal = 0.05;
+$PostFX::HDRPostFX::dirtIntensity = "1";
+$PostFX::HDRPostFX::dirtImage = "Core_PostFX:lensDirt_image";
+$PostFX::HDRPostFX::dirtEdgeMinDist = "0.0218579229";
+$PostFX::HDRPostFX::dirtEdgeMaxDist = "0.0546448082";
+$PostFX::HDRPostFX::dirtEdgeMinVal = "0.0437158458";
 $PostFX::VignettePostFX::Enabled = "1";
 $PostFX::VignettePostFX::VMin = 0.2;
 $PostFX::VignettePostFX::VMax = "0.9";