TouchScript · JamesKim2998 · Aug 15, 2017 · Sep 2, 2017 · Sep 3, 2017 · Sep 3, 2017
diff --git a/Source/Assets/TouchScript/Editor/Gestures/GestureEditor.cs b/Source/Assets/TouchScript/Editor/Gestures/GestureEditor.cs
@@ -223,18 +223,19 @@ protected virtual void drawLimits()
                 EditorGUILayout.LabelField("Min: " + (int) minPointersFloat + ", Max: " + (int) maxPointersFloat);
                 EditorGUILayout.MinMaxSlider(ref minPointersFloat, ref maxPointersFloat, 0, 10, GUILayout.MaxWidth(150));
                 EditorGUI.indentLevel--;
+                minPointers.intValue = (int) minPointersFloat;
+                maxPointers.intValue = (int) maxPointersFloat;
             }
             else
             {
                 if (limitPointers)
                 {
                     minPointersFloat = 0;
                     maxPointersFloat = 0;
+                    minPointers.intValue = (int) minPointersFloat;
+                    maxPointers.intValue = (int) maxPointersFloat;
                 }
             }
-
-            minPointers.intValue = (int) minPointersFloat;
-            maxPointers.intValue = (int) maxPointersFloat;
         }
 
         protected virtual void drawFriendlyGestures()

diff --git a/Source/Assets/TouchScript/Editor/Layers/FullscreenLayerEditor.cs b/Source/Assets/TouchScript/Editor/Layers/FullscreenLayerEditor.cs
@@ -12,23 +12,31 @@ namespace TouchScript.Editor.Layers
     [CustomEditor(typeof(FullscreenLayer))]
     internal sealed class FullscreenLayerEditor : UnityEditor.Editor
     {
+        public static readonly GUIContent TEXT_NAME = new GUIContent("Name", "Layer name.");
         public static readonly GUIContent TEXT_HELP = new GUIContent("This component receives all pointers which were not caught by other layers. It sets poitners' Target property to itself, so all fullscreen gestures must be attached to the same GameObject as FullscreenGesture.");
 
+        private SerializedProperty layerName;
         private SerializedProperty type, camera;
         private FullscreenLayer instance;
 
         private void OnEnable()
         {
             instance = target as FullscreenLayer;
 
+            layerName = serializedObject.FindProperty("layerName");
             type = serializedObject.FindProperty("type");
             camera = serializedObject.FindProperty("_camera");
         }
 
         public override void OnInspectorGUI()
         {
-            serializedObject.Update();
+#if UNITY_5_6_OR_NEWER
+            serializedObject.UpdateIfRequiredOrScript();
+#else
+            serializedObject.UpdateIfDirtyOrScript();
+#endif
 
+            EditorGUILayout.PropertyField(layerName, TEXT_NAME);
             EditorGUI.BeginChangeCheck();
             EditorGUILayout.PropertyField(type);
             if (EditorGUI.EndChangeCheck())
@@ -47,6 +55,8 @@ public override void OnInspectorGUI()
             }
 
             EditorGUILayout.LabelField(TEXT_HELP, GUIElements.HelpBox);
+
+            serializedObject.ApplyModifiedProperties();
         }
     }
 }
diff --git a/Source/Assets/TouchScript/Editor/Layers/StandardLayerEditor.cs b/Source/Assets/TouchScript/Editor/Layers/StandardLayerEditor.cs
@@ -15,6 +15,7 @@ internal class StandardLayerEditor : UnityEditor.Editor
         public static readonly GUIContent TEXT_ADVANCED_HEADER = new GUIContent("Advanced", "Advanced properties.");
         public static readonly GUIContent TEXT_HIT_HEADER = new GUIContent("Hit test options", "Options which control what types of objects this layer should search under pointers.");
 
+        public static readonly GUIContent TEXT_NAME = new GUIContent("Name", "Layer name.");
         public static readonly GUIContent TEXT_3D_OBJECTS = new GUIContent("Hit 3D Objects", "Layer should raycast 3D objects.");
         public static readonly GUIContent TEXT_2D_OBJECTS = new GUIContent("Hit 2D Objects", "Layer should raycast 2D objects.");
         public static readonly GUIContent TEXT_WORLD_UI = new GUIContent("Hit World UI", "Layer should raycast World Space UI.");
