Merge branch 'beta'

Author: Adsito

Assets/MapEditor/Editor/PrefabDataHolderEditor.cs

@@ -14,6 +14,6 @@ public override void OnInspectorGUI()
         Functions.PrefabID(script);
         Functions.SnapToGround(script);
         Functions.ToggleLights(script);
-        //Functions.BreakPrefab(script);
+        Functions.BreakPrefab(script);
     }
 }

Assets/MapEditor/Managers/MapManager.cs

@@ -716,20 +716,20 @@ public static IEnumerator Load(MapInfo mapInfo, string loadPath = "")
             }  
 
             int progressID = Progress.Start("Load: " + loadPath.Split('/').Last(), "Preparing Map", Progress.Options.Sticky);
-            int prefabID = Progress.Start("Prefabs", null, Progress.Options.Sticky, progressID);
-            int prefabID2 = Progress.Start("Prefabs", null, Progress.Options.Sticky, progressID);
-            int pathID = Progress.Start("Paths", null, Progress.Options.Sticky, progressID);
-            int pathID2 = Progress.Start("Paths", null, Progress.Options.Sticky, progressID);
+            int delPrefab = Progress.Start("Prefabs", null, Progress.Options.Sticky, progressID);
+            int spwPrefab = Progress.Start("Prefabs", null, Progress.Options.Sticky, progressID);
+            int delPath = Progress.Start("Paths", null, Progress.Options.Sticky, progressID);
+            int spwPath = Progress.Start("Paths", null, Progress.Options.Sticky, progressID);
             int terrainID = Progress.Start("Terrain", null, Progress.Options.Sticky, progressID);
 
             var splatMapTask = Task.Run(() => SetSplatMaps(mapInfo));
 
-            PrefabManager.DeletePrefabs(PrefabManager.CurrentMapPrefabs, prefabID);
-            PathManager.DeletePaths(PathManager.CurrentMapPaths, pathID);
+            PrefabManager.DeletePrefabs(PrefabManager.CurrentMapPrefabs, delPrefab);
+            PathManager.DeletePaths(PathManager.CurrentMapPaths, delPath);
             CentreSceneObjects(mapInfo);
             SetTerrain(mapInfo, terrainID);
-            PrefabManager.SpawnPrefabs(mapInfo.prefabData, prefabID2);
-            PathManager.SpawnPaths(mapInfo.pathData, pathID2);
+            PrefabManager.SpawnPrefabs(mapInfo.prefabData, spwPrefab);
+            PathManager.SpawnPaths(mapInfo.pathData, spwPath);
 
             System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
             sw.Start();
@@ -741,8 +741,18 @@ public static IEnumerator Load(MapInfo mapInfo, string loadPath = "")
                     yield return null;
                 }
             }
+
             SetLayer(LandLayer, TerrainTopology.TypeToIndex((int)TopologyLayer)); // Sets the alphamaps to the currently selected.
-            yield return null;
+
+            while (Progress.GetProgressById(spwPrefab).running)
+            {
+                if (sw.Elapsed.TotalMilliseconds > 0.05f)
+                {
+                    sw.Restart();
+                    yield return null;
+                }
+            }
+
             Progress.Report(progressID, 0.99f, "Loaded");
             Progress.Finish(progressID, Progress.Status.Succeeded);
         }

Assets/MapEditor/Managers/PrefabManager.cs

@@ -165,10 +165,44 @@ public static void RenamePrefabs(PrefabDataHolder[] prefabs, string name)
 
     public static void BreakPrefab(GameObject prefab)
     {
+        EditorCoroutineUtility.StartCoroutineOwnerless(Coroutines.BreakPrefab(prefab));
     }
 
     private static class Coroutines
     {
+        public static IEnumerator BreakPrefab(GameObject prefab)
+        {
+            System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
+            sw.Start();
+
+            var transforms = prefab.GetComponentsInChildren<Transform>();
+            int progressId = Progress.Start("Break Prefab", null, Progress.Options.Sticky);
+
+            for (int i = 0; i < transforms.Length; i++)
+            {
+                if (sw.Elapsed.TotalSeconds > 0.5f)
+                {
+                    yield return null;
+                    Progress.Report(progressId, (float)i / transforms.Length, "Scanning Prefab: " + i + " / " + transforms.Length);
+                    sw.Restart();
+                }
+                var nameSplit = transforms[i].gameObject.name.Split(' ');
+                var prefabName = nameSplit[0].Trim() + ".prefab";
+                var prefabPaths = AssetManager.ManifestStrings.Where(x => x.Contains(prefabName));
+                if (prefabPaths.Count() == 1)
+                {
+                    GameObject go = GameObject.Instantiate(Load(prefabPaths.First()), PrefabParent);
+                    go.transform.position = transforms[i].gameObject.transform.position;
+                    go.transform.rotation = transforms[i].gameObject.transform.rotation;
+                    go.transform.localScale = transforms[i].gameObject.transform.localScale;
+                    go.name = Load(prefabPaths.First()).name;
+                    go.SetActive(true);
+                }
+            }
+            GameObject.DestroyImmediate(prefab);
+            Progress.Finish(progressId);
+        }
+
         public static IEnumerator SpawnPrefabs(PrefabData[] prefabs, int progressID)
         {
             System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
@@ -254,4 +288,4 @@ public static IEnumerator ReplaceWithDefault(PrefabDataHolder[] prefabs, int pro
             IsChangingPrefabs = false;
         }
     }
-}
+}