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

Commit fe29932

Browse files
robbiesrirobbiesri
committed
Merge remote-tracking branch 'origin/v2' into xr_taa
2 parents 158742d + a873192 commit fe29932

File tree

78 files changed

+2476
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2476
-354
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
LICENSE.meta
2525
PostProcessing.meta
2626
README.md.meta
27+
package.json.meta
2728

2829
# Unity3D Generated File On Crash Reports
2930
sysinfo.txt

‎.npmignore

Whitespace-only changes.

‎PostProcessing/Editor/Decorators/Decorators.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public override bool OnGUI(SerializedProperty property, SerializedProperty overr
2727
}
2828
}
2929

30-
[Decorator(typeof(MinAttribute))]
30+
[Decorator(typeof(UnityEngine.Rendering.PostProcessing.MinAttribute))]
3131
public sealed class MinDecorator : AttributeDecorator
3232
{
3333
public override bool OnGUI(SerializedProperty property, SerializedProperty overrideState, GUIContent title, Attribute attribute)
@@ -52,7 +52,7 @@ public override bool OnGUI(SerializedProperty property, SerializedProperty overr
5252
}
5353
}
5454

55-
[Decorator(typeof(MaxAttribute))]
55+
[Decorator(typeof(UnityEngine.Rendering.PostProcessing.MaxAttribute))]
5656
public sealed class MaxDecorator : AttributeDecorator
5757
{
5858
public override bool OnGUI(SerializedProperty property, SerializedProperty overrideState, GUIContent title, Attribute attribute)
@@ -77,7 +77,7 @@ public override bool OnGUI(SerializedProperty property, SerializedProperty overr
7777
}
7878
}
7979

