Skip to content
This repository was archived by the owner on Nov 30, 2020. It is now read-only.

Commit 8259630

Browse files
committed
Hard wire attenuation to its default value
1 parent 13b7832 commit 8259630

4 files changed

Lines changed: 6 additions & 14 deletions

File tree

PostProcessing/Editor/Effects/ScreenSpaceReflectionsEditor.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public sealed class ScreenSpaceReflectionsEditor : PostProcessEffectEditor<Scree
1212
SerializedParameterOverride m_Resolution;
1313
SerializedParameterOverride m_MaximumMarchDistance;
1414
SerializedParameterOverride m_DistanceFade;
15-
SerializedParameterOverride m_Attenuation;
1615
SerializedParameterOverride m_Vignette;
1716

1817
public override void OnEnable()
@@ -23,7 +22,6 @@ public override void OnEnable()
2322
m_Resolution = FindParameterOverride(x => x.resolution);
2423
m_MaximumMarchDistance = FindParameterOverride(x => x.maximumMarchDistance);
2524
m_DistanceFade = FindParameterOverride(x => x.distanceFade);
26-
m_Attenuation = FindParameterOverride(x => x.attenuation);
2725
m_Vignette = FindParameterOverride(x => x.vignette);
2826
}
2927

@@ -54,7 +52,6 @@ public override void OnInspectorGUI()
5452

5553
PropertyField(m_MaximumMarchDistance);
5654
PropertyField(m_DistanceFade);
57-
PropertyField(m_Attenuation);
5855
PropertyField(m_Vignette);
5956
}
6057
}

PostProcessing/Runtime/Effects/ScreenSpaceReflections.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ public sealed class ScreenSpaceReflections : PostProcessEffectSettings
4343
[Range(0f, 1f), Tooltip("Fades reflections close to the near planes.")]
4444
public FloatParameter distanceFade = new FloatParameter { value = 0.5f };
4545

46-
[Range(0f, 1f), Tooltip("Fades reflections close to the screen borders.")]
47-
public FloatParameter attenuation = new FloatParameter { value = 0.25f };
48-
49-
[Range(0f, 1f), Tooltip("Fades reflections close to the screen-edges.")]
46+
[Range(0f, 1f), Tooltip("Fades reflections close to the screen edges.")]
5047
public FloatParameter vignette = new FloatParameter { value = 0.5f };
5148

5249
public override bool IsEnabledAndSupported(PostProcessRenderContext context)
@@ -164,9 +161,8 @@ public override void Render(PostProcessRenderContext context)
164161
sheet.properties.SetMatrix(ShaderIDs.InverseViewMatrix, context.camera.worldToCameraMatrix.inverse);
165162
sheet.properties.SetMatrix(ShaderIDs.InverseProjectionMatrix, projectionMatrix.inverse);
166163
sheet.properties.SetMatrix(ShaderIDs.ScreenSpaceProjectionMatrix, screenSpaceProjectionMatrix);
167-
sheet.properties.SetVector(ShaderIDs.Params, new Vector4(settings.attenuation.value, settings.distanceFade.value, settings.maximumMarchDistance.value, lodCount));
164+
sheet.properties.SetVector(ShaderIDs.Params, new Vector4((float)settings.vignette.value, settings.distanceFade.value, settings.maximumMarchDistance.value, lodCount));
168165
sheet.properties.SetVector(ShaderIDs.Params2, new Vector4((float)context.width / (float)context.height, (float)size / (float)noiseTex.width, settings.thickness.value, settings.maximumIterationCount.value));
169-
sheet.properties.SetVector(ShaderIDs.Params3, new Vector4((float)settings.vignette.value, 0.25f, 0f, 0f));
170166

171167
cmd.GetTemporaryRT(ShaderIDs.Test, size, size, 0, FilterMode.Point, context.sourceFormat);
172168
cmd.BlitFullscreenTriangle(context.source, ShaderIDs.Test, sheet, (int)Pass.Test);

PostProcessing/Runtime/Utils/ShaderIDs.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ static class ShaderIDs
4949
internal static readonly int InverseProjectionMatrix = Shader.PropertyToID("_InverseProjectionMatrix");
5050
internal static readonly int ScreenSpaceProjectionMatrix = Shader.PropertyToID("_ScreenSpaceProjectionMatrix");
5151
internal static readonly int Params2 = Shader.PropertyToID("_Params2");
52-
internal static readonly int Params3 = Shader.PropertyToID("_Params3");
5352

5453
internal static readonly int FogColor = Shader.PropertyToID("_FogColor");
5554
internal static readonly int FogParams = Shader.PropertyToID("_FogParams");

PostProcessing/Shaders/Builtins/ScreenSpaceReflections.hlsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define SSR_MINIMUM_ATTENUATION 0.275
1010
#define SSR_ATTENUATION_SCALE (1.0 - SSR_MINIMUM_ATTENUATION)
1111

12-
#define SSR_VIGNETTE_INTENSITY _Params3.x
12+
#define SSR_VIGNETTE_INTENSITY _VignetteIntensity
1313
#define SSR_VIGNETTE_SMOOTHNESS 5.
1414

1515
#define SSR_COLOR_NEIGHBORHOOD_SAMPLE_SPREAD 1.0
@@ -73,10 +73,10 @@ float4x4 _InverseViewMatrix;
7373
float4x4 _InverseProjectionMatrix;
7474
float4x4 _ScreenSpaceProjectionMatrix;
7575

76-
float4 _Params; // x: attenuation, y: distance fade, z: maximum march distance, w: blur pyramid lod count
76+
float4 _Params; // x: vignette intensity, y: distance fade, z: maximum march distance, w: blur pyramid lod count
7777
float4 _Params2; // x: aspect ratio, y: noise tiling, z: thickness, w: maximum iteration count
78-
float4 _Params3; // x: vignette intensity, y: vignette smoothness
79-
#define _Attenuation _Params.x
78+
#define _Attenuation .25
79+
#define _VignetteIntensity _Params.x
8080
#define _DistanceFade _Params.y
8181
#define _MaximumMarchDistance _Params.z
8282
#define _BlurPyramidLODCount _Params.w

0 commit comments

Comments
 (0)