TerrainManager Coroutines

- Moved SaveLayer and ChangeLayer over to Coroutines.
- Fixed layers not being saved on ChangeLandLayer.
- Fixed LastTopologyLayer not being used when saving layers.

Author: Adsito

Assets/MapEditor/Managers/MapManager.cs

@@ -1090,7 +1090,7 @@ public static void Load(WorldSerialization world, string loadPath = "")
     /// <param name="path">The path to save to.</param>
     public static void Save(string path)
     {
-        SaveLayer(TerrainTopology.TypeToIndex((int)TopologyLayer));
+        SaveLayer();
         ProgressBarManager.Display("Saving Map: " + path, "Saving Prefabs ", 0.4f);
         WorldSerialization world = TerrainToWorld(Land, Water);
         ProgressBarManager.Display("Saving Map: " + path, "Saving to disk ", 0.8f);

Assets/MapEditor/Managers/TerrainManager.cs

@@ -124,11 +124,7 @@ private static void TextureChanged(Terrain terrain, string textureName, RectInt
         /// <param name="topology">The Topology layer to change to.</param>
         public static void ChangeLandLayer(LandLayers layer, int topology = 0)
         {
-            if (layer == LandLayers.Alpha)
-                return;
-            if (layer == LandLayer)
-                SaveLayer(LastTopologyLayer);
-            SetLayer(layer, topology);
+            EditorCoroutineUtility.StartCoroutineOwnerless(Coroutine.ChangeLayer(layer, topology));
         }
 
         /// <summary>Returns the SplatMap at the selected LandLayer.</summary>
@@ -195,27 +191,10 @@ public static void SetLayer(LandLayers layer, int topology = 0)
         }
 
         /// <summary>Saves any changes made to the Alphamaps, like the paint brush.</summary>
-        /// <param name="topologyLayer">The Topology layer, if active.</param>
-        public static void SaveLayer(int topologyLayer = 0)
+        /// <param name="topology">The Topology layer, if active.</param>
+        public static void SaveLayer()
         {
-            if (LayerSet == false)
-            {
-                Debug.LogError("Saving Layer before layer is set");
-                return;
-            }
-
-            switch (LandLayer)
-            {
-                case LandLayers.Ground:
-                    GroundArray = Land.terrainData.GetAlphamaps(0, 0, Land.terrainData.alphamapWidth, Land.terrainData.alphamapHeight);
-                    break;
-                case LandLayers.Biome:
-                    BiomeArray = Land.terrainData.GetAlphamaps(0, 0, Land.terrainData.alphamapWidth, Land.terrainData.alphamapHeight);
-                    break;
-                case LandLayers.Topology:
-                    TopologyArray[topologyLayer] = Land.terrainData.GetAlphamaps(0, 0, Land.terrainData.alphamapWidth, Land.terrainData.alphamapHeight);
-                    break;
-            }
+            EditorCoroutineUtility.StartCoroutineOwnerless(Coroutine.SaveLayer());
         }
 
         private static void GetTextures()
@@ -274,12 +253,24 @@ private static TerrainLayer[] GetGroundTextures()
 
         private class Coroutines
         {
+            public IEnumerator ChangeLayer(LandLayers layer, int topology = 0)
+            {
+                yield return EditorCoroutineUtility.StartCoroutineOwnerless(SaveLayerCoroutine());
+                yield return EditorCoroutineUtility.StartCoroutineOwnerless(SetLayerCoroutine(layer, topology));
+                LayerSet = true;
+            }
+
             public IEnumerator SetLayer(LandLayers layer, int topology = 0)
             {
                 yield return EditorCoroutineUtility.StartCoroutineOwnerless(SetLayerCoroutine(layer, topology));
                 LayerSet = true;
             }
 
+            public IEnumerator SaveLayer()
+            {
+                yield return EditorCoroutineUtility.StartCoroutineOwnerless(SaveLayerCoroutine());
+            }
+
             private IEnumerator SetLayerCoroutine(LandLayers layer, int topology = 0)
             {
                 if (GroundTextures == null || BiomeTextures == null || MiscTextures == null)
@@ -307,6 +298,28 @@ private IEnumerator SetLayerCoroutine(LandLayers layer, int topology = 0)
                 TopologyLayer = (TerrainTopology.Enum)TerrainTopology.IndexToType(topology);
                 yield return null;
             }
+
+            private IEnumerator SaveLayerCoroutine()
+            {
+                while (!LayerSet)
+                {
+                    yield return null;
+                }
+
+                switch (LandLayer)
+                {
+                    case LandLayers.Ground:
+                        GroundArray = Land.terrainData.GetAlphamaps(0, 0, Land.terrainData.alphamapWidth, Land.terrainData.alphamapHeight);
+                        break;
+                    case LandLayers.Biome:
+                        BiomeArray = Land.terrainData.GetAlphamaps(0, 0, Land.terrainData.alphamapWidth, Land.terrainData.alphamapHeight);
+                        break;
+                    case LandLayers.Topology:
+                        TopologyArray[LastTopologyLayer] = Land.terrainData.GetAlphamaps(0, 0, Land.terrainData.alphamapWidth, Land.terrainData.alphamapHeight);
+                        break;
+                }
+                yield return null;
+            }
         }
     }
 }