80-
[Decorator(typeof(MinMaxAttribute))]
80+
[Decorator(typeof(UnityEngine.Rendering.PostProcessing.MinMaxAttribute))]
8181
public sealed class MinMaxDecorator : AttributeDecorator
8282
{
8383
public override bool OnGUI(SerializedProperty property, SerializedProperty overrideState, GUIContent title, Attribute attribute)

‎PostProcessing/Editor/EffectListEditor.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace UnityEditor.Rendering.PostProcessing
99
{
10-
sealed class EffectListEditor
10+
public sealed class EffectListEditor
1111
{
1212
Editor m_BaseEditor;
1313

@@ -126,6 +126,9 @@ public void Clear()
126126

127127
public void OnGUI()
128128
{
129+
if (m_Asset == null)
130+
return;
131+
129132
if (m_Asset.isDirty)
130133
{
131134
RefreshEditors();

‎PostProcessing/Editor/Effects/AmbientOcclusionEditor.cs

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
using UnityEngine;
2+
using UnityEngine.Rendering.PostProcessing;
3+
4+
namespace UnityEditor.Rendering.PostProcessing
5+
{
6+
[PostProcessEditor(typeof(AmbientOcclusion))]
7+
public sealed class AmbientOcclusionEditor : PostProcessEffectEditor<AmbientOcclusion>
8+
{
9+
SerializedParameterOverride m_Mode;
10+
SerializedParameterOverride m_Intensity;
11+
SerializedParameterOverride m_Color;
12+
SerializedParameterOverride m_AmbientOnly;
13+
SerializedParameterOverride m_ThicknessModifier;
14+
SerializedParameterOverride m_Quality;
15+
SerializedParameterOverride m_Radius;
16+
17+
public override void OnEnable()
18+
{
19+
m_Mode = FindParameterOverride(x => x.mode);
20+
m_Intensity = FindParameterOverride(x => x.intensity);
21+
m_Color = FindParameterOverride(x => x.color);
22+
m_AmbientOnly = FindParameterOverride(x => x.ambientOnly);
23+
m_ThicknessModifier = FindParameterOverride(x => x.thicknessModifier);
24+
m_Quality = FindParameterOverride(x => x.quality);
25+
m_Radius = FindParameterOverride(x => x.radius);
26+
}
27+
28+
public override void OnInspectorGUI()
29+
{
30+
if (RuntimeUtilities.scriptableRenderPipelineActive)
31+
{
32+
EditorGUILayout.HelpBox("This effect doesn't work with scriptable render pipelines yet.", MessageType.Warning);
33+
return;
34+
}
35+
36+
PropertyField(m_Mode);
37+
PropertyField(m_Intensity);
38+
39+
int aoMode = m_Mode.value.intValue;
40+
41+
if (aoMode == (int)AmbientOcclusionMode.ScalableAmbientObscurance)
42+
{
43+
PropertyField(m_Radius);
44+
PropertyField(m_Quality);
45+
}
46+
else if (aoMode == (int)AmbientOcclusionMode.MultiScaleVolumetricObscurance)
47+
{
48+
if (!SystemInfo.supportsComputeShaders)
49+
EditorGUILayout.HelpBox("Multi-scale volumetric obscurance requires compute shader support.", MessageType.Warning);
50+
51+
PropertyField(m_ThicknessModifier);
52+
}
53+
54+
PropertyField(m_Color);
55+
56+
if (Camera.main != null && Camera.main.actualRenderingPath == RenderingPath.DeferredShading && Camera.main.allowHDR)
57+
PropertyField(m_AmbientOnly);
58+
}
59+
}
60+
}

‎PostProcessing/Editor/Effects/AmbientOcclusionEditor.cs.meta

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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/Editor/Effects/ScreenSpaceReflectionsEditor.cs

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
using UnityEngine;
2+
using UnityEngine.Rendering.PostProcessing;
3+
4+
namespace UnityEditor.Rendering.PostProcessing
5+
{
6+
[PostProcessEditor(typeof(ScreenSpaceReflections))]
7+
public sealed class ScreenSpaceReflectionsEditor : PostProcessEffectEditor<ScreenSpaceReflections>
8+
{
9+
SerializedParameterOverride m_Preset;
10+
SerializedParameterOverride m_MaximumIterationCount;
11+
SerializedParameterOverride m_Thickness;
12+
SerializedParameterOverride m_Resolution;
13+
SerializedParameterOverride m_MaximumMarchDistance;
14+
SerializedParameterOverride m_DistanceFade;
15+
SerializedParameterOverride m_Attenuation;
16+
17+
public override void OnEnable()
18+
{
19+
m_Preset = FindParameterOverride(x => x.preset);
20+
m_MaximumIterationCount = FindParameterOverride(x => x.maximumIterationCount);
21+
m_Thickness = FindParameterOverride(x => x.thickness);
22+
m_Resolution = FindParameterOverride(x => x.resolution);
23+
m_MaximumMarchDistance = FindParameterOverride(x => x.maximumMarchDistance);
24+
m_DistanceFade = FindParameterOverride(x => x.distanceFade);
25+
m_Attenuation = FindParameterOverride(x => x.attenuation);
26+
}
27+
28+
public override void OnInspectorGUI()
29+
{
30+
if (RuntimeUtilities.scriptableRenderPipelineActive)
31+
{
32+
EditorGUILayout.HelpBox("This effect doesn't work with scriptable render pipelines yet.", MessageType.Warning);
33+
return;
34+
}
35+
36+
if (Camera.main != null && Camera.main.actualRenderingPath != RenderingPath.DeferredShading)
37+
EditorGUILayout.HelpBox("This effect only works with the deferred rendering path.", MessageType.Warning);
38+
39+
if (!SystemInfo.supportsComputeShaders)
40+
EditorGUILayout.HelpBox("This effect requires compute shader support.", MessageType.Warning);
41+
42+
PropertyField(m_Preset);
43+
44+
if (m_Preset.value.intValue == (int)ScreenSpaceReflectionPreset.Custom)
45+
{
46+
PropertyField(m_MaximumIterationCount);
47+
PropertyField(m_Thickness);
48+
PropertyField(m_Resolution);
49+
50+
EditorGUILayout.Space();
51+
}
52+
53+
PropertyField(m_MaximumMarchDistance);
54+
PropertyField(m_DistanceFade);
55+
PropertyField(m_Attenuation);
56+
}
57+
}
58+
}

‎PostProcessing/Editor/Effects/ScreenSpaceReflectionsEditor.cs.meta

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PostProcessing/Editor/PostProcessDebugEditor.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public sealed class PostProcessDebugEditor : BaseEditor<PostProcessDebug>
2222

2323
SerializedProperty m_MotionColorIntensity;
2424
SerializedProperty m_MotionGridSize;
25+
SerializedProperty m_ColorBlindness;
26+
SerializedProperty m_ColorBlindnessStrength;
2527

2628
void OnEnable()
2729
{
@@ -50,6 +52,8 @@ void RebuildProperties()
5052

5153
m_MotionColorIntensity = m_LayerObject.FindProperty("debugLayer.overlaySettings.motionColorIntensity");
5254
m_MotionGridSize = m_LayerObject.FindProperty("debugLayer.overlaySettings.motionGridSize");
55+
m_ColorBlindness = m_LayerObject.FindProperty("debugLayer.overlaySettings.colorBlindnessType");
56+
m_ColorBlindnessStrength = m_LayerObject.FindProperty("debugLayer.overlaySettings.colorBlindnessStrength");
5357
}
5458

5559
public override void OnInspectorGUI()
@@ -76,6 +80,7 @@ public override void OnInspectorGUI()
7680
EditorGUI.indentLevel++;
7781
EditorGUILayout.PropertyField(m_Overlay);
7882
DoOverlayGUI(DebugOverlay.MotionVectors, m_MotionColorIntensity, m_MotionGridSize);
83+
DoOverlayGUI(DebugOverlay.ColorBlindnessSimulation, m_ColorBlindness, m_ColorBlindnessStrength);
7984

8085
// Special cases
8186
if (m_Overlay.intValue == (int)DebugOverlay.NANTracker && m_Target.postProcessLayer.stopNaNPropagation)

0 commit comments

Comments
 (0)