Add button for resetting a public variable to its default value

- Add a button for resetting value types to their default values on the UdonBehaviour inspector
MerlinVR · Apr 8, 2020 · aa93829 · aa93829
1 parent 3670343
commit aa93829
Show file tree

Hide file tree

Showing 6 changed files with 256 additions and 3 deletions.
diff --git a/Assets/UdonSharp/Editor/Resources.meta b/Assets/UdonSharp/Editor/Resources.meta
diff --git a/Assets/UdonSharp/Editor/Resources/UndoArrowBlack.png b/Assets/UdonSharp/Editor/Resources/UndoArrowBlack.png
diff --git a/Assets/UdonSharp/Editor/Resources/UndoArrowBlack.png.meta b/Assets/UdonSharp/Editor/Resources/UndoArrowBlack.png.meta
diff --git a/Assets/UdonSharp/Editor/Resources/UndoArrowLight.png b/Assets/UdonSharp/Editor/Resources/UndoArrowLight.png
diff --git a/Assets/UdonSharp/Editor/Resources/UndoArrowLight.png.meta b/Assets/UdonSharp/Editor/Resources/UndoArrowLight.png.meta
diff --git a/Assets/UdonSharp/Editor/UdonSharpProgramAsset.cs b/Assets/UdonSharp/Editor/UdonSharpProgramAsset.cs
@@ -46,6 +46,10 @@ public class UdonSharpProgramAsset : UdonAssemblyProgramAsset
         private UdonBehaviour currentBehaviour = null;
 
         private static GUIStyle errorTextStyle;
+        private static GUIStyle undoLabelStyle;
+        private static GUIContent undoArrowLight;
+        private static GUIContent undoArrowDark;
+        private static GUIContent undoArrowContent;
 
         private void DrawCompileErrorTextArea()
         {
@@ -66,6 +70,24 @@ private void DrawCompileErrorTextArea()
 
         protected override void DrawProgramSourceGUI(UdonBehaviour udonBehaviour, ref bool dirty)
         {
+            if (undoLabelStyle == null || 
+                undoArrowDark == null || 
+                undoArrowLight == null)
+            {
+                undoLabelStyle = new GUIStyle(EditorStyles.label);
+                undoLabelStyle.alignment = TextAnchor.MiddleCenter;
+                undoLabelStyle.padding = new RectOffset(0, 0, 1, 0);
+                undoLabelStyle.margin = new RectOffset(0, 0, 0, 0);
+                undoLabelStyle.border = new RectOffset(0, 0, 0, 0);
+                undoLabelStyle.stretchWidth = false;
+                undoLabelStyle.stretchHeight = false;
+
+                undoArrowLight = new GUIContent((Texture)EditorGUIUtility.Load("Assets/UdonSharp/Editor/Resources/UndoArrowLight.png"), "Reset to default value");
+                undoArrowDark = new GUIContent((Texture)EditorGUIUtility.Load("Assets/UdonSharp/Editor/Resources/UndoArrowBlack.png"), "Reset to default value");
+            }
+
+            undoArrowContent = EditorGUIUtility.isProSkin ? undoArrowLight : undoArrowDark;
+
             currentBehaviour = udonBehaviour;
 
             EditorGUI.BeginChangeCheck();
@@ -427,8 +449,7 @@ private object DrawFieldForType(string fieldName, string symbol, (object value,
                 fieldLabel = new GUIContent(fieldName, tooltip.tooltip);
             else
                 fieldLabel = new GUIContent(fieldName);
-
-
+
             if (declaredType.IsArray)
             {
                 bool foldoutEnabled;
@@ -713,7 +734,9 @@ protected override object DrawPublicVariableField(string symbol, object variable
                 EditorGUI.BeginChangeCheck();
                 object newValue = DrawFieldForType(null, symbol, (variableValue, variableType, fieldDefinition), fieldDefinition != null ? fieldDefinition.fieldSymbol.userCsType : null, ref dirty, enabled);
 
-                if (EditorGUI.EndChangeCheck())
+                bool changed = EditorGUI.EndChangeCheck();
+
+                if (changed)
                 {
                     if (shouldUseRuntimeValue)
                     {
@@ -735,7 +758,31 @@ protected override object DrawPublicVariableField(string symbol, object variable
                 }
 
                 if (!isArray)
+                {
+                    object originalValue = program.Heap.GetHeapVariable(program.SymbolTable.GetAddressFromSymbol(symbol));
+
+                    if (originalValue != null && !originalValue.Equals(variableValue))
+                    {
+                        int originalIndent = EditorGUI.indentLevel;
+                        EditorGUI.indentLevel = 0;
+                        // Check if changed because otherwise the UI throw an error since we changed that we want to draw the undo arrow in the middle of drawing when we're modifying stuff like colors
+                        if (!changed && GUI.Button(EditorGUILayout.GetControlRect(GUILayout.Width(14f), GUILayout.Height(11f)), undoArrowContent, undoLabelStyle))
+                        {
+                            if (shouldUseRuntimeValue)
+                            {
+                                currentBehaviour.SetProgramVariable(symbol, originalValue);
+                            }
+                            else
+                            {
+                                dirty = true;
+                                variableValue = originalValue;
+                            }
+                        }
+                        EditorGUI.indentLevel = originalIndent;
+                    }
+
                     EditorGUILayout.EndHorizontal();
+                }
             }
 
             EditorGUI.EndDisabledGroup();