Merge branch 'beta'

Author: Adsito

.gitignore

@@ -15,4 +15,5 @@ Library/*
 /.vs/
 /obj/
 *.sln
-AssetDump.txt
+AssetDump.txt
+UserSettings/EditorUserSettings.asset

Assets/MapEditor/Editor/API/Elements.cs

@@ -22,6 +22,11 @@ public static void ToolbarLabel(GUIContent guiContent)
             GUILayout.Label(guiContent, EditorStyles.toolbarButton);
         }
 
+        public static bool ToolbarCheckBox(GUIContent guiContent, bool toggle)
+        {
+            return EditorGUILayout.ToggleLeft(guiContent, toggle, "ToolbarButton");
+        }
+
         public static void ToolbarLabelField(GUIContent label, GUIContent label2)
         {
             EditorGUILayout.LabelField(label, label2);

Assets/MapEditor/Editor/API/Functions.cs

@@ -4,7 +4,6 @@
 using UnityEditor;
 using RustMapEditor.Variables;
 using static RustMapEditor.Data.TerrainManager;
-using RustMapEditor.Data;
 
 namespace RustMapEditor.UI
 {
@@ -96,7 +95,7 @@ public static void LoadMapPanel()
                 return;
             var world = new WorldSerialization();
             world.Load(loadFile);
-            MapManager.Load(world, loadFile);
+            MapManager.Load(WorldConverter.WorldToTerrain(world), loadFile);
             ReloadTreeViews();
         }
 
@@ -112,7 +111,6 @@ public static void SaveMapPanel(string mapName = "custommap")
             saveFile = EditorUtility.SaveFilePanel("Save Map File", saveFile, mapName, "map");
             if (string.IsNullOrEmpty(saveFile))
                 return;
-            ProgressBarManager.Display("Saving Map: " + saveFile, "Saving Heightmap ", 0.1f);
             MapManager.Save(saveFile);
         }
 
@@ -208,6 +206,10 @@ public static void EditorSettings()
             if (EditorGUI.EndChangeCheck())
                 SetWaterTransparency(SettingsManager.WaterTransparency);
 
+            Elements.BeginToolbarHorizontal();
+            SettingsManager.LoadBundleOnProjectLoad = Elements.ToolbarCheckBox(ToolTips.loadBundleOnProjectLoad, SettingsManager.LoadBundleOnProjectLoad);
+            Elements.EndToolbarHorizontal();
+
         }
         #endregion
 
@@ -216,36 +218,11 @@ public static void PrefabTools(ref bool deleteOnExport, string lootCrateSaveFile
         {
             Elements.MiniBoldLabel(ToolTips.toolsLabel);
 
-            Elements.BeginToolbarHorizontal();
-            deleteOnExport = Elements.ToolbarToggle(ToolTips.deleteOnExport, deleteOnExport);
-            if (Elements.ToolbarButton(ToolTips.exportMapLootCrates))
-            {
-                lootCrateSaveFile = EditorUtility.SaveFilePanel("Export LootCrates", lootCrateSaveFile, "LootCrateData", "json");
-                if (!String.IsNullOrEmpty(lootCrateSaveFile))
-                    MapManager.ExportLootCrates(lootCrateSaveFile, deleteOnExport);
-            }
-            if (Elements.ToolbarButton(ToolTips.exportMapPrefabs))
-            {
-                mapPrefabSaveFile = EditorUtility.SaveFilePanel("Export Map Prefabs", mapPrefabSaveFile, "MapData", "json");
-                if (!String.IsNullOrEmpty(mapPrefabSaveFile))
-                    MapManager.ExportMapPrefabs(mapPrefabSaveFile, deleteOnExport);
-            }
-            Elements.EndToolbarHorizontal();
-
-            Elements.BeginToolbarHorizontal();
-            if (Elements.ToolbarButton(ToolTips.hidePrefabsInRustEdit))
-                MapManager.HidePrefabsInRustEdit();
-            if (Elements.ToolbarButton(ToolTips.breakRustEditPrefabs))
-                MapManager.BreakRustEditCustomPrefabs();
-            if (Elements.ToolbarButton(ToolTips.groupRustEditPrefabs))
-                MapManager.GroupRustEditCustomPrefabs();
-            Elements.EndToolbarHorizontal();
-
             Elements.BeginToolbarHorizontal();
             if (Elements.ToolbarButton(ToolTips.deleteMapPrefabs))
-                MapManager.RemoveMapObjects(true, false);
+                PrefabManager.DeletePrefabs(PrefabManager.CurrentMapPrefabs);
             if (Elements.ToolbarButton(ToolTips.deleteMapPaths))
-                MapManager.RemoveMapObjects(false, true);
+                PathManager.DeletePaths(PathManager.CurrentMapPaths);
             Elements.EndToolbarHorizontal();
         }
         public static void AssetBundle()
@@ -751,6 +728,14 @@ public static void ToggleLights(PrefabDataHolder target)
                 target.ToggleLights();
             Elements.EndToolbarHorizontal();
         }
+
+        public static void BreakPrefab(PrefabDataHolder target)
+        {
+            Elements.BeginToolbarHorizontal();
+            if (Elements.ToolbarButton(ToolTips.breakPrefab))
+                target.BreakPrefab();
+            Elements.EndToolbarHorizontal();
+        }
         #endregion
 
         #region Functions
@@ -828,7 +813,7 @@ public static void NodeGraphToolbar(XNode.NodeGraph nodeGraph)
         }
         #endregion
 
-        #region PrefabsList
+        #region TreeViews
         public static void DisplayPrefabName(string name)
         {
             Elements.BeginToolbarHorizontal();
@@ -863,6 +848,23 @@ public static void SelectPrefabPaths(PrefabsListTreeView treeView, ref bool show
                 treeView.RefreshTreeView(showAllPrefabs);
             Elements.EndToolbarHorizontal();
         }
+
+
+        public static void HierachyOptions(PrefabDataHolder[] prefabs, ref string name)
+        {
+            Elements.MiniBoldLabel(ToolTips.hierachyOptionsLabel);
+
+            Elements.BeginToolbarHorizontal();
+            name = Elements.ToolbarTextField(name);
+            if (Elements.ToolbarButton(ToolTips.hierachyRename))
+                PrefabManager.RenamePrefabs(prefabs, name);
+            Elements.EndToolbarHorizontal();
+
+            Elements.BeginToolbarHorizontal();
+            if (Elements.ToolbarButton(ToolTips.hierachyDelete))
+                PrefabManager.DeletePrefabs(prefabs);
+            Elements.EndToolbarHorizontal();
+        }
         #endregion
 
         #region CreateNewMap
@@ -891,7 +893,7 @@ public static void NewMapOptions(ref int mapSize, ref float landHeight, ref Laye
                     case 1:
                         return;
                     case 2:
-                        Functions.SaveMapPanel();
+                        SaveMapPanel();
                         break;
                 }
                 MapManager.CreateMap(mapSize, TerrainSplat.TypeToIndex((int)layers.Ground), TerrainBiome.TypeToIndex((int)layers.Biome), landHeight);

Assets/MapEditor/Editor/Managers/CentredToolManager.cs

@@ -0,0 +1,16 @@
+using UnityEditor;
+using UnityEngine;
+
+public static class CentredToolManager
+{
+    public static Quaternion TransformRotation { get => Selection.transforms.Length == 1 ? Selection.activeTransform.rotation : Quaternion.identity; }
+
+    public static Vector3 HandlePos 
+    { 
+        get => HandleUtility.GUIPointToWorldRay(new Vector2(SceneView.lastActiveSceneView.camera.pixelWidth, SceneView.lastActiveSceneView.camera.pixelHeight) / 2).GetPoint(10f);
+    }
+
+    public static bool ObjectsSelected { get => Selection.transforms.Length > 0 ? true : false; }
+
+    public static int SelectionLength { get => Selection.transforms.Length; }
+}

…ditor/WorldData/CustomPrefabData.cs.meta …itor/Managers/CentredToolManager.cs.metaAssets/MapEditor/WorldData/CustomPrefabData.cs.meta renamed to Assets/MapEditor/Editor/Managers/CentredToolManager.cs.meta Assets/MapEditor/WorldData/CustomPrefabData.cs.meta renamed to Assets/MapEditor/Editor/Managers/CentredToolManager.cs.meta

@@ -33,7 +33,7 @@ public static bool GetMouseScenePos(out RaycastHit hit)
     private static void SpawnPrefab()
     {
         if (GetMouseScenePos(out RaycastHit hit))
-            PrefabManager.Spawn(hit.point);
+            PrefabManager.SpawnPrefab(hit.point);
     }
 
     private static void OnMouseDown()

Assets/MapEditor/Editor/Managers/SceneViewManager.cs

@@ -3,6 +3,8 @@
 using RustMapEditor.UI;
 using RustMapEditor.Data;
 using RustMapEditor.Variables;
+using UnityEngine;
+using UnityEditor.EditorTools;
 
 public static class ShortcutManager
 {
@@ -30,22 +32,16 @@ public static void CentreSceneView()
         MapManager.CentreSceneView(SceneView.lastActiveSceneView);
     }
 
-    [Shortcut("RustMapEditor/Clear Progress Bar")]
-    public static void ClearProgressBar()
-    {
-        ProgressBarManager.Clear();
-    }
-
     [Shortcut("RustMapEditor/Clear Map Prefabs")]
     public static void ClearMapPrefabs()
     {
-        MapManager.RemoveMapObjects(true);
+        PrefabManager.DeletePrefabs(PrefabManager.CurrentMapPrefabs);
     }
 
     [Shortcut("RustMapEditor/Clear Map Paths")]
     public static void ClearMapPaths()
     {
-        MapManager.RemoveMapObjects(false, true);
+        PathManager.DeletePaths(PathManager.CurrentMapPaths);
     }
 
     [Shortcut("RustMapEditor/Clear Layer")]
@@ -65,4 +61,22 @@ public static void InvertLand()
     {
         MapManager.InvertHeightmap(Selections.Terrains.Land);
     }
+
+    [Shortcut("RustMapEditor/Move Tool", KeyCode.W, ShortcutModifiers.Shift)]
+    public static void SelectMoveTool()
+    {
+        EditorTools.SetActiveTool(typeof(MoveToolCentred));
+    }
+
+    [Shortcut("RustMapEditor/Rotate Tool", KeyCode.E, ShortcutModifiers.Shift)]
+    public static void SelectRotateTool()
+    {
+        EditorTools.SetActiveTool(typeof(RotateToolCentred));
+    }
+
+    [Shortcut("RustMapEditor/Scale Tool", KeyCode.R, ShortcutModifiers.Shift)]
+    public static void SelectScaleTool()
+    {
+        EditorTools.SetActiveTool(typeof(ScaleToolCentred));
+    }
 }

Assets/MapEditor/Editor/Managers/ShortcutManager.cs

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

Assets/MapEditor/Editor/PrefabDataHolderEditor.cs

@@ -0,0 +1,46 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.EditorTools;
+using UnityEngine.InputSystem;
+
+[EditorTool("Move Tool Centred")]
+class MoveToolCentred : EditorTool
+{
+    Vector3 LastPosition { get; set; }
+
+    GUIContent m_IconContent;
+
+    void OnEnable()
+    {
+        m_IconContent = new GUIContent()
+        {
+            image = EditorGUIUtility.IconContent("d_MoveTool").image,
+            text = "Move Tool Centred",
+            tooltip = "Move Tool Centred"
+        };
+    }
+
+    public override GUIContent toolbarIcon
+    {
+        get { return m_IconContent; }
+    }
+
+    public override void OnToolGUI(EditorWindow window)
+    {
+        if (!CentredToolManager.ObjectsSelected)
+            return;
+
+        EditorGUI.BeginChangeCheck();
+        Vector3 Position = Handles.PositionHandle(CentredToolManager.HandlePos, Tools.pivotRotation == PivotRotation.Global ? Quaternion.identity : CentredToolManager.TransformRotation);
+        if (EditorGUI.EndChangeCheck())
+        {
+            Vector3 Delta = Position - LastPosition;
+            Undo.RecordObjects(Selection.transforms, "Move Tool Centred");
+            foreach (var transform in Selection.transforms)
+                transform.position += Delta;
+            LastPosition = Position;
+        }
+        if (!Mouse.current.leftButton.isPressed)
+            LastPosition = CentredToolManager.HandlePos;
+    }
+}