@@ -25,6 +26,7 @@ internal class StandardLayerEditor : UnityEditor.Editor
         public static readonly GUIContent TEXT_HELP = new GUIContent("This component assigns target GameObjects in the scene for pressed pointers.");
 
         private SerializedProperty advancedProps, hitProps;
+        private SerializedProperty layerName;
         private SerializedProperty basicEditor;
         private SerializedProperty hit3DObjects;
         private SerializedProperty hit2DObjects;
@@ -39,6 +41,7 @@ protected virtual void OnEnable()
 
             advancedProps = serializedObject.FindProperty("advancedProps");
             hitProps = serializedObject.FindProperty("hitProps");
+            layerName = serializedObject.FindProperty("layerName");
             basicEditor = serializedObject.FindProperty("basicEditor");
             hit3DObjects = serializedObject.FindProperty("hit3DObjects");
             hit2DObjects = serializedObject.FindProperty("hit2DObjects");
@@ -70,6 +73,7 @@ public override void OnInspectorGUI()
             }
             else
             {
+                drawName();
                 drawHit();
                 drawAdvanced();
             }
@@ -88,6 +92,11 @@ private void drawHit()
             }
         }
 
+        protected virtual void drawName()
+        {
+            EditorGUILayout.PropertyField(layerName, TEXT_NAME);
+        }
+
         protected virtual void doDrawHit()
         {
             EditorGUILayout.PropertyField(hitScreenSpaceUI, TEXT_SS_UI);

diff --git a/Source/Assets/TouchScript/Editor/TouchManagerEditor.cs b/Source/Assets/TouchScript/Editor/TouchManagerEditor.cs
@@ -91,7 +91,7 @@ private void OnEnable()
                     EditorGUI.LabelField(rect, "null");
                     return;
                 }
-                EditorGUI.LabelField(rect, layer.Name);
+                EditorGUI.LabelField(rect, layer.Name + " (" + layer.gameObject.name + ")");
             };
         }
 
@@ -207,7 +207,11 @@ private void drawSendMessage()
                     var label = EditorGUI.BeginProperty(r, TEXT_SEND_MESSAGE_EVENTS, sendMessageEvents);
                     EditorGUI.BeginChangeCheck();
                     r = EditorGUI.PrefixLabel(r, label);
+#if UNITY_2017_3_OR_NEWER
+                    var sMask = (TouchManager.MessageType) EditorGUI.EnumFlagsField(r, instance.SendMessageEvents);
+#else
                     var sMask = (TouchManager.MessageType) EditorGUI.EnumMaskField(r, instance.SendMessageEvents);
+#endif
                     if (EditorGUI.EndChangeCheck())
                     {
                         instance.SendMessageEvents = sMask;
@@ -232,12 +236,16 @@ private void refresh()
             if (Application.isPlaying)
             {
                 layers.arraySize = 0;
-                LayerManager.Instance.ForEach((l) =>
-                            {
-                                layers.arraySize++;
-                                layers.GetArrayElementAtIndex(layers.arraySize - 1).objectReferenceValue = l;
-                                return true;
-                            });
+                var layerManager = LayerManager.Instance;
+                if (layerManager != null) 
+                {
+                    LayerManager.Instance.ForEach((l) =>
+                                {
+                                    layers.arraySize++;
+                                    layers.GetArrayElementAtIndex(layers.arraySize - 1).objectReferenceValue = l;
+                                    return true;
+                                });
+                }
             }
             else
             {

diff --git a/Source/Assets/TouchScript/Editor/TouchScript-Editor.asmdef b/Source/Assets/TouchScript/Editor/TouchScript-Editor.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "TouchScript-Editor",
+    "references": [
+        "TouchScript"
+    ],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}
diff --git a/Source/Assets/TouchScript/Editor/TouchScript-Editor.asmdef.meta b/Source/Assets/TouchScript/Editor/TouchScript-Editor.asmdef.meta
diff --git a/Source/Assets/TouchScript/Editor/TouchScriptSettingsWindow.cs b/Source/Assets/TouchScript/Editor/TouchScriptSettingsWindow.cs
@@ -139,7 +139,7 @@ private void drawListElement(string header, string content, string url)
             {
                 var rect = GUILayoutUtility.GetLastRect();
                 EditorGUIUtility.AddCursorRect(rect, MouseCursor.Link);
-                if (Event.current.type == EventType.mouseDown && rect.Contains(Event.current.mousePosition))
+                if (Event.current.type == EventType.MouseDown && rect.Contains(Event.current.mousePosition))
                     Application.OpenURL(url);
             }
         }

