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

Commit 602774b

Browse files
committed
Renamed "Lens Dirt"
We'll need the "lens" name for something else
1 parent a0304ce commit 602774b

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

PostProcessing/Editor/Effects/BloomEditor.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public sealed class BloomEditor : PostProcessEffectEditor<Bloom>
1313
SerializedParameterOverride m_Color;
1414
SerializedParameterOverride m_MobileOptimized;
1515

16-
SerializedParameterOverride m_LensTexture;
17-
SerializedParameterOverride m_LensIntensity;
16+
SerializedParameterOverride m_DirtTexture;
17+
SerializedParameterOverride m_DirtIntensity;
1818

1919
public override void OnEnable()
2020
{
@@ -26,8 +26,8 @@ public override void OnEnable()
2626
m_Color = FindParameterOverride(x => x.color);
2727
m_MobileOptimized = FindParameterOverride(x => x.mobileOptimized);
2828

29-
m_LensTexture = FindParameterOverride(x => x.lensTexture);
30-
m_LensIntensity = FindParameterOverride(x => x.lensIntensity);
29+
m_DirtTexture = FindParameterOverride(x => x.dirtTexture);
30+
m_DirtIntensity = FindParameterOverride(x => x.dirtIntensity);
3131
}
3232

3333
public override void OnInspectorGUI()
@@ -43,16 +43,16 @@ public override void OnInspectorGUI()
4343
PropertyField(m_MobileOptimized);
4444

4545
EditorGUILayout.Space();
46-
EditorUtilities.DrawHeaderLabel("Lens Dirtiness");
46+
EditorUtilities.DrawHeaderLabel("Dirtiness");
4747

48-
PropertyField(m_LensTexture);
49-
PropertyField(m_LensIntensity);
48+
PropertyField(m_DirtTexture);
49+
PropertyField(m_DirtIntensity);
5050

5151
if (RuntimeUtilities.isVREnabled)
5252
{
53-
if ((m_LensIntensity.overrideState.boolValue && m_LensIntensity.value.floatValue > 0f)
54-
|| (m_LensTexture.overrideState.boolValue && m_LensTexture.value.objectReferenceValue != null))
55-
EditorGUILayout.HelpBox("Using lens dirt in VR is not recommended.", MessageType.Warning);
53+
if ((m_DirtIntensity.overrideState.boolValue && m_DirtIntensity.value.floatValue > 0f)
54+
|| (m_DirtTexture.overrideState.boolValue && m_DirtTexture.value.objectReferenceValue != null))
55+
EditorGUILayout.HelpBox("Using a dirt texture in VR is not recommended.", MessageType.Warning);
5656
}
5757
}
5858
}

PostProcessing/Runtime/Effects/Bloom.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public sealed class Bloom : PostProcessEffectSettings
3131
[Tooltip("Boost performances by lowering the effect quality. This settings is meant to be used on mobile and other low-end platforms.")]
3232
public BoolParameter mobileOptimized = new BoolParameter { value = false };
3333

34-
[Tooltip("Dirtiness texture to add smudges or dust to the lens."), DisplayName("Texture")]
35-
public TextureParameter lensTexture = new TextureParameter { value = null };
34+
[Tooltip("Dirtiness texture to add smudges or dust to the bloom effect."), DisplayName("Texture")]
35+
public TextureParameter dirtTexture = new TextureParameter { value = null };
3636

37-
[Min(0f), Tooltip("Amount of lens dirtiness."), DisplayName("Intensity")]
38-
public FloatParameter lensIntensity = new FloatParameter { value = 0f };
37+
[Min(0f), Tooltip("Amount of dirtiness."), DisplayName("Intensity")]
38+
public FloatParameter dirtIntensity = new FloatParameter { value = 0f };
3939

4040
public override bool IsEnabledAndSupported(PostProcessRenderContext context)
4141
{
@@ -151,7 +151,7 @@ public override void Render(PostProcessRenderContext context)
151151

152152
var linearColor = settings.color.value.linear;
153153
float intensity = RuntimeUtilities.Exp2(settings.intensity.value / 10f) - 1f;
154-
var shaderSettings = new Vector4(sampleScale, intensity, settings.lensIntensity.value, iterations);
154+
var shaderSettings = new Vector4(sampleScale, intensity, settings.dirtIntensity.value, iterations);
155155

156156
// Debug overlays
157157
if (context.IsDebugOverlayEnabled(DebugOverlay.BloomThreshold))
@@ -167,9 +167,9 @@ public override void Render(PostProcessRenderContext context)
167167
// Lens dirtiness
168168
// Keep the aspect ratio correct & center the dirt texture, we don't want it to be
169169
// stretched or squashed
170-
var dirtTexture = settings.lensTexture.value == null
170+
var dirtTexture = settings.dirtTexture.value == null
171171
? RuntimeUtilities.blackTexture
172-
: settings.lensTexture.value;
172+
: settings.dirtTexture.value;
173173

174174
var dirtRatio = (float)dirtTexture.width / (float)dirtTexture.height;
175175
var screenRatio = (float)context.width / (float)context.height;

PostProcessing/Shaders/Builtins/Uber.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Shader "Hidden/PostProcessing/Uber"
3030
TEXTURE2D_SAMPLER2D(_Bloom_DirtTex, sampler_Bloom_DirtTex);
3131
float4 _BloomTex_TexelSize;
3232
float4 _Bloom_DirtTileOffset; // xy: tiling, zw: offset
33-
half3 _Bloom_Settings; // x: sampleScale, y: intensity, z: lens dirt intensity
33+
half3 _Bloom_Settings; // x: sampleScale, y: intensity, z: dirt intensity
3434
half3 _Bloom_Color;
3535

3636
// Chromatic aberration

0 commit comments

Comments
 (0)