Merge remote-tracking branch 'refs/remotes/Unity-Technologies/master'

Author: keijiro

PostProcessing/Editor/Models/FogModelEditor.cs

@@ -1,46 +1,23 @@
-using UnityEngine;
 using UnityEngine.PostProcessing;
 
 namespace UnityEditor.PostProcessing
 {
     using Settings = FogModel.Settings;
 
-    [PostProcessingModelEditor(typeof(FogModel))]
+    [PostProcessingModelEditor(typeof(FogModel), alwaysEnabled: true)]
     public class FogModelEditor : PostProcessingModelEditor
     {
-        SerializedProperty m_Color;
-        SerializedProperty m_Mode;
-        SerializedProperty m_Density;
-        SerializedProperty m_Start;
-        SerializedProperty m_End;
         SerializedProperty m_ExcludeSkybox;
 
         public override void OnEnable()
         {
-            m_Color = FindSetting((Settings x) => x.color);
-            m_Mode = FindSetting((Settings x) => x.mode);
-            m_Density = FindSetting((Settings x) => x.density);
-            m_Start = FindSetting((Settings x) => x.start);
-            m_End = FindSetting((Settings x) => x.end);
             m_ExcludeSkybox = FindSetting((Settings x) => x.excludeSkybox);
         }
 
         public override void OnInspectorGUI()
         {
-            EditorGUILayout.PropertyField(m_Color);
-            EditorGUILayout.PropertyField(m_ExcludeSkybox);
-            EditorGUILayout.PropertyField(m_Mode);
-
-            EditorGUI.indentLevel++;
-            if (m_Mode.intValue == (int)FogMode.Linear)
-            {
-                EditorGUILayout.PropertyField(m_Start);
-                EditorGUILayout.PropertyField(m_End);
-            }
-            else
-            {
-                EditorGUILayout.PropertyField(m_Density);
-            }
+            EditorGUILayout.HelpBox("This effect adds fog compatibility to the deferred rendering path; actual fog settings should be set in the Lighting panel.", MessageType.Info);
+            EditorGUILayout.PropertyField(m_ExcludeSkybox, EditorGUIHelper.GetContent("Exclude Skybox (deferred only)"));
             EditorGUI.indentLevel--;
         }
     }

PostProcessing/Runtime/Components/FogComponent.cs

@@ -41,31 +41,18 @@ public override CameraEvent GetCameraEvent()
             return CameraEvent.BeforeImageEffectsOpaque;
         }
 
-        public override void Init(PostProcessingContext pcontext, FogModel pmodel)
-        {
-            base.Init(pcontext, pmodel);
-
-            var settings = model.settings;
-            RenderSettings.fog = model.enabled;
-            RenderSettings.fogColor = settings.color;
-            RenderSettings.fogMode = settings.mode;
-            RenderSettings.fogDensity = settings.density;
-            RenderSettings.fogStartDistance = settings.start;
-            RenderSettings.fogEndDistance = settings.end;
-        }
-
         public override void PopulateCommandBuffer(CommandBuffer cb)
         {
             var settings = model.settings;
 
             var material = context.materialFactory.Get(k_ShaderString);
             material.shaderKeywords = null;
-            material.SetColor(Uniforms._FogColor, settings.color);
-            material.SetFloat(Uniforms._Density, settings.density);
-            material.SetFloat(Uniforms._Start, settings.start);
-            material.SetFloat(Uniforms._End, settings.end);
+            material.SetColor(Uniforms._FogColor, RenderSettings.fogColor);
+            material.SetFloat(Uniforms._Density, RenderSettings.fogDensity);
+            material.SetFloat(Uniforms._Start, RenderSettings.fogStartDistance);
+            material.SetFloat(Uniforms._End, RenderSettings.fogEndDistance);
 
-            switch (settings.mode)
+            switch (RenderSettings.fogMode)
             {
                 case FogMode.Linear:
                     material.EnableKeyword("FOG_LINEAR");

PostProcessing/Runtime/Models/FogModel.cs

@@ -8,21 +8,6 @@ public class FogModel : PostProcessingModel
         [Serializable]
         public struct Settings
         {
-            [Tooltip("Controls the color of that fog drawn in the scene.")]
-            public Color color;
-
-            [Tooltip("Controls the mathematical function determining the way fog accumulates with distance from the camera. Options are Linear, Exponential and Exponential Squared.")]
-            public FogMode mode;
-
-            [Tooltip("Controls the density of the fog effect in the Scene when using Exponential or Exponential Squared modes.")]
-            public float density;
-
-            [Tooltip("Controls the distance from the camera where the fog will start in the scene.")]
-            public float start;
-
-            [Tooltip("Controls the distance from the camera where the fog will completely obscure objects in the Scene.")]
-            public float end;
-
             [Tooltip("Should the fog affect the skybox?")]
             public bool excludeSkybox;
 
@@ -32,11 +17,6 @@ public static Settings defaultSettings
                 {
                     return new Settings
                     {
-                        color = new Color32(102, 108, 113, 154),
-                        mode = FogMode.Exponential,
-                        density = 0.001f,
-                        start = 0f,
-                        end = 600f,
                         excludeSkybox = true
                     };
                 }

PostProcessing/Runtime/PostProcessingProfile.cs

@@ -7,10 +7,10 @@ public class PostProcessingProfile : ScriptableObject
         #pragma warning disable 0169 // "field x is never used"
 
         public BuiltinDebugViewsModel debugViews = new BuiltinDebugViewsModel();
+        public FogModel fog = new FogModel();
         public AntialiasingModel antialiasing = new AntialiasingModel();
         public AmbientOcclusionModel ambientOcclusion = new AmbientOcclusionModel();
         public ScreenSpaceReflectionModel screenSpaceReflection = new ScreenSpaceReflectionModel();
-        public FogModel fog = new FogModel();
         public DepthOfFieldModel depthOfField = new DepthOfFieldModel();
         public MotionBlurModel motionBlur = new MotionBlurModel();
         public EyeAdaptationModel eyeAdaptation = new EyeAdaptationModel();