MariENB 1.2015.6.28
This commit is contained in:
parent
9e96fe18cc
commit
a00a0e3541
7 changed files with 93 additions and 98 deletions
|
|
@ -136,25 +136,27 @@ float4 PS_SSAOPrepass( VS_OUTPUT_POST IN, float2 vPos : VPOS ) : COLOR
|
|||
else bresl = float2(ScreenSize.x,ScreenSize.x*ScreenSize.w);
|
||||
float3 normal = pseudonormal(depth,coord);
|
||||
float2 nc = coord*(bresl/256.0);
|
||||
float radiusfade = lerp(1.0,pow(1.0-depth,ssaorfadep),ssaorfade);
|
||||
float2 bof = float2(1.0/bresl.x,1.0/bresl.y)*ssaoradius*radiusfade;
|
||||
float2 nc2 = tex2D(SamplerNoise3,nc+48000.0*Timer.x).xy;
|
||||
float2 bof = float2(1.0/bresl.x,1.0/bresl.y)*ssaoradius;
|
||||
float2 nc2 = tex2D(SamplerNoise3,nc+48000.0*Timer.x*ssaonoise).xy;
|
||||
float3 rnormal = tex2D(SamplerNoise3,nc2).xyz*2.0-1.0;
|
||||
rnormal.z = -abs(rnormal.z);
|
||||
normal = normalize(normal+rnormal*ssaonoise);
|
||||
rnormal = normalize(rnormal);
|
||||
normal = normalize(normal);
|
||||
float occ = 0.0;
|
||||
int i;
|
||||
float3 sample;
|
||||
float sdepth, rangecheck;
|
||||
float sclamp = (ssaocfact/1000.0)/radiusfade;
|
||||
float sdepth, so, delta;
|
||||
float sclamp = ssaoclamp/1000.0;
|
||||
[unroll] for ( i=0; i<64; i++ )
|
||||
{
|
||||
sample = reflect(ssao_samples[i],normal);
|
||||
sdepth = depthlinear(coord+sample.xy*bof);
|
||||
if ( ldepth <= sdepth ) occ += 1.0;
|
||||
else occ += saturate((abs(ldepth-sdepth)-sclamp)/sclamp);
|
||||
sample = reflect(ssao_samples[i],rnormal);
|
||||
sample *= sign(dot(normal,sample));
|
||||
so = ldepth-sample.z*bof;
|
||||
sdepth = depthlinear(coord+bof*sample.xy/ldepth);
|
||||
delta = saturate(so-sdepth);
|
||||
delta *= 1.0-smoothstep(0.0,sclamp,delta);
|
||||
if ( (delta > 0.0) && (delta < sclamp) ) occ += 1.0-delta;
|
||||
}
|
||||
float uocc = saturate(1.0-occ/64.0);
|
||||
float uocc = saturate(occ/64.0);
|
||||
float fade = 1.0-depth;
|
||||
uocc *= saturate(pow(fade,ssaofadepow)*ssaofademult);
|
||||
uocc = saturate(pow(uocc,ssaopow)*ssaomult);
|
||||
|
|
|
|||
|
|
@ -666,12 +666,14 @@ float ssaoradius
|
|||
<
|
||||
string UIName = "SSAORadius";
|
||||
string UIWidget = "Spinner";
|
||||
> = {256.0};
|
||||
float ssaonoise
|
||||
> = {1.0};
|
||||
int ssaonoise
|
||||
<
|
||||
string UIName = "SSAONoise";
|
||||
string UIWidget = "Spinner";
|
||||
> = {0.15};
|
||||
int UIMin = 0;
|
||||
int UIMax = 1;
|
||||
> = {1};
|
||||
float ssaofadepow_n
|
||||
<
|
||||
string UIName = "SSAOFadePowerNight";
|
||||
|
|
@ -747,30 +749,18 @@ float ssaobfact
|
|||
string UIName = "SSAOBilateralFactor";
|
||||
string UIWidget = "Spinner";
|
||||
> = {10000.0};
|
||||
float ssaocfact
|
||||
float ssaoclamp
|
||||
<
|
||||
string UIName = "SSAOClampFactor";
|
||||
string UIName = "SSAOClamp";
|
||||
string UIWidget = "Spinner";
|
||||
> = {0.1};
|
||||
float UIMin = 0.0;
|
||||
> = {1.0};
|
||||
float ssaobradius
|
||||
<
|
||||
string UIName = "SSAOBlurRadius";
|
||||
string UIWidget = "Spinner";
|
||||
float UIMin = 0.0;
|
||||
> = {1.0};
|
||||
float ssaorfade
|
||||
<
|
||||
string UIName = "SSAORadiusFade";
|
||||
string UIWidget = "Spinner";
|
||||
float UIMin = 0.0;
|
||||
float UIMax = 1.0;
|
||||
> = {1.0};
|
||||
float ssaorfadep
|
||||
<
|
||||
string UIName = "SSAORadiusFadeCurve";
|
||||
string UIWidget = "Spinner";
|
||||
float UIMin = 0.0;
|
||||
> = {0.25};
|
||||
bool ssaodebug
|
||||
<
|
||||
string UIName = "DebugSSAO";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ DetectorLevelNight=0.15
|
|||
DetectorLevelCurve=0.95
|
||||
|
||||
[ADAPTATION]
|
||||
ForceMinMaxValues=true
|
||||
ForceMinMaxValues=false
|
||||
AdaptationSensitivity=0.35
|
||||
AdaptationTime=3.0
|
||||
AdaptationMin=0.4
|
||||
|
|
@ -98,59 +98,59 @@ AmbientLightingDesaturationDay=0.0
|
|||
AmbientLightingDesaturationNight=0.0
|
||||
AmbientLightingDesaturationInterior=0.0
|
||||
|
||||
FogColorMultiplierDay=0.75
|
||||
FogColorMultiplierDay=1.0
|
||||
FogColorMultiplierNight=0.75
|
||||
FogColorMultiplierInterior=0.75
|
||||
FogColorCurveDay=1.5
|
||||
FogColorMultiplierInterior=0.5
|
||||
FogColorCurveDay=1.0
|
||||
FogColorCurveNight=1.5
|
||||
FogColorCurveInterior=1.5
|
||||
FogColorCurveInterior=2.0
|
||||
|
||||
[SKY]
|
||||
Enable=true
|
||||
|
||||
StarsIntensity=0.27
|
||||
StarsCurve=1.79
|
||||
StarsIntensity=0.25
|
||||
StarsCurve=1.5
|
||||
|
||||
CloudsIntensityDay=0.960001
|
||||
CloudsIntensityNight=0.600001
|
||||
CloudsCurveDay=1.02
|
||||
CloudsCurveNight=1.07
|
||||
CloudsIntensityDay=1.0
|
||||
CloudsIntensityNight=0.5
|
||||
CloudsCurveDay=1.0
|
||||
CloudsCurveNight=1.0
|
||||
CloudsDesaturationDay=0.0
|
||||
CloudsDesaturationNight=0.0
|
||||
|
||||
CloudsEdgeClamp=0.24
|
||||
CloudsEdgeIntensity=0.74
|
||||
CloudsEdgeClamp=0.25
|
||||
CloudsEdgeIntensity=0.75
|
||||
|
||||
GradientIntensityDay=1.310001
|
||||
GradientIntensityNight=0.88
|
||||
GradientIntensityDay=1.2
|
||||
GradientIntensityNight=0.8
|
||||
|
||||
GradientDesaturationDay=0.3
|
||||
GradientDesaturationNight=0.21
|
||||
GradientDesaturationDay=0.0
|
||||
GradientDesaturationNight=0.0
|
||||
|
||||
GradientTopIntensityDay=1.24
|
||||
GradientTopIntensityNight=1.1
|
||||
GradientTopCurveDay=1.17
|
||||
GradientTopCurveNight=1.08
|
||||
GradientTopIntensityDay=1.0
|
||||
GradientTopIntensityNight=1.0
|
||||
GradientTopCurveDay=1.0
|
||||
GradientTopCurveNight=1.0
|
||||
|
||||
GradientMiddleIntensityDay=1.17
|
||||
GradientMiddleIntensityNight=0.95
|
||||
GradientMiddleCurveDay=0.81
|
||||
GradientMiddleCurveNight=1.16
|
||||
GradientMiddleIntensityDay=1.0
|
||||
GradientMiddleIntensityNight=1.0
|
||||
GradientMiddleCurveDay=1.0
|
||||
GradientMiddleCurveNight=1.0
|
||||
|
||||
GradientHorizonIntensityDay=1.27
|
||||
GradientHorizonIntensityNight=0.58
|
||||
GradientHorizonCurveDay=1.16
|
||||
GradientHorizonCurveNight=1.18
|
||||
GradientHorizonIntensityDay=1.0
|
||||
GradientHorizonIntensityNight=1.0
|
||||
GradientHorizonCurveDay=1.0
|
||||
GradientHorizonCurveNight=1.0
|
||||
|
||||
SunIntensity=2.14
|
||||
SunIntensity=2.0
|
||||
SunDesaturation=0.0
|
||||
SunCoronaIntensity=1.231
|
||||
SunCoronaCurve=1.16
|
||||
SunCoronaIntensity=1.0
|
||||
SunCoronaCurve=1.0
|
||||
SunCoronaDesaturation=0.0
|
||||
MoonIntensity=1.18
|
||||
MoonCurve=0.95
|
||||
MoonIntensity=1.0
|
||||
MoonCurve=1.0
|
||||
MoonDesaturation=0.0
|
||||
MoonCoronaIntensity=0.971
|
||||
MoonCoronaIntensity=1.0
|
||||
|
||||
[DEPTHOFFIELD]
|
||||
FadeTime=0.4
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ PaletteType=1
|
|||
CGAPalette=4
|
||||
EGAPalette=0
|
||||
DitherMode=4
|
||||
GammaMod=0.25
|
||||
GammaMod=1.0
|
||||
DitherBump=-0.2
|
||||
DitherMultiplier=0.35
|
||||
SaturationMod=1.5
|
||||
DitherMultiplier=0.4
|
||||
SaturationMod=1.0
|
||||
EnablePainting=false
|
||||
PaintingRadius=0.5
|
||||
PaintingMedianRadius=1.0
|
||||
|
|
|
|||
|
|
@ -13,18 +13,18 @@ BloomIntensityNight=1.14
|
|||
BloomIntensityDay=1.12
|
||||
BloomIntensityInteriorNight=1.18
|
||||
BloomIntensityInteriorDay=1.15
|
||||
BloomPowerNight=1.04
|
||||
BloomPowerDay=1.02
|
||||
BloomPowerInteriorNight=1.06
|
||||
BloomPowerInteriorDay=1.01
|
||||
BloomSaturationNight=0.78
|
||||
BloomSaturationDay=0.72
|
||||
BloomSaturationInteriorNight=0.85
|
||||
BloomSaturationInteriorDay=0.71
|
||||
BloomBumpNight=-0.28
|
||||
BloomBumpDay=-0.36
|
||||
BloomBumpInteriorNight=-0.23
|
||||
BloomBumpInteriorDay=-0.31
|
||||
BloomPowerNight=1.03
|
||||
BloomPowerDay=1.01
|
||||
BloomPowerInteriorNight=1.04
|
||||
BloomPowerInteriorDay=1.02
|
||||
BloomSaturationNight=0.68
|
||||
BloomSaturationDay=0.58
|
||||
BloomSaturationInteriorNight=0.71
|
||||
BloomSaturationInteriorDay=0.6
|
||||
BloomBumpNight=-0.31
|
||||
BloomBumpDay=-0.41
|
||||
BloomBumpInteriorNight=-0.28
|
||||
BloomBumpInteriorDay=-0.35
|
||||
BloomCapNight=100.0
|
||||
BloomCapDay=100.0
|
||||
BloomCapInteriorNight=100.0
|
||||
|
|
@ -46,10 +46,10 @@ BlueShiftIntensityDay=0.47
|
|||
BlueShiftIntensityInteriorNight=0.74
|
||||
BlueShiftIntensityInteriorDay=0.66
|
||||
EnableAnamorphicBloom=true
|
||||
AnamBlendNight=0.84
|
||||
AnamBlendDay=0.73
|
||||
AnamBlendInteriorNight=0.88
|
||||
AnamBlendInteriorDay=0.79
|
||||
AnamBlendNight=0.54
|
||||
AnamBlendDay=0.43
|
||||
AnamBlendInteriorNight=0.61
|
||||
AnamBlendInteriorDay=0.51
|
||||
AnamBlueShiftColorNightRed=0.35
|
||||
AnamBlueShiftColorNightGreen=0.08
|
||||
AnamBlueShiftColorNightBlue=1.0
|
||||
|
|
@ -64,11 +64,11 @@ AnamBlueShiftColorInteriorDayGreen=0.42
|
|||
AnamBlueShiftColorInteriorDayBlue=1.0
|
||||
AnamBlueShiftIntensityNight=4.44
|
||||
AnamBlueShiftIntensityDay=3.2
|
||||
AnamBlueShiftIntensityInteriorNight=5.88
|
||||
AnamBlueShiftIntensityInteriorNight=5.87
|
||||
AnamBlueShiftIntensityInteriorDay=4.03
|
||||
AnamPowerNight=1.05
|
||||
AnamPowerDay=1.11
|
||||
AnamPowerInteriorNight=1.03
|
||||
AnamPowerInteriorNight=1.04
|
||||
AnamPowerInteriorDay=1.07
|
||||
AnamLengthMultiplier=4.0
|
||||
BloomAngle=0.0
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ GrainPower=2.67
|
|||
UseCurve=false
|
||||
CurveChromaAberration=0.03
|
||||
UseAdaptation=true
|
||||
AdaptationMinNight=0.41
|
||||
AdaptationMinDay=0.38
|
||||
AdaptationMinInteriorNight=0.49
|
||||
AdaptationMinInteriorDay=0.46
|
||||
AdaptationMinNight=0.6
|
||||
AdaptationMinDay=0.48
|
||||
AdaptationMinInteriorNight=0.52
|
||||
AdaptationMinInteriorDay=0.42
|
||||
AdaptationMaxNight=1.03
|
||||
AdaptationMaxDay=1.13
|
||||
AdaptationMaxInteriorNight=1.18
|
||||
|
|
|
|||
|
|
@ -72,8 +72,8 @@ EdgeFadeMultiplierInteriorDay=800.0
|
|||
EdgePower=0.5
|
||||
EdgeMultiplier=128.0
|
||||
SSAOEnable=false
|
||||
SSAORadius=1024.0
|
||||
SSAONoise=0.15
|
||||
SSAORadius=1.0
|
||||
SSAONoise=1
|
||||
SSAOFadePowerNight=0.17
|
||||
SSAOFadePowerDay=0.19
|
||||
SSAOFadePowerInteriorNight=0.12
|
||||
|
|
@ -83,23 +83,23 @@ SSAOFadeMultiplierDay=2.23
|
|||
SSAOFadeMultiplierInteriorNight=2.08
|
||||
SSAOFadeMultiplierInteriorDay=2.15
|
||||
SSAOMultiplier=1.0
|
||||
SSAOPower=2.0
|
||||
SSAOPower=1.5
|
||||
SSAOBlend=1.0
|
||||
SSAOBlurEnable=true
|
||||
SSAOBilateralFactor=10000.0
|
||||
SSAOClampFactor=0.25
|
||||
SSAOBilateralFactor=1000.0
|
||||
SSAOClampFactor=0.1
|
||||
SSAOBlurRadius=1.0
|
||||
DebugSSAO=false
|
||||
SharpenEnable=true
|
||||
SharpenRadius=0.8
|
||||
SharpenClamp=0.02
|
||||
SharpenBlending=1.5
|
||||
SSAORadiusFade=1.0
|
||||
SSAORadiusFade=0.0
|
||||
SSAORadiusFadeCurve=1.0
|
||||
UnderwaterEnable=false
|
||||
HeatEnable=true
|
||||
HeatSize=2.49
|
||||
HeatSpeed=1.3
|
||||
HeatSpeed=1.2
|
||||
HeatFadePower=319.76001
|
||||
HeatFadeMultiplier=1.1
|
||||
HeatStrength=0.66
|
||||
|
|
@ -141,3 +141,6 @@ DoFFixedUnfocusedBumpDay=0.0
|
|||
DoFFixedUnfocusedBumpInteriorNight=0.0
|
||||
DoFFixedUnfocusedBumpInteriorDay=0.0
|
||||
EdgeRadius=1.0
|
||||
SSAOMinDepth=0.0
|
||||
SSAOMaxDepth=0.5
|
||||
SSAOClamp=0.5
|
||||
|
|
|
|||
Reference in a new issue