Merge branch 'beta'

Author: Adsito

Assets/MapEditor/Managers/PathManager.cs

@@ -5,9 +5,9 @@
 
 public static class PathManager
 {
-    public static GameObject defaultPath { get; private set; }
-    public static GameObject defaultNode { get; private set; }
-    public static Transform pathParent { get; private set; }
+    public static GameObject DefaultPath { get; private set; }
+    public static GameObject DefaultNode { get; private set; }
+    public static Transform PathParent { get; private set; }
 
     public enum PathType
     {
@@ -24,27 +24,27 @@ public static void Init()
 
     static void OnProjectLoad()
     {
-        defaultPath = Resources.Load<GameObject>("Paths/Path");
-        defaultNode = Resources.Load<GameObject>("Paths/PathNode");
-        pathParent = GameObject.FindGameObjectWithTag("Paths").transform;
+        DefaultPath = Resources.Load<GameObject>("Paths/Path");
+        DefaultNode = Resources.Load<GameObject>("Paths/PathNode");
+        PathParent = GameObject.FindGameObjectWithTag("Paths").transform;
         EditorApplication.update -= OnProjectLoad;
     }
 
     public static void Spawn(PathData pathData)
     {
         Vector3 averageLocation = Vector3.zero;
         for (int j = 0; j < pathData.nodes.Length; j++)
-        {
             averageLocation += pathData.nodes[j];
-        }
+
         averageLocation /= pathData.nodes.Length;
-        GameObject newObject = GameObject.Instantiate(defaultPath, averageLocation + pathParent.position, Quaternion.identity, pathParent);
+        GameObject newObject = GameObject.Instantiate(DefaultPath, averageLocation + PathParent.position, Quaternion.identity, PathParent);
+        newObject.name = pathData.name;
 
         List<GameObject> pathNodes = new List<GameObject>();
         for (int j = 0; j < pathData.nodes.Length; j++)
         {
-            GameObject newNode = GameObject.Instantiate(defaultNode, newObject.transform);
-            newNode.transform.position = pathData.nodes[j] + pathParent.position;
+            GameObject newNode = GameObject.Instantiate(DefaultNode, newObject.transform);
+            newNode.transform.position = pathData.nodes[j] + PathParent.position;
             pathNodes.Add(newNode);
         }
         newObject.GetComponent<PathDataHolder>().pathData = pathData;

Assets/MapEditor/Managers/PrefabManager.cs

@@ -55,6 +55,7 @@ public static GameObject Process(GameObject go, string filePath)
         }
         PrefabDataHolder prefabDataHolder = go.AddComponent<PrefabDataHolder>();
         prefabDataHolder.prefabData = new PrefabData() { id = AssetManager.ToID(filePath) };
+        prefabDataHolder.Setup();
         return go;
     }
 
@@ -107,53 +108,22 @@ private static class Coroutines
         public static IEnumerator SpawnPrefabs(PrefabData[] prefabs)
         {
             IsBusy = true;
-            yield return EditorCoroutineUtility.StartCoroutineOwnerless(PreparePrefabsCoroutine(prefabs));
             yield return EditorCoroutineUtility.StartCoroutineOwnerless(SpawnPrefabsCoroutine(prefabs));
             IsBusy = false;
         }
 
-        private static IEnumerator PreparePrefabsCoroutine(PrefabData[] prefabs)
+        public static IEnumerator ReplaceWithLoaded(PrefabDataHolder[] prefabs)
         {
-            System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
-            sw.Start();
-
-            ProgressBarManager.SetProgressIncrement(1f / prefabs.Length);
-            for (int i = 0; i < prefabs.Length; i++)
-            {
-                if (sw.Elapsed.TotalSeconds > 0.1f)
-                {
-                    sw.Restart();
-                    ProgressBarManager.DisplayIncremental("Processing Prefabs", "Loading Prefabs: " + i + " / " + prefabs.Length);
-                    yield return null;
-                }
-                else
-                    ProgressBarManager.AddIncrement();
-
-                Load(prefabs[i].id);
-            }
-            ProgressBarManager.Clear();
+            IsBusy = true;
+            yield return EditorCoroutineUtility.StartCoroutineOwnerless(ReplaceWithLoadedCoroutine(prefabs));
+            IsBusy = false;
         }
 
-        private static IEnumerator PreparePrefabsCoroutine(PrefabDataHolder[] prefabs)
+        public static IEnumerator ReplaceWithDefault(PrefabDataHolder[] prefabs)
         {
-            System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
-            sw.Start();
-
-            ProgressBarManager.SetProgressIncrement(1f / prefabs.Length);
-            for (int i = 0; i < prefabs.Length; i++)
-            {
-                if (sw.Elapsed.TotalSeconds > 0.1f)
-                {
-                    sw.Restart();
-                    ProgressBarManager.DisplayIncremental("Processing Prefabs", "Loading Prefabs: " + i + " / " + prefabs.Length);
-                    yield return null;
-                }
-                else
-                    ProgressBarManager.AddIncrement();
-
-                Load(prefabs[i].prefabData.id);
-            }
-            ProgressBarManager.Clear();
+            IsBusy = true;
+            yield return EditorCoroutineUtility.StartCoroutineOwnerless(ReplaceWithDefaultCoroutine(prefabs));
+            IsBusy = false;
         }
 
         private static IEnumerator SpawnPrefabsCoroutine(PrefabData[] prefabs)
@@ -164,7 +134,7 @@ private static IEnumerator SpawnPrefabsCoroutine(PrefabData[] prefabs)
             ProgressBarManager.SetProgressIncrement(1f / prefabs.Length);
             for (int i = 0; i < prefabs.Length; i++)
             {
-                if (sw.Elapsed.TotalSeconds > 0.1f)
+                if (sw.Elapsed.TotalSeconds > 2f)
                 {
                     sw.Restart();
                     ProgressBarManager.DisplayIncremental("Spawning Prefabs", "Spawning Prefabs: " + i + " / " + prefabs.Length);
@@ -178,14 +148,6 @@ private static IEnumerator SpawnPrefabsCoroutine(PrefabData[] prefabs)
             ProgressBarManager.Clear();
         }
 
-        public static IEnumerator ReplaceWithLoaded(PrefabDataHolder[] prefabs)
-        {
-            IsBusy = true;
-            yield return EditorCoroutineUtility.StartCoroutineOwnerless(PreparePrefabsCoroutine(prefabs));
-            yield return EditorCoroutineUtility.StartCoroutineOwnerless(ReplaceWithLoadedCoroutine(prefabs));
-            IsBusy = false;
-        }
-
         private static IEnumerator ReplaceWithLoadedCoroutine(PrefabDataHolder[] prefabs)
         {
             System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
@@ -194,7 +156,7 @@ private static IEnumerator ReplaceWithLoadedCoroutine(PrefabDataHolder[] prefabs
             ProgressBarManager.SetProgressIncrement(1f / prefabs.Length);
             for (int i = 0; i < prefabs.Length; i++)
             {
-                if (sw.Elapsed.TotalSeconds > 0.1f)
+                if (sw.Elapsed.TotalSeconds > 2f)
                 {
                     ProgressBarManager.DisplayIncremental("Replacing Prefabs", "Spawning Prefabs: " + i + " / " + prefabs.Length);
                     yield return null;
@@ -209,13 +171,6 @@ private static IEnumerator ReplaceWithLoadedCoroutine(PrefabDataHolder[] prefabs
             ProgressBarManager.Clear();
         }
 
-        public static IEnumerator ReplaceWithDefault(PrefabDataHolder[] prefabs)
-        {
-            IsBusy = true;
-            yield return EditorCoroutineUtility.StartCoroutineOwnerless(ReplaceWithDefaultCoroutine(prefabs));
-            IsBusy = false;
-        }
-
         private static IEnumerator ReplaceWithDefaultCoroutine(PrefabDataHolder[] prefabs)
         {
             System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();

Assets/MapEditor/WorldData/PrefabDataHolder.cs

@@ -5,24 +5,23 @@
 
 [DisallowMultipleComponent]
 [SelectionBase]
-[ExecuteAlways]
 public class PrefabDataHolder : MonoBehaviour
 {
     public WorldSerialization.PrefabData prefabData;
 
-    private void Start()
+    public void Setup()
     {
         for (int i = 0; i < GetComponents<Component>().Length; i++)
-        {
             ComponentUtility.MoveComponentUp(this);
-        }
     }
+
     public void UpdatePrefabData()
     {
         prefabData.position = gameObject.transform.position - (0.5f * land.terrainData.size);
         prefabData.rotation = transform.rotation;
         prefabData.scale = transform.localScale;
     }
+
     public void SnapToGround()
     {
         Vector3 newPos = transform.position;