add editor assembly definition, move all editor scripts to one locati…

…on (#882)

Assets/Engine/Atmospherics/Editor/AtmosDebug.cs → Assets/Editor/Atmospherics/AtmosDebug.cs

@@ -1,11 +1,8 @@
-using SS3D.Engine.Tiles;
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System;
 using UnityEditor;
 using UnityEngine;
 
-namespace SS3D.Engine.Atmospherics
+namespace SS3D.Editor.Atmospherics
 {
     // TODO, move to editors
     public class AtmosDebug : EditorWindow

Assets/Editor/EditorDefinitions.asmdef

@@ -0,0 +1,18 @@
+{
+    "name": "EditorDefinitions",
+    "references": [
+        "GUID:2b0396ce7dd650b49913445322785073",
+        "GUID:30817c1a0e6d646d99c048fc403f5979"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/Engine/Tile/TileRework/Editor/AdjacencyEditor.cs → Assets/Editor/TileMap/AdjacencyEditor.cs

@@ -1,10 +1,11 @@
-using SS3D.Engine.Tile.TileRework.Connections;
+using SS3D.Engine.Tile.TileRework;
+using SS3D.Engine.Tile.TileRework.Connections;
 using SS3D.Engine.Tile.TileRework.Connections.AdjacencyTypes;
 using SS3D.Engine.Tiles;
 using UnityEditor;
 using UnityEngine;
 
-namespace SS3D.Engine.Tile.TileRework.Editor
+namespace SS3D.Editor.TileMap
 {
     /// <summary>
     /// Custom editor used for setting blocked connections.
@@ -70,7 +71,7 @@ public override void OnInspectorGUI()
                 {
                     // Get the PlacedTileObject and map
                     var placedObject = connector.gameObject.GetComponent<PlacedTileObject>();
-                    TileMap map = connector.gameObject.GetComponentInParent<TileMap>();
+                    Engine.Tiles.TileMap map = connector.gameObject.GetComponentInParent<Engine.Tiles.TileMap>();
 
                     // Get all neighbours
                     var neighbourObjects = map.GetNeighbourObjects(placedObject.GetLayer(), 0, placedObject.transform.position);

Assets/Engine/Tile/TileRework/Editor/TileDragHandler.cs → Assets/Editor/TileMap/TileDragHandler.cs

@@ -1,17 +1,18 @@
 using System;
 using System.Collections.Generic;
 using SS3D.Engine.Tile.TileRework;
+using SS3D.Engine.Tiles;
 using UnityEditor;
 using UnityEngine;
 
-namespace SS3D.Engine.Tiles.Editor.TileMapEditor
+namespace SS3D.Editor.TileMap
 {
     /**
      * Handles creating a dragging rect and converting that into real tiles in the scene.
      */
     public class TileDragHandler
     {
-        public TileDragHandler(TileManager tileManager, TileMapEditor mapEditor, TileMap map, int subLayerIndex, TileObjectSo tileObjectSO, Direction selectedDir, Vector3Int snappedPosition)
+        public TileDragHandler(TileManager tileManager, TileMapEditor mapEditor, Engine.Tiles.TileMap map, int subLayerIndex, TileObjectSo tileObjectSO, Direction selectedDir, Vector3Int snappedPosition)
         {
             this.tileManager = tileManager;
             this.mapEditor = mapEditor;
@@ -29,7 +30,7 @@ public TileDragHandler(TileManager tileManager, TileMapEditor mapEditor, TileMap
 
         private GameObject CreateGhost()
         {
-            GameObject ghostObject = EditorAndRuntime.InstantiatePrefab(tileObjectSO.prefab);
+            GameObject ghostObject = (GameObject)PrefabUtility.InstantiatePrefab(tileObjectSO.prefab);
             ghostObject.transform.SetPositionAndRotation(Vector3.zero, Quaternion.identity);
             ghostObject.name = "Ghost object";
             ghostObject.tag = "EditorOnly";
@@ -226,7 +227,7 @@ private void ShowTiles()
 
         private readonly TileManager tileManager;
         private readonly TileMapEditor mapEditor;
-        private readonly TileMap map;
+        private readonly Engine.Tiles.TileMap map;
         private readonly int subLayerIndex;
         private readonly TileObjectSo tileObjectSO;
         private readonly Direction selectedDir;

Assets/Engine/Tile/TileRework/Editor/TileMapEditor.cs → Assets/Editor/TileMap/TileMapEditor.cs

@@ -1,16 +1,15 @@
-using SS3D.Engine.Tiles;
-using SS3D.Engine.Tiles.Connections;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Threading;
 using SS3D.Engine.Tile.TileRework;
+using SS3D.Engine.Tiles;
+using SS3D.Engine.Tiles.Connections;
 using UnityEditor;
 using UnityEngine;
 
 /// <summary>
 /// This is the main editor for changing the tilemap.
 /// </summary>
-namespace SS3D.Engine.Tiles.Editor.TileMapEditor
+namespace SS3D.Editor.TileMap
 {
     public class TileMapEditor : EditorWindow
     {
@@ -263,7 +262,7 @@ public void OnGUI()
         /// </summary>
         private void ApplySettings()
         {
-            TileMap map = tileManager.GetTileMaps()[selectedTileMapIndex];
+            Engine.Tiles.TileMap map = tileManager.GetTileMaps()[selectedTileMapIndex];
             map.SetName(selectedName);
             map.IsMain = isMainMap;
 
@@ -449,12 +448,12 @@ private void RefreshMapList()
             }
         }
 
-        private TileMap GetCurrentMap()
+        private Engine.Tiles.TileMap GetCurrentMap()
         {
             return tileManager.GetTileMaps()[selectedTileMapIndex];
         }
 
-        private void FillGridOptions(TileMap map)
+        private void FillGridOptions(Engine.Tiles.TileMap map)
         {
             selectedName = map.GetName();
             isMainMap = map.IsMain;
@@ -497,18 +496,18 @@ private void DisplayVisualHelp(Vector3 cell)
         /// Draws the edges of chunks.
         /// </summary>
         /// <param name="map">Map to get chunks from</param>
-        private void DisplayGrid(TileMap map)
+        private void DisplayGrid(Engine.Tiles.TileMap map)
         {
             Handles.color = Color.cyan;
             Vector3 offset = new Vector3(0.5f, 0, 0.5f);
 
             TileChunk[] chunks = map.GetChunks();
             foreach (var chunk in chunks)
             {
-                Handles.DrawLine(chunk.GetOrigin() - offset, chunk.GetOrigin() + new Vector3(TileMap.CHUNK_SIZE, 0, 0) - offset);
-                Handles.DrawLine(chunk.GetOrigin() - offset, chunk.GetOrigin() + new Vector3(0, 0, TileMap.CHUNK_SIZE) - offset);
-                Handles.DrawLine(chunk.GetOrigin() - offset + new Vector3(TileMap.CHUNK_SIZE, 0, 0), chunk.GetOrigin() + new Vector3(TileMap.CHUNK_SIZE, 0, TileMap.CHUNK_SIZE) - offset);
-                Handles.DrawLine(chunk.GetOrigin() - offset + new Vector3(0, 0, TileMap.CHUNK_SIZE), chunk.GetOrigin() + new Vector3(TileMap.CHUNK_SIZE, 0, TileMap.CHUNK_SIZE) - offset);
+                Handles.DrawLine(chunk.GetOrigin() - offset, chunk.GetOrigin() + new Vector3(Engine.Tiles.TileMap.CHUNK_SIZE, 0, 0) - offset);
+                Handles.DrawLine(chunk.GetOrigin() - offset, chunk.GetOrigin() + new Vector3(0, 0, Engine.Tiles.TileMap.CHUNK_SIZE) - offset);
+                Handles.DrawLine(chunk.GetOrigin() - offset + new Vector3(Engine.Tiles.TileMap.CHUNK_SIZE, 0, 0), chunk.GetOrigin() + new Vector3(Engine.Tiles.TileMap.CHUNK_SIZE, 0, Engine.Tiles.TileMap.CHUNK_SIZE) - offset);
+                Handles.DrawLine(chunk.GetOrigin() - offset + new Vector3(0, 0, Engine.Tiles.TileMap.CHUNK_SIZE), chunk.GetOrigin() + new Vector3(Engine.Tiles.TileMap.CHUNK_SIZE, 0, Engine.Tiles.TileMap.CHUNK_SIZE) - offset);
             }
         }
 
@@ -584,7 +583,7 @@ private void DestroyGhost()
         /// </summary>
         private void UpdateTileVisibility()
         {
-            TileMap map = GetCurrentMap();
+            Engine.Tiles.TileMap map = GetCurrentMap();
             foreach (TileLayer layer in TileHelper.GetTileLayers())
             {
                 bool visible = layerVisibilitySelection[(int)layer];

Assets/Engine/Tile/TileRework/Editor/TileObjectMigrator.cs → Assets/Editor/TileMap/TileObjectMigrator.cs

@@ -1,10 +1,8 @@
-using System.Collections;
-using System.Collections.Generic;
-using SS3D.Engine.Tile.TileRework;
+using SS3D.Engine.Tile.TileRework;
 using UnityEditor;
 using UnityEngine;
 
-namespace SS3D.Engine.Tiles.Editor.TileMapEditor
+namespace SS3D.Editor.TileMap
 {
     public class TileObjectMigrator : MonoBehaviour
     {

Assets/Engine/Debug/EasyButtons/Editor/EasyButtons.asmref

@@ -0,0 +1,3 @@
+{
+    "reference": "GUID:adfd753e6e0bb234fb7143be344f1fa4"
+}

Assets/Engine/Tile/TileRework/TileManager.cs

@@ -79,8 +79,8 @@ private void Init()
                 }
                 tileObjectSOs = listTileObjectSO.ToArray();
 #else
-                Resources.LoadAll<TileObjectSO>("");
-                tileObjectSOs = Resources.FindObjectsOfTypeAll<TileObjectSO>();
+                Resources.LoadAll<TileObjectSo>("");
+                tileObjectSOs = Resources.FindObjectsOfTypeAll<TileObjectSo>();
 #endif
 
                 LoadAll(true);