Merge branch 'beta'

Author: Adsito

Assets/MapEditor/Editor/Managers/SceneViewManager.cs

@@ -33,17 +33,13 @@ public static bool GetMouseScenePos(out RaycastHit hit)
     private static void SpawnPrefab()
     {
         if (GetMouseScenePos(out RaycastHit hit))
-        {
             PrefabManager.Spawn(hit.point);
-        }
     }
 
     private static void OnMouseDown()
     {
         if (Event.current.button == 0)
-        {
             SpawnPrefab();
-        }
     }
 
     private static void OnDragExited()

Assets/MapEditor/Editor/TreeView/PrefabsList/PrefabsListTreeView.cs

@@ -232,9 +232,12 @@ void SetItemSelected(int id)
             var itemClicked = treeModel.Find(id);
             if (itemClicked.rustID == 0)
                 return;
+
+            PrefabManager.Load(itemClicked.rustID).SetActive(true);
             previewImage = AssetPreview.GetAssetPreview(PrefabManager.Load(itemClicked.rustID));
             if (previewImage == null)
                 previewImage = new Texture2D(60, 60);
+
             prefabData = PrefabManager.Load(itemClicked.rustID).GetComponent<PrefabDataHolder>().prefabData;
             prefabName = itemClicked.prefabName;
         }

Assets/MapEditor/Managers/AssetManager.cs

@@ -11,12 +11,12 @@ public static class AssetManager
 
 	public static AssetBundleManifest AssetManifest { get; private set; }
 
-	private static Dictionary<uint, string> IDLookup = new Dictionary<uint, string>();
-	private static Dictionary<string, uint> PathLookup = new Dictionary<string, uint>();
+	public static Dictionary<uint, string> IDLookup { get; private set; } = new Dictionary<uint, string>();
+	public static Dictionary<string, uint> PathLookup { get; private set; } = new Dictionary<string, uint>();
 
-	public static Dictionary<string, AssetBundle> Bundles = new Dictionary<string, AssetBundle>(System.StringComparer.OrdinalIgnoreCase);
-	public static Dictionary<string, AssetBundle> AssetPaths = new Dictionary<string, AssetBundle>(System.StringComparer.OrdinalIgnoreCase);
-	public static Dictionary<string, Object> Cache = new Dictionary<string, Object>();
+	public static Dictionary<string, AssetBundle> Bundles { get; private set; } = new Dictionary<string, AssetBundle>(System.StringComparer.OrdinalIgnoreCase);
+	public static Dictionary<string, AssetBundle> AssetPaths { get; private set; } = new Dictionary<string, AssetBundle>(System.StringComparer.OrdinalIgnoreCase);
+	public static Dictionary<string, Object> Cache { get; private set; } = new Dictionary<string, Object>();
 
 	public static bool IsInitialised { get; private set; }
 
@@ -69,7 +69,7 @@ public static void Initialise(string bundlesRoot)
 				return;
 			}
 
-			for (uint index = 0; (long)index < (long)Manifest.pooledStrings.Length; ++index)
+			for (uint index = 0; index < Manifest.pooledStrings.Length; ++index)
 			{
 				IDLookup.Add(Manifest.pooledStrings[index].hash, Manifest.pooledStrings[index].str);
 				PathLookup.Add(Manifest.pooledStrings[index].str, Manifest.pooledStrings[index].hash);
@@ -86,7 +86,7 @@ public static void Initialise(string bundlesRoot)
 			Debug.Log("Bundle already loaded.");
 	}
 
-	public static T GetAsset<T>(string filePath) where T : Object
+	private static T GetAsset<T>(string filePath) where T : Object
 	{
 		AssetBundle bundle = null;
 

Assets/MapEditor/Managers/PrefabManager.cs

@@ -55,7 +55,6 @@ public static GameObject Process(GameObject go, string filePath)
         }
         PrefabDataHolder prefabDataHolder = go.AddComponent<PrefabDataHolder>();
         prefabDataHolder.prefabData = new PrefabData() { id = AssetManager.ToID(filePath) };
-        go.SetActive(true);
         return go;
     }
 
@@ -67,14 +66,15 @@ public static void Spawn(GameObject go, PrefabData prefabData, Transform parent)
         newObj.transform.localScale = new Vector3(prefabData.scale.x, prefabData.scale.y, prefabData.scale.z);
         newObj.name = go.name;
         newObj.GetComponent<PrefabDataHolder>().prefabData = prefabData;
+        newObj.SetActive(true);
     }
 
     /// <summary>Spawns the prefab set in PrefabToSpawn at the spawnPos</summary>
     public static void Spawn(Vector3 spawnPos)
     {
         if (PrefabToSpawn != null)
         {
-            GameObject.Instantiate(PrefabToSpawn, spawnPos, Quaternion.Euler(0, 0, 0), PrefabParent);
+            GameObject.Instantiate(PrefabToSpawn, spawnPos, Quaternion.Euler(0, 0, 0), PrefabParent).SetActive(true);
             PrefabToSpawn = null;
         }
     }