RP Workflows - Adding the capability to revert a single override of a Volume Component

com.unity.render-pipelines.core/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 - Added support for high performant unsafe (uint only) Radix, Merge and Insertion sort algorithms on CoreUnsafeUtils.
+- Context menu on Volume Parameters to restore them to their default values.
 
 ## [13.1.0] - 2021-09-24
 

com.unity.render-pipelines.core/Editor/Volume/Drawers/ColorParameterDrawer.cs

@@ -14,7 +14,11 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
                 return false;
 
             var o = parameter.GetObjectRef<ColorParameter>();
-            value.colorValue = EditorGUILayout.ColorField(title, value.colorValue, o.showEyeDropper, o.showAlpha, o.hdr);
+
+            var rect = EditorGUILayout.GetControlRect();
+            EditorGUI.BeginProperty(rect, title, value);
+            value.colorValue = EditorGUI.ColorField(rect, title, value.colorValue, o.showEyeDropper, o.showAlpha, o.hdr);
+            EditorGUI.EndProperty();
             return true;
         }
     }

com.unity.render-pipelines.core/Editor/Volume/Drawers/FloatParameterDrawer.cs

@@ -14,8 +14,8 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
                 return false;
 
             var o = parameter.GetObjectRef<MinFloatParameter>();
-            float v = EditorGUILayout.FloatField(title, value.floatValue);
-            value.floatValue = Mathf.Max(v, o.min);
+            EditorGUILayout.PropertyField(value, title);
+            value.floatValue = Mathf.Max(value.floatValue, o.min);
             return true;
         }
     }
@@ -31,8 +31,8 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
                 return false;
 
             var o = parameter.GetObjectRef<NoInterpMinFloatParameter>();
-            float v = EditorGUILayout.FloatField(title, value.floatValue);
-            value.floatValue = Mathf.Max(v, o.min);
+            EditorGUILayout.PropertyField(value, title);
+            value.floatValue = Mathf.Max(value.floatValue, o.min);
             return true;
         }
     }
@@ -48,8 +48,8 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
                 return false;
 
             var o = parameter.GetObjectRef<MaxFloatParameter>();
-            float v = EditorGUILayout.FloatField(title, value.floatValue);
-            value.floatValue = Mathf.Min(v, o.max);
+            EditorGUILayout.PropertyField(value, title);
+            value.floatValue = Mathf.Min(value.floatValue, o.max);
             return true;
         }
     }
@@ -65,8 +65,8 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
                 return false;
 
             var o = parameter.GetObjectRef<NoInterpMaxFloatParameter>();
-            float v = EditorGUILayout.FloatField(title, value.floatValue);
-            value.floatValue = Mathf.Min(v, o.max);
+            EditorGUILayout.PropertyField(value, title);
+            value.floatValue = Mathf.Min(value.floatValue, o.max);
             return true;
         }
     }
@@ -132,10 +132,12 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
             var sliderRect = new Rect(floatFieldLeft.xMax + kSeparatorWidth - indentOffset, lineRect.y, lineRect.width - labelRect.width - kFloatFieldWidth * 2 - kSeparatorWidth * 2, lineRect.height);
             var floatFieldRight = new Rect(sliderRect.xMax + kSeparatorWidth - indentOffset, lineRect.y, kFloatFieldWidth + indentOffset, lineRect.height);
 
+            EditorGUI.BeginProperty(lineRect, title, value);
             EditorGUI.PrefixLabel(labelRect, title);
             v.x = EditorGUI.FloatField(floatFieldLeft, v.x);
             EditorGUI.MinMaxSlider(sliderRect, ref v.x, ref v.y, o.min, o.max);
             v.y = EditorGUI.FloatField(floatFieldRight, v.y);
+            EditorGUI.EndProperty();
 
             value.vector2Value = v;
             return true;

com.unity.render-pipelines.core/Editor/Volume/Drawers/TextureParameterDrawer.cs

@@ -106,7 +106,10 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
             if (value.propertyType != SerializedPropertyType.ObjectReference)
                 return false;
 
-            TextureParameterHelper.DoObjectField(value, title, typeof(Texture2D), typeof(RenderTexture), validator);
+            var rect = EditorGUILayout.GetControlRect();
+            EditorGUI.BeginProperty(rect, title, value);
+            TextureParameterHelper.DoObjectField(rect, value, title, typeof(Texture2D), typeof(RenderTexture), validator);
+            EditorGUI.EndProperty();
             return true;
         }
     }
@@ -132,7 +135,10 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
             if (value.propertyType != SerializedPropertyType.ObjectReference)
                 return false;
 
-            TextureParameterHelper.DoObjectField(value, title, typeof(Texture3D), typeof(RenderTexture), validator);
+            var rect = EditorGUILayout.GetControlRect();
+            EditorGUI.BeginProperty(rect, title, value);
+            TextureParameterHelper.DoObjectField(rect, value, title, typeof(Texture3D), typeof(RenderTexture), validator);
+            EditorGUI.EndProperty();
             return true;
         }
     }
@@ -157,7 +163,10 @@ static internal bool OnGUI(SerializedProperty value, GUIContent title)
             if (value.propertyType != SerializedPropertyType.ObjectReference)
                 return false;
 
