Magnifer Sample Adjustments (#139)

Author: Cameron-Micka

…ples~/Experimental/Magnifier/Scenes.meta …unity/Editor/Experimental/Magnifier.metacom.microsoft.mrtk.graphicstools.unity/Samples~/Experimental/Magnifier/Scenes.meta renamed to com.microsoft.mrtk.graphicstools.unity/Editor/Experimental/Magnifier.meta com.microsoft.mrtk.graphicstools.unity/Samples~/Experimental/Magnifier/Scenes.meta renamed to com.microsoft.mrtk.graphicstools.unity/Editor/Experimental/Magnifier.meta

@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#if GT_USE_URP
+using UnityEditor;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.GraphicsTools.Editor
+{
+    /// <summary>
+    /// Custom inspector that helps with magnifier configuration.
+    /// </summary>
+    [CustomEditor(typeof(MagnifierManager))]
+    public class MagnifierManagerInspector : UnityEditor.Editor
+    {
+        private SerializedProperty m_Script;
+        private SerializedProperty renderObjectsSettings;
+
+       private bool showRenderObjects = false;
+
+        private void OnEnable()
+        {
+            m_Script = serializedObject.FindProperty(nameof(m_Script));
+            renderObjectsSettings = serializedObject.FindProperty(nameof(renderObjectsSettings));
+        }
+
+        /// <summary>
+        /// Renders a custom inspector GUI.
+        /// </summary>
+        public override void OnInspectorGUI()
+        {
+            using (var check = new EditorGUI.ChangeCheckScope())
+            {
+                InspectorUtilities.DrawReadonlyPropertyField(m_Script);
+
+                DrawPropertiesExcluding(serializedObject, nameof(m_Script), nameof(renderObjectsSettings));
+
+                showRenderObjects = EditorGUILayout.Foldout(showRenderObjects, "Render Objects Settings");
+
+                if (showRenderObjects)
+                {
+                    EditorGUI.indentLevel++;
+                    EditorGUILayout.PropertyField(renderObjectsSettings);
+                    EditorGUI.indentLevel--;
+                }
+
+                if (check.changed)
+                {
+                    MagnifierManager magnifier = target as MagnifierManager;
+
+                    if (magnifier != null)
+                    {
+                        magnifier.ApplyMagnification();
+                    }
+
+                    serializedObject.ApplyModifiedProperties();
+                }
+            }
+        }
+    }
+}
+#endif // GT_USE_URP

com.microsoft.mrtk.graphicstools.unity/Editor/Experimental/Magnifier/MagnifierManagerInspector.cs

@@ -108,7 +108,7 @@ private void OnEnable()
         /// <inheritdoc />
         public override void OnInspectorGUI()
         {
-            DrawReadonlyPropertyField(m_Script);
+            InspectorUtilities.DrawReadonlyPropertyField(m_Script);
 
             EditorGUI.BeginChangeCheck();
 
@@ -305,12 +305,5 @@ private static bool IsCorrectMaterial(Material material, MaterialSettings materi
 
             return true;
         }
-
-        private static void DrawReadonlyPropertyField(SerializedProperty property, params GUILayoutOption[] options)
-        {
-            GUI.enabled = false;
-            EditorGUILayout.PropertyField(property, options);
-            GUI.enabled = true;
-        }
     }
 }

com.microsoft.mrtk.graphicstools.unity/Editor/Experimental/Magnifier/MagnifierManagerInspector.cs.meta

@@ -48,15 +48,15 @@ public override void OnInspectorGUI()
 
             using (var check = new EditorGUI.ChangeCheckScope())
             {
-                DrawReadonlyPropertyField(m_Script);
+                InspectorUtilities.DrawReadonlyPropertyField(m_Script);
 
                 if (HasNoRenderers(previousRenderers))
                 {
                     EditorGUILayout.PropertyField(applyToSharedMaterial);
                 }
                 else
                 {
-                    DrawReadonlyPropertyField(applyToSharedMaterial);
+                    InspectorUtilities.DrawReadonlyPropertyField(applyToSharedMaterial);
                 }
 
                 DrawPropertiesExcluding(serializedObject, nameof(m_Script), nameof(applyToSharedMaterial));
@@ -99,13 +99,6 @@ public override void OnInspectorGUI()
             }
         }
 
-        private static void DrawReadonlyPropertyField(SerializedProperty property, params GUILayoutOption[] options)
-        {
-            GUI.enabled = false;
-            EditorGUILayout.PropertyField(property, options);
-            GUI.enabled = true;
-        }
-
         private static bool HasNoRenderers(IEnumerable<Renderer> renderers)
         {
             foreach (var renderer in renderers)

com.microsoft.mrtk.graphicstools.unity/Editor/Inspectors/BaseMeshOutlineInspector.cs

@@ -7,7 +7,7 @@
 namespace Microsoft.MixedReality.GraphicsTools.Editor
 {
     /// <summary>
-    /// General utility methods to help with shader inspector development.
+    /// General utility methods to help with inspector development.
     /// </summary>
     public static class InspectorUtilities
     {
@@ -28,5 +28,15 @@ public static GameObject CreateGameObjectFromMenu<T>(MenuCommand menuCommand) wh
 
             return gameObject;
         }
+
+        /// <summary>
+        /// Draws a property that is greyed out and non-interactible.
+        /// </summary>
+        public static void DrawReadonlyPropertyField(SerializedProperty property, params GUILayoutOption[] options)
+        {
+            GUI.enabled = false;
+            EditorGUILayout.PropertyField(property, options);
+            GUI.enabled = true;
+        }
     }
 }

com.microsoft.mrtk.graphicstools.unity/Editor/Inspectors/ClippingPrimitiveInspector.cs

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: BlitMaterial
+  m_Name: Blit
   m_Shader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4

com.microsoft.mrtk.graphicstools.unity/Editor/Utilities/InspectorUtilities.cs

@@ -20,7 +20,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: MagnifierMaterial
+  m_Name: Magnifier
   m_Shader: {fileID: 4800000, guid: 708bca655443cdd41b94ee29b5572b6e, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4