From a10eea6e4ce647061813519d5b0ea496f29495b9 Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期四, 09 八月 2018 09:47:08 +0800
Subject: [PATCH] 同步最新svn内容
---
Assets/Plugins/PostProcessing/Editor/Models/AntialiasingModelEditor.cs | 142 +++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/Assets/Plugins/PostProcessing/Editor/Models/AntialiasingModelEditor.cs b/Assets/Plugins/PostProcessing/Editor/Models/AntialiasingModelEditor.cs
index 6f773a5..578a0b2 100644
--- a/Assets/Plugins/PostProcessing/Editor/Models/AntialiasingModelEditor.cs
+++ b/Assets/Plugins/PostProcessing/Editor/Models/AntialiasingModelEditor.cs
@@ -1,71 +1,71 @@
-using UnityEngine;
-using UnityEngine.PostProcessing;
-
-namespace UnityEditor.PostProcessing
-{
- using Method = AntialiasingModel.Method;
- using Settings = AntialiasingModel.Settings;
-
- [PostProcessingModelEditor(typeof(AntialiasingModel))]
- public class AntialiasingModelEditor : PostProcessingModelEditor
- {
- SerializedProperty m_Method;
-
- SerializedProperty m_FxaaPreset;
-
- SerializedProperty m_TaaJitterSpread;
- SerializedProperty m_TaaSharpen;
- SerializedProperty m_TaaStationaryBlending;
- SerializedProperty m_TaaMotionBlending;
-
- static string[] s_MethodNames =
- {
- "Fast Approximate Anti-aliasing",
- "Temporal Anti-aliasing"
- };
-
- public override void OnEnable()
- {
- m_Method = FindSetting((Settings x) => x.method);
-
- m_FxaaPreset = FindSetting((Settings x) => x.fxaaSettings.preset);
-
- m_TaaJitterSpread = FindSetting((Settings x) => x.taaSettings.jitterSpread);
- m_TaaSharpen = FindSetting((Settings x) => x.taaSettings.sharpen);
- m_TaaStationaryBlending = FindSetting((Settings x) => x.taaSettings.stationaryBlending);
- m_TaaMotionBlending = FindSetting((Settings x) => x.taaSettings.motionBlending);
- }
-
- public override void OnInspectorGUI()
- {
- m_Method.intValue = EditorGUILayout.Popup("Method", m_Method.intValue, s_MethodNames);
-
- if (m_Method.intValue == (int)Method.Fxaa)
- {
- EditorGUILayout.PropertyField(m_FxaaPreset);
- }
- else if (m_Method.intValue == (int)Method.Taa)
- {
- if (QualitySettings.antiAliasing > 1)
- EditorGUILayout.HelpBox("Temporal Anti-Aliasing doesn't work correctly when MSAA is enabled.", MessageType.Warning);
-
- EditorGUILayout.LabelField("Jitter", EditorStyles.boldLabel);
- EditorGUI.indentLevel++;
- EditorGUILayout.PropertyField(m_TaaJitterSpread, EditorGUIHelper.GetContent("Spread"));
- EditorGUI.indentLevel--;
-
- EditorGUILayout.Space();
-
- EditorGUILayout.LabelField("Blending", EditorStyles.boldLabel);
- EditorGUI.indentLevel++;
- EditorGUILayout.PropertyField(m_TaaStationaryBlending, EditorGUIHelper.GetContent("Stationary"));
- EditorGUILayout.PropertyField(m_TaaMotionBlending, EditorGUIHelper.GetContent("Motion"));
- EditorGUI.indentLevel--;
-
- EditorGUILayout.Space();
-
- EditorGUILayout.PropertyField(m_TaaSharpen);
- }
- }
- }
-}
+using UnityEngine;
+using UnityEngine.PostProcessing;
+
+namespace UnityEditor.PostProcessing
+{
+ using Method = AntialiasingModel.Method;
+ using Settings = AntialiasingModel.Settings;
+
+ [PostProcessingModelEditor(typeof(AntialiasingModel))]
+ public class AntialiasingModelEditor : PostProcessingModelEditor
+ {
+ SerializedProperty m_Method;
+
+ SerializedProperty m_FxaaPreset;
+
+ SerializedProperty m_TaaJitterSpread;
+ SerializedProperty m_TaaSharpen;
+ SerializedProperty m_TaaStationaryBlending;
+ SerializedProperty m_TaaMotionBlending;
+
+ static string[] s_MethodNames =
+ {
+ "Fast Approximate Anti-aliasing",
+ "Temporal Anti-aliasing"
+ };
+
+ public override void OnEnable()
+ {
+ m_Method = FindSetting((Settings x) => x.method);
+
+ m_FxaaPreset = FindSetting((Settings x) => x.fxaaSettings.preset);
+
+ m_TaaJitterSpread = FindSetting((Settings x) => x.taaSettings.jitterSpread);
+ m_TaaSharpen = FindSetting((Settings x) => x.taaSettings.sharpen);
+ m_TaaStationaryBlending = FindSetting((Settings x) => x.taaSettings.stationaryBlending);
+ m_TaaMotionBlending = FindSetting((Settings x) => x.taaSettings.motionBlending);
+ }
+
+ public override void OnInspectorGUI()
+ {
+ m_Method.intValue = EditorGUILayout.Popup("Method", m_Method.intValue, s_MethodNames);
+
+ if (m_Method.intValue == (int)Method.Fxaa)
+ {
+ EditorGUILayout.PropertyField(m_FxaaPreset);
+ }
+ else if (m_Method.intValue == (int)Method.Taa)
+ {
+ if (QualitySettings.antiAliasing > 1)
+ EditorGUILayout.HelpBox("Temporal Anti-Aliasing doesn't work correctly when MSAA is enabled.", MessageType.Warning);
+
+ EditorGUILayout.LabelField("Jitter", EditorStyles.boldLabel);
+ EditorGUI.indentLevel++;
+ EditorGUILayout.PropertyField(m_TaaJitterSpread, EditorGUIHelper.GetContent("Spread"));
+ EditorGUI.indentLevel--;
+
+ EditorGUILayout.Space();
+
+ EditorGUILayout.LabelField("Blending", EditorStyles.boldLabel);
+ EditorGUI.indentLevel++;
+ EditorGUILayout.PropertyField(m_TaaStationaryBlending, EditorGUIHelper.GetContent("Stationary"));
+ EditorGUILayout.PropertyField(m_TaaMotionBlending, EditorGUIHelper.GetContent("Motion"));
+ EditorGUI.indentLevel--;
+
+ EditorGUILayout.Space();
+
+ EditorGUILayout.PropertyField(m_TaaSharpen);
+ }
+ }
+ }
+}
--
Gitblit v1.8.0