InspectorにDeleteボタンを追加し、既存のPhysics Settingの複製機能を追加。

Author: a3geek

Assets/PhysicsLayers/Editor/LayersManagerInspector.Drawers.cs

@@ -8,15 +8,13 @@ namespace a3geek.PhysicsLayers.Editors
 {
     using Common;
     using Components;
-
-    using LayerDic = Dictionary<Components.LayerID, string>;
 
     public partial class LayersManagerInspector
     {
         private List<bool> collInfosFolders = new List<bool>();
 
 
-        private void DrawPhysicsLayers(LayerDic layers)
+        private void DrawPhysicsLayers(Dictionary<int, string> layers)
         {
             EditorGUI.indentLevel += 1;
 
@@ -32,21 +30,21 @@ private void DrawPhysicsLayers(LayerDic layers)
 
                 EditorGUILayout.Space();
 
-                var layerIDs = new List<LayerID>(layers.Keys);
+                var layerIDs = new List<int>(layers.Keys);
                 foreach(var layerID in layerIDs)
                 {
                     using(var hori = new EditorGUILayout.HorizontalScope())
                     {
                         var layerName = layers[layerID];
 
-                        EditorGUILayout.PrefixLabel("Layer ID : " + layerID.ID);
+                        EditorGUILayout.PrefixLabel("Layer ID : " + layerID);
                         layers[layerID] = EditorGUILayout.DelayedTextField(layerName);
 
                         if(string.IsNullOrEmpty(layers[layerID]) == true)
                         {
                             layers[layerID] = layerName;
                         }
-
+                        
                         if(GUILayout.Button("Delete"))
                         {
                             layers.Remove(layerID);
@@ -75,14 +73,14 @@ private void DrawCollInfos(PhysicsLayerInfos layerInfos)
                 }
 
                 var collInfos = physicsLayer.CollisionInfos;
-
+                
                 EditorGUI.indentLevel += 1;
                 using(var vert = new EditorGUILayout.VerticalScope())
                 {
                     var keys = collInfos.Keys.OrderBy(info => info);
                     var unityKeys = keys.Where(key => key < LayersManager.UnityLayerCount);
                     var physicsKeys = keys.Where(key => key >= LayersManager.UnityLayerCount);
-
+                    
                     EditorGUILayout.LabelField("Layers");
                     foreach(var key in unityKeys)
                     {
@@ -112,11 +110,11 @@ private void DrawCollInfos(PhysicsLayerInfos layerInfos)
             EditorGUI.indentLevel -= 1;
         }
 
-        private bool DrawCollInfo(LayerID layerID, bool collision)
+        private bool DrawCollInfo(int layerID, bool collision)
         {
             using(var hori = new EditorGUILayout.HorizontalScope())
             {
-                EditorGUILayout.PrefixLabel(this.Target.LayerToName(layerID) + " : " + layerID.ID);
+                EditorGUILayout.PrefixLabel(this.Target.LayerToName(layerID));
                 return EditorGUILayout.Toggle(collision);
             }
         }

Assets/PhysicsLayers/Editor/LayersManagerInspector.cs

@@ -39,6 +39,10 @@ public override void OnInspectorGUI()
                         this.UpdateLayer(physicsLayerInfos, physicsLayers);
                         this.SetDirty();
                     }
+                    else
+                    {
+                        this.UpdateLayer(physicsLayerInfos, physicsLayers);
+                    }
                 }
 
                 if(physicsLayerInfos.LayerCount <= 0)
@@ -67,12 +71,22 @@ public override void OnInspectorGUI()
             Undo.IncrementCurrentGroup();
         }
 
-        private void UpdateLayer(PhysicsLayerInfos target, Dictionary<LayerID, string> physicsLayers)
+        private void UpdateLayer(PhysicsLayerInfos infos, Dictionary<int, string> physicsLayers)
         {
-            target.Update(physicsLayers);
+            infos.Update(physicsLayers, true);
 
+            physicsLayers = infos.Layers;
             physicsLayers.AddRange(this.Target.UnityLayerInfos.Layers);
-            target.GetEnumerable().ToList().ForEach(infos => infos.Update(physicsLayers.Keys.ToList()));
+
+            this.UpdateLayerCollision(infos, physicsLayers.Keys);
+        }
+
+        private void UpdateLayerCollision(PhysicsLayerInfos infos, IEnumerable<int> layers)
+        {
+            foreach(var layer in infos.GetEnumerable())
+            {
+                layer.Update(layers);
+            }
         }
     }
 }

Assets/PhysicsLayers/Example/PhysicsLayers.unity

@@ -8,31 +8,26 @@ namespace a3geek.PhysicsLayers.Common
 {
     public static class DictionaryExtension
     {
-        public static void ForEach<T1, T2>(this Dictionary<T1, T2> source, Action<KeyValuePair<T1, T2>> action)
+        public static List<T3> ToList<T1, T2, T3>(this Dictionary<T1, T2> source, Func<KeyValuePair<T1, T2>, T3> converter)
         {
+            var list = new List<T3>();
             foreach(var pair in source)
             {
-                action(pair);
+                list.Add(converter(pair));
             }
-        }
-
-        public static List<T3> ToList<T1, T2, T3>(this Dictionary<T1, T2> source, Func<KeyValuePair<T1, T2>, T3> converter)
-        {
-            var list = new List<T3>();
-            source.ForEach(pair => list.Add(converter(pair)));
 
             return list;
         }
 
         public static void AddRange<T1, T2>(this Dictionary<T1, T2> source, Dictionary<T1, T2> other)
         {
-            other.ForEach(pair =>
+            foreach(var pair in other)
             {
                 if(source.ContainsKey(pair.Key) == false)
                 {
                     source.Add(pair.Key, pair.Value);
                 }
-            });
+            }
         }
 
         public static void SetCount<T1, T2>(this Dictionary<T1, T2> source, int count, Func<int, T1> defaultKey, Func<int, T2> defaultValue)

Assets/PhysicsLayers/Scripts/Common/DictionaryExtension.cs

@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+using System.Linq;
+
+namespace a3geek.PhysicsLayers.Components
+{
+    [Serializable]
+    public abstract class AbstractLayer : ILayer
+    {
+        public int LayerID
+        {
+            get { return this.layerID; }
+            internal set { this.layerID = this.AdjustLayerID(value, this.IsPhysicsLayer()); }
+        }
+
+        public abstract string LayerName { get; internal set; }
+        
+        [SerializeField]
+        private int layerID = 0;
+
+
+        public abstract bool IsPhysicsLayer();
+
+        protected int AdjustLayerID(int layerID, bool isPhysicsLayer)
+        {
+            return isPhysicsLayer == true ?
+                Mathf.Max(LayersManager.UnityLayerCount, layerID) : // 32 ~
+                Mathf.Min(LayersManager.UnityLayerCount - 1, Mathf.Max(0, layerID)); // 0 ~ 31
+        }
+    }
+}

Assets/PhysicsLayers/Scripts/Components/AbstractLayer.cs

@@ -19,9 +19,9 @@ public T this[string layerName]
         }
 
         public abstract int LayerCount { get; }
-        public abstract Dictionary<LayerID, string> Layers { get; }
-        public abstract List<LayerID> LayerIDs { get; }
-        public abstract List<string> LayerNames { get; }
+        public abstract Dictionary<int, string> Layers { get; }
+        public abstract IEnumerable<int> LayerIDs { get; }
+        public abstract IEnumerable<string> LayerNames { get; }
 
         [SerializeField]
         protected List<T> layers = new List<T>();
@@ -36,7 +36,7 @@ public virtual string LayerToName(int layerID)
         public virtual int NameToLayer(string layerName)
         {
             var layer = this[layerName];
-            return layer == null ? -1 : layer.LayerID.ID;
+            return layer == null ? -1 : layer.LayerID;
         }
 
         public virtual IEnumerable<T> GetEnumerable()

Assets/PhysicsLayers/Scripts/Components/LayerID.cs.meta Assets/PhysicsLayers/Scripts/Components/AbstractLayer.cs.meta

@@ -8,7 +8,7 @@ namespace a3geek.PhysicsLayers.Components
 {
     public interface ILayer
     {
-        LayerID LayerID { get; }
+        int LayerID { get; }
         string LayerName { get; }
     }
 }

Assets/PhysicsLayers/Scripts/Components/AbstractLayerInfos.cs

@@ -9,9 +9,9 @@ namespace a3geek.PhysicsLayers.Components
     public interface ILayerInfos
     {
         int LayerCount { get; }
-        Dictionary<LayerID, string> Layers { get; }
-        List<LayerID> LayerIDs { get; }
-        List<string> LayerNames { get; }
+        Dictionary<int, string> Layers { get; }
+        IEnumerable<int> LayerIDs { get; }
+        IEnumerable<string> LayerNames { get; }
 
         string LayerToName(int layerID);
         int NameToLayer(string layerName);

Assets/PhysicsLayers/Scripts/Components/ILayer.cs

@@ -9,30 +9,20 @@ namespace a3geek.PhysicsLayers.Components
     [Serializable]
     public sealed class LayerCollision
     {
-        public LayerID LayerID
+        public int LayerID
         {
-            get { return this.layerID == null ? -1 : this.layerID.ID; }
+            get { return this.layerID; }
+            internal set { this.layerID = Mathf.Max(0, value); }
         }
         public bool Collision
         {
             get { return this.collision; }
             internal set { this.collision = value; }
         }
-        
+
         [SerializeField]
-        private LayerID layerID = null;
+        private int layerID = 0;
         [SerializeField]
         private bool collision = true;
-
-        
-        public LayerCollision(LayerID layerID)
-        {
-            this.layerID = layerID;
-        }
-
-        public LayerCollision(LayerID layerID, bool collision) : this(layerID)
-        {
-            this.collision = collision;
-        }
     }
 }