Pull request #6: Maintenant, le level editor génère les tilemaps

Merge in CGD/gather-and-defend from feature/LevelEditor_GenerateTilemaps to main

* commit 'ac0e52e0df5857fc846810e4bfc5b6c613e9f4ed':
  Maintenant, le level editor génère les tilemaps

Assets/LevelEditor/Scripts/Editor/LevelEditorCustomInspector.cs

@@ -24,8 +24,7 @@ namespace GatherAndDefend.LevelEditor
 - Load button : iterates through all scene tilemaps and fills them according to what data can be found in the level file.
 
 Important considerations : 
-- the save and load buttons won't work if there is no Level assigned.
-- the loading won't work if the scene tilemap names aren't the same as the tilemap data keys in the Level file", MessageType.None);
+- the save and load buttons won't work if there is no Level assigned.", MessageType.None);
 
             DrawDefaultInspector();
             if (GUILayout.Button(nameof(Create)))
@@ -98,7 +97,7 @@ Important considerations :
 
             foreach (Tilemap tilemap in targ.GetComponentsInChildren<Tilemap>())
             {
-                map.Write(tilemap);
+                map.SaveFromTilemap(tilemap);
             }
 
             AssetDatabase.CreateAsset(map, path + "/" + name + extension);
@@ -114,10 +113,17 @@ Important considerations :
                 return;
             }
 
-            foreach (Tilemap tilemap in targ.GetComponentsInChildren<Tilemap>())
+            while (targ.transform.childCount > 0)
             {
-                tilemap.ClearAllTiles();
-                targ.Level.Read(tilemap);
+                DestroyImmediate(targ.transform.GetChild(0).gameObject);
+            }
+
+            foreach (TilemapData tilemapData in targ.Level)
+            {
+                var tilemap = new GameObject(tilemapData.Key).AddComponent<Tilemap>();
+                var rend = tilemap.gameObject.AddComponent<TilemapRenderer>();
+                tilemapData.LoadToTilemap(tilemap);
+                tilemap.transform.SetParent(targ.transform);
             }
             _infoText = string.Empty;
             EditorSceneManager.MarkAllScenesDirty();

Assets/LevelEditor/Scripts/LevelEditor.cs

@@ -1,9 +1,9 @@
 using UnityEditor;
 using UnityEngine;
-using UnityEngine.Tilemaps;
 
 namespace GatherAndDefend.LevelEditor
 {
+    [RequireComponent(typeof(Grid))]
     public class LevelEditor : MonoBehaviour
     {
         [SerializeField]

Assets/LevelEditor/Scripts/ScriptableObject/Level.cs

@@ -1,25 +1,36 @@
 using System.Collections.Generic;
 using UnityEngine.Tilemaps;
 using UnityEngine;
+using System.Collections;
 
 namespace GatherAndDefend.LevelEditor
 {
-    public class Level : ScriptableObject
+    public class Level : ScriptableObject, IEnumerable<TilemapData>
     {
         [SerializeField]
         private List<TilemapData> _data = new List<TilemapData>();
-        public void Write(Tilemap tilemap)
+        public void SaveFromTilemap(Tilemap tilemap)
         {
             var data = new TilemapData();
             data.SaveFromTilemap(tilemap);
             _data.Add(data);
         }
-        public void Read(Tilemap tilemap)
+        public void LoadToTilemap(Tilemap tilemap)
         {
             var data = _data.Find(x => x.Key == tilemap.name);
             if (data == null) return;
 
             data.LoadToTilemap(tilemap);
         }
+
+        public IEnumerator<TilemapData> GetEnumerator()
+        {
+            return _data.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _data.GetEnumerator();
+        }
     }
 }

Assets/LevelEditor/Scripts/TilemapData.cs

@@ -2,22 +2,46 @@
 using UnityEngine.Tilemaps;
 using UnityEngine;
 using System;
+using System.Collections;
 
 namespace GatherAndDefend.LevelEditor
 {
     [Serializable]
-    public class TilemapData
+    public class TilemapData : IEnumerable<TileData>
     {
+        public const int INVISIBLE_LAYER = 6;
         [SerializeField]
         private string _key;
         [SerializeField]
-        private List<TileData> tiles;
+        private List<TileData> _tiles;
+        [SerializeField]
+        private bool _isInvisible;
+        [SerializeField]
+        private bool _isCollidable;
+        [SerializeField]
+        private bool _isTrigger;
+        [SerializeField]
+        private int _renderOrder;
+        [SerializeField]
+        private string _renderLayer;
+
 
         public string Key => _key;
 
         public void LoadToTilemap(Tilemap reference)
         {
-            foreach (TileData data in tiles)
+            var rend = reference.GetComponent<TilemapRenderer>();
+            rend.sortingOrder = _renderOrder;
+            rend.sortingLayerName = _renderLayer;
+            if (_isInvisible) rend.gameObject.layer = INVISIBLE_LAYER;
+            if (_isCollidable)
+            {
+                var collision = rend.gameObject.AddComponent<TilemapCollider2D>();
+                collision.isTrigger = _isTrigger;
+            }
+
+
+            foreach (TileData data in _tiles)
             {
                 reference.SetTile(data.Position, data.Tile);
             }
@@ -25,7 +49,18 @@ namespace GatherAndDefend.LevelEditor
         public void SaveFromTilemap(Tilemap reference)
         {
             _key = reference.name;
-            tiles = new List<TileData>();
+            if (_isCollidable = reference.GetComponent<TilemapCollider2D>())
+            {
+                _isTrigger = reference.GetComponent<TilemapCollider2D>().isTrigger;
+            }
+            
+            _isInvisible = reference.gameObject.layer == INVISIBLE_LAYER;
+            _renderLayer = reference.GetComponent<TilemapRenderer>().sortingLayerName;
+            _renderOrder = reference.GetComponent<TilemapRenderer>().sortingOrder;
+
+
+            _tiles = new List<TileData>();
+            
             BoundsInt bounds = reference.cellBounds;
             for (int i = bounds.xMin; i <= bounds.xMax; i++)
             {
@@ -35,13 +70,24 @@ namespace GatherAndDefend.LevelEditor
                     TileBase tile = reference.GetTile(position);
                     if (!tile) continue;
                     var tileData = new TileData(position, tile);
-                    tiles.Add(tileData);
+                    _tiles.Add(tileData);
                 }
             }
         }
+
+        public IEnumerator<TileData> GetEnumerator()
+        {
+            return _tiles.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _tiles.GetEnumerator();
+        }
+
         public TilemapData()
         {
-            tiles = new List<TileData>();
+            _tiles = new List<TileData>();
         }
     }
 }