CacheCompactionの機能を有効化

Author: a3geek

Assets/PhysicsLayers/Example/Scripts/TestController.cs

@@ -16,8 +16,13 @@ public class TestController : MonoBehaviour
     {
         [SerializeField]
         private FieldInfo fieldInfo = new FieldInfo();
-
-        private List<AbstractCollisionCallbacks> collisions = new List<AbstractCollisionCallbacks>();
+        [SerializeField]
+        private bool autoRespawn = true;
+        [SerializeField, Range(0f, 1f)]
+        private float respawnRate = 0.05f;
+        
+        private bool spawned = false;
+        private Dictionary<int, List<AbstractCollisionCallbacks>> collisions = new Dictionary<int, List<AbstractCollisionCallbacks>>();
 
 
         void Awake()
@@ -27,25 +32,53 @@ void Awake()
 
         void Update()
         {
+            if(this.spawned == false)
+            {
+                return;
+            }
+            
             if(Input.GetKeyDown(KeyCode.Space))
             {
-                this.collisions
-                    .FindAll(coll => coll.LayerID == LayersManager.UnityLayerCount)
+                this.collisions[LayersManager.UnityLayerCount]
                     .ForEach(coll => coll.gameObject.SetActive(!coll.gameObject.activeSelf));
             }
 
             if(Input.GetKeyDown(KeyCode.A))
             {
-                var colls = this.collisions
-                    .FindAll(coll => coll.LayerID == LayersManager.UnityLayerCount).ToArray();
+                var colls = this.collisions[LayersManager.UnityLayerCount];
 
-                for(var i = 0; i < colls.Length; i++)
+                for(var i = 0; i < colls.Count; i++)
                 {
+                    colls[i].Layer.ChangeLayer(LayersManager.UnityLayerCount + 1);
                     colls[i].UpdateIgnoreLayers();
                 }
             }
-        }
 
+            if(this.autoRespawn == false || Random.value > this.respawnRate)
+            {
+                return;
+            }
+
+            var keys = this.collisions.Keys.ToList();
+            var layerID = keys[Random.Range(0, keys.Count)];
+
+            if(Random.value <= 0.5f)
+            {
+                Debug.Log("Destroy");
+                var colls = this.collisions[layerID];
+                var coll = colls[Random.Range(0, colls.Count)];
+
+                this.collisions[layerID].Remove(coll);
+                Destroy(coll.gameObject);
+            }
+            else
+            {
+                Debug.Log("Create");
+                var info = this.fieldInfo.Infos.FirstOrDefault(e => e.Prefab.LayerID == layerID);
+                this.Create(info.Prefab, info.Parent, info.Color);
+            }
+        }
+        
         private IEnumerator Spawn()
         {
             for(var i = 0; i < this.fieldInfo.Infos.Count; i++)
@@ -54,19 +87,27 @@ private IEnumerator Spawn()
 
                 var parent = new GameObject(info.Prefab.name + "s");
                 parent.transform.parent = transform;
+                info.Parent = parent.transform;
+
+                this.collisions.Add(info.Prefab.LayerID, new List<AbstractCollisionCallbacks>());
 
                 for(var j = 0; j < info.Count; j++)
                 {
-                    var obj = Instantiate(info.Prefab);
-                    obj.name = i + ":" + obj.name;
-                    obj.transform.parent = parent.transform;
-                    
-                    obj.GetComponent<Renderer>().material.SetColor("_Color", info.Color);
-                    this.collisions.Add(obj);
-
+                    this.Create(info.Prefab, parent.transform, info.Color);
                     yield return new WaitForSeconds(0f);
                 }
             }
+
+            this.spawned = true;
+        }
+
+        private void Create(AbstractCollisionCallbacks prefab, Transform parent, Color color)
+        {
+            var obj = Instantiate(prefab);
+            obj.transform.parent = parent;
+
+            obj.GetComponent<Renderer>().material.SetColor("_Color", color);
+            this.collisions[obj.LayerID].Add(obj);
         }
 
         [Serializable]
@@ -78,6 +119,9 @@ public class Info
                 public AbstractCollisionCallbacks Prefab = null;
                 public int Count = 1;
                 public Color Color = Color.white;
+
+                [HideInInspector]
+                public Transform Parent = null;
             }
 
             public List<Info> Infos = new List<Info>();

Assets/PhysicsLayers/Scripts/Common/IntervalExecutor.cs

@@ -35,6 +35,7 @@ public void Update()
             {
                 this.actions[this.index]();
 
+                this.timer = 0f;
                 this.index++;
                 if(this.index >= this.actions.Count)
                 {

Assets/PhysicsLayers/Scripts/Components/CollisionInfosSetter.cs

@@ -107,8 +107,15 @@ private void AddCollLayer(int id)
                 this.collLayers.Add(id, new CacheableArray<AbsCollLayer>(this.manager.cacheCapacity));
                 this.collLayers2D.Add(id, new CacheableArray<AbsCollLayer2D>(this.manager.cacheCapacity));
 
-                this.manager.compactionExecutor.AddAction(() => this.collLayers[id].CacheCompaction());
-                this.manager.compactionExecutor.AddAction(() => this.collLayers2D[id].CacheCompaction());
+                this.manager.compactionExecutor.AddAction(() =>
+                {
+                    this.collLayers[id].CacheCompaction();
+                });
+                
+                this.manager.compactionExecutor.AddAction(() =>
+                {
+                    this.collLayers2D[id].CacheCompaction();
+                });
             }
         }
     }

Assets/PhysicsLayers/Scripts/LayersManager.cs

@@ -111,6 +111,11 @@ private static void Initialize()
             ins.collisionInfosSetter = new CollisionInfosSetter(ins);
         }
 
+        private void Update()
+        {
+            this.compactionExecutor.Update();
+        }
+
         public IEnumerable<int> GetIgnoreLayerIDs(int layerID)
         {
             return this.AllLayerInfos.GetIgnoreLayerIDs(layerID);

ProjectSettings/ProjectSettings.asset

@@ -1 +1 @@
-m_EditorVersion: 5.5.0f3
+m_EditorVersion: 5.6.3f1