-            TextureParameterHelper.DoObjectField(value, title, typeof(Cubemap), typeof(RenderTexture), validator);
+            var rect = EditorGUILayout.GetControlRect();
+            EditorGUI.BeginProperty(rect, title, value);
+            TextureParameterHelper.DoObjectField(rect, value, title, typeof(Cubemap), typeof(RenderTexture), validator);
+            EditorGUI.EndProperty();
             return true;
         }
 

com.unity.render-pipelines.core/Runtime/Volume/VolumeComponent.EditorOnly.cs

@@ -0,0 +1,42 @@
+#if UNITY_EDITOR
+
+using System;
+using UnityEditor;
+
+namespace UnityEngine.Rendering
+{
+    public partial class VolumeComponent : IApplyRevertPropertyContextMenuItemProvider
+    {
+        public bool TryGetRevertMethodForFieldName(SerializedProperty property, out Action<SerializedProperty> revertMethod)
+        {
+            revertMethod = property =>
+            {
+                var defaultVolumeComponent = VolumeManager.instance.GetDefaultVolumeComponent(property.serializedObject.targetObject.GetType());
+                Undo.RecordObject(property.serializedObject.targetObject, $"Revert property {property.propertyPath} from {property.serializedObject}");
+                SerializedObject serializedObject = new SerializedObject(defaultVolumeComponent);
+                var serializedProperty = serializedObject.FindProperty(property.propertyPath);
+                property.serializedObject.CopyFromSerializedProperty(serializedProperty);
+                property.serializedObject.ApplyModifiedProperties();
+            };
+
+            return true;
+        }
+
+        public string GetSourceTerm()
+        {
+            return "Property";
+        }
+
+        public bool TryGetApplyMethodForFieldName(SerializedProperty property, out Action<SerializedProperty> applyMethod)
+        {
+            applyMethod = null;
+            return false;
+        }
+
+        public string GetSourceName(Component comp)
+        {
+            return string.Empty;
+        }
+    }
+}
+#endif

com.unity.render-pipelines.core/Runtime/Volume/VolumeComponent.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Reflection;
 using System.Linq;
+using System.Reflection;
 
 namespace UnityEngine.Rendering
 {
@@ -92,7 +92,7 @@ public sealed class VolumeComponentDeprecated : Attribute
     /// </code>
     /// </example>
     [Serializable]
-    public class VolumeComponent : ScriptableObject
+    public partial class VolumeComponent : ScriptableObject
     {
         /// <summary>
         /// Local attribute for VolumeComponent fields only.
@@ -146,7 +146,10 @@ internal static void FindParameters(object o, List<VolumeParameter> parameters,
                 if (field.FieldType.IsSubclassOf(typeof(VolumeParameter)))
                 {
                     if (filter?.Invoke(field) ?? true)
-                        parameters.Add((VolumeParameter)field.GetValue(o));
+                    {
+                        VolumeParameter volumeParameter = (VolumeParameter)field.GetValue(o);
+                        parameters.Add(volumeParameter);
+                    }
                 }
                 else if (!field.FieldType.IsArray && field.FieldType.IsClass)
                     FindParameters(field.GetValue(o), parameters, filter);

com.unity.render-pipelines.core/Runtime/Volume/VolumeManager.cs

@@ -59,6 +59,17 @@ public IEnumerable<Type> baseComponentTypes
         // would be error-prone)
         readonly List<VolumeComponent> m_ComponentsDefaultState;
 
+        internal VolumeComponent GetDefaultVolumeComponent(Type volumeComponentType)
+        {
+            foreach (VolumeComponent component in m_ComponentsDefaultState)
+            {
+                if (component.GetType() == volumeComponentType)
+                    return component;
+            }
+
+            return null;
+        }
+
         // Recycled list used for volume traversal
         readonly List<Collider> m_TempColliders;
 

com.unity.render-pipelines.high-definition/Editor/Sky/SkySettingsEditor.cs

@@ -79,10 +79,13 @@ protected void CommonSkySettingsGUI()
                 {
                     if (scope.displayed)
                     {
+                        var rect = EditorGUILayout.GetControlRect();
+                        EditorGUI.BeginProperty(rect, m_SkyIntensityModeLabel, m_IntensityMode.value);
                         if (m_EnableLuxIntensityMode)
-                            m_IntensityMode.value.intValue = EditorGUILayout.IntPopup(m_SkyIntensityModeLabel, (int)m_IntensityMode.value.intValue, m_IntensityModes, m_IntensityModeValues);
+                            m_IntensityMode.value.intValue = EditorGUI.IntPopup(rect, m_SkyIntensityModeLabel, (int)m_IntensityMode.value.intValue, m_IntensityModes, m_IntensityModeValues);
                         else
-                            m_IntensityMode.value.intValue = EditorGUILayout.IntPopup(m_SkyIntensityModeLabel, (int)m_IntensityMode.value.intValue, m_IntensityModesNoLux, m_IntensityModeValuesNoLux);
+                            m_IntensityMode.value.intValue = EditorGUI.IntPopup(rect, m_SkyIntensityModeLabel, (int)m_IntensityMode.value.intValue, m_IntensityModesNoLux, m_IntensityModeValuesNoLux);
+                        EditorGUI.EndProperty();
                     }
                 }