diff --git a/Source/Assets/TouchScript/Editor/Utils/PropertyDrawers/NullToggleDrawer.cs b/Source/Assets/TouchScript/Editor/Utils/PropertyDrawers/NullToggleDrawer.cs
@@ -11,35 +11,41 @@ namespace TouchScript.Editor.Utils.PropertyDrawers
     [CustomPropertyDrawer(typeof(NullToggleAttribute))]
     internal sealed class NullToggleDrawer : PropertyDrawer
     {
-        private bool? expanded = null;
+        private class SharedData
+        {
+            internal bool expanded = false;
+        }
 
         public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
         {
-            updateExpanded(property);
-            if (expanded == false) return 16;
+            var data = updateExpanded(property);
+            if (data.expanded == false) return 16;
             if (property.propertyType == SerializedPropertyType.ObjectReference && property.objectReferenceValue != null) return 16 * 3 + 2 * 2;
             return 16 * 2 + 2;
         }
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            updateExpanded(property);
+            var data = updateExpanded(property);
 
             EditorGUIUtility.labelWidth = 60;
-            Begin(position, property, label);
-            if (expanded == false)
+            bool expandedChanged = Begin(data, position, property, label);
+            if (data.expanded == false)
             {
-                switch (property.propertyType)
+                if (expandedChanged)
                 {
-                    case SerializedPropertyType.ObjectReference:
-                        property.objectReferenceValue = (Object) getNullValue(property);
-                        break;
-                    case SerializedPropertyType.Integer:
-                        property.intValue = (int) getNullValue(property);
-                        break;
-                    case SerializedPropertyType.Float:
-                        property.floatValue = (float) getNullValue(property);
-                        break;
+                    switch (property.propertyType)
+                    {
+                        case SerializedPropertyType.ObjectReference:
+                            property.objectReferenceValue = (Object) getNullValue(property);
+                            break;
+                        case SerializedPropertyType.Integer:
+                            property.intValue = (int) getNullValue(property);
+                            break;
+                        case SerializedPropertyType.Float:
+                            property.floatValue = (float) getNullValue(property);
+                            break;
+                    }
                 }
             }
             else
@@ -70,88 +76,30 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
                 }
             }
             End();
-
-
-            //    case SerializedPropertyType.Float:
-            //        {
-            //            EditorGUI.BeginChangeCheck();
-            //            float floatValue = EditorGUI.FloatField(position, label, property.floatValue);
-            //            if (EditorGUI.EndChangeCheck())
-            //            {
-            //                property.floatValue = floatValue;
-            //            }
-            //            break;
-            //        }
-            //    case SerializedPropertyType.String:
-            //        {
-            //            EditorGUI.BeginChangeCheck();
-            //            string stringValue = EditorGUI.TextField(position, label, property.stringValue);
-            //            if (EditorGUI.EndChangeCheck())
-            //            {
-            //                property.stringValue = stringValue;
-            //            }
-            //            break;
-            //        }
-            //    case SerializedPropertyType.Color:
-            //        {
-            //            EditorGUI.BeginChangeCheck();
-            //            Color colorValue = EditorGUI.ColorField(position, label, property.colorValue);
-            //            if (EditorGUI.EndChangeCheck())
-            //            {
-            //                property.colorValue = colorValue;
-            //            }
-            //            break;
-            //        }
-            //    case SerializedPropertyType.LayerMask:
-            //        EditorGUI.LayerMaskField(position, property, label);
-            //        break;
-            //    case SerializedPropertyType.Enum:
-            //        EditorGUI.Popup(position, property, label);
-            //        break;
-            //    case SerializedPropertyType.Vector2:
-            //        EditorGUI.Vector2Field(position, property, label);
-            //        break;
-            //    case SerializedPropertyType.Vector3:
-            //        EditorGUI.Vector3Field(position, property, label);
-            //        break;
-            //    case SerializedPropertyType.Rect:
-            //        EditorGUI.RectField(position, property, label);
-            //        break;
-            //    case SerializedPropertyType.AnimationCurve:
-            //        {
-            //            int controlID = GUIUtility.GetControlID(EditorGUI.s_CurveHash, EditorGUIUtility.native, position);
-            //            EditorGUI.DoCurveField(EditorGUI.PrefixLabel(position, controlID, label), controlID, null, EditorGUI.kCurveColor, default(Rect), property);
-            //            break;
-            //        }
-            //    case SerializedPropertyType.Bounds:
-            //        EditorGUI.BoundsField(position, property, label);
-            //        break;
-            //    case SerializedPropertyType.Gradient:
-            //        {
-            //            int controlID2 = GUIUtility.GetControlID(EditorGUI.s_CurveHash, EditorGUIUtility.native, position);
-            //            EditorGUI.DoGradientField(EditorGUI.PrefixLabel(position, controlID2, label), controlID2, null, property);
-            //            break;
-            //        }
         }
 
-        private void Begin(Rect position, SerializedProperty property, GUIContent label)
+        private bool Begin(SharedData data, Rect position, SerializedProperty property, GUIContent label)
         {
             label = EditorGUI.BeginProperty(position, label, property);
             label.text = " " + label.text;
             position.height = 16;
             EditorGUIUtility.labelWidth = 180;
-            expanded = EditorGUI.ToggleLeft(position, label, expanded == true);
+            EditorGUI.BeginChangeCheck();
+            data.expanded = EditorGUI.ToggleLeft(position, label, data.expanded == true);
+            return EditorGUI.EndChangeCheck();
         }
 
         private void End()
         {
             EditorGUI.EndProperty();
         }
 
-        private void updateExpanded(SerializedProperty property)
+        private SharedData updateExpanded(SerializedProperty property)
         {
-            if (expanded != null) return;
-            expanded = !isNull(property);
+            var storage = SerializedPropertyUserData<SharedData>.Instance;
+            var data = storage[property];
+            if (data == null) storage[property] = data = new SharedData() { expanded = !isNull(property) };
+            return data;
         }
 
         private bool isNull(SerializedProperty property)

diff --git a/Source/Assets/TouchScript/Editor/Utils/SerializedPropertyUserData.cs b/Source/Assets/TouchScript/Editor/Utils/SerializedPropertyUserData.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Text;
+using UnityEditor;
+
+namespace TouchScript.Editor.Utils
+{
+    internal sealed class SerializedPropertyUserData<TUserData> where TUserData : class
+    {
+        public static SerializedPropertyUserData<TUserData> Instance { get { return instance; } }
+
+        private static SerializedPropertyUserData<TUserData> instance = new SerializedPropertyUserData<TUserData>();
+        private static StringBuilder sb = new StringBuilder();
+        private Dictionary<string, TUserData> storage = new Dictionary<string, TUserData>();
+
+        internal TUserData this[SerializedProperty property]
+        {
+            get
+            {
+                var key = MakeKey(property);
+                TUserData data;
+                if (!storage.TryGetValue(key, out data)) return null;
+                return data;
+            }
+            set
+            {
+                var key = MakeKey(property);
+                storage[key] = value;
+            }
+        }
+
+        private string MakeKey(SerializedProperty property)
+        {
+            if (property == null)
+                throw new System.ArgumentException();
+            var so = property.serializedObject;
+            if (so == null)
+                throw new System.ArgumentException();
+            var to = so.targetObject;
+            if (to == null)
+                throw new System.ArgumentException();
+            sb.Length = 0;
+            sb.Append(to.GetInstanceID().ToString());
+            sb.Append(property.propertyPath);
+            return sb.ToString();
+        }
+    }
+}