QoL Unit Placement Improvements

Assets/Scripts/Placement/PlacementManager.cs

@@ -23,7 +23,8 @@ private void Awake()
 	}
 
 
-	static System.Action<Vector3[], Quaternion[], Vector3[]> CurrentPlaceAction;
+	static System.Action<Vector3[], Quaternion[], Vector3[], bool> CurrentPlaceAction;
+	static System.Action<List<GameObject>, bool> CurrentRemoveAction;
 	public static System.Action<GameObject> InstantiateAction;
 	public static int MinRotAngle = 90;
 	public GameObject PlacementObject;
@@ -37,6 +38,11 @@ private void Awake()
 	private const float NearbyDistanceThreshold = 1f;
 	private GetGamedataFile.UnitBluePrint PreviewUnitBP;
 
+	private bool DragActive;
+	private Vector3 DragOrigin;
+	private Vector2 DragStep;
+	private Vector2Int DragCell;
+
 	static bool _SnapToWater = false;
 	public static bool SnapToWater
 	{
@@ -56,6 +62,18 @@ public static bool SnapToWater
 	static Quaternion OldRot;
 	static Vector3 OldScale;
 	public static void BeginPlacement(GameObject Prefab, System.Action<Vector3[], Quaternion[], Vector3[]> PlaceAction, bool ResetTransform = true)
+	{
+		StartPlacement(Prefab, (Positions, Rotations, Scales, RegisterUndo) => PlaceAction(Positions, Rotations, Scales), ResetTransform, null);
+	}
+
+	public static void BeginDragPlacement(GameObject Prefab, System.Action<Vector3[], Quaternion[], Vector3[], bool> PlaceAction,
+		System.Action<List<GameObject>, bool> RemoveAction)
+	{
+		StartPlacement(Prefab, PlaceAction, true, RemoveAction);
+	}
+
+	static void StartPlacement(GameObject Prefab, System.Action<Vector3[], Quaternion[], Vector3[], bool> PlaceAction, bool ResetTransform,
+		System.Action<List<GameObject>, bool> RemoveAction)
 	{
 		if (!ResetTransform && Current.PlacementObject)
 		{
@@ -75,11 +93,17 @@ public static void BeginPlacement(GameObject Prefab, System.Action<Vector3[], Qu
 		InstantiateAction?.Invoke(Current.PlacementObject);
 		Current.PreviewUnitBP = GetUnitBP(Current.PlacementObject);
 
+		if (Current.PreviewUnitBP != null)
+		{
+			Current.PlacementObject.GetComponent<UnitInstance>().Col.enabled = false;
+		}
+
 		Current.PlacementObject.transform.rotation = OldRot;
 		Current.PlacementObject.transform.localScale = OldScale;
 
 		Current.PlacementObject.SetActive(false);
 		CurrentPlaceAction = PlaceAction;
+		CurrentRemoveAction = RemoveAction;
 		Current.GenerateSymmetry();
 		Current.enabled = true;
 		ChangeControlerType.ChangeCurrentControler(0);
@@ -90,6 +114,7 @@ public static void BeginPlacement(GameObject Prefab, System.Action<Vector3[], Qu
 	public static void Clear()
 	{
 		Current.PreviewUnitBP = null;
+		Current.DragActive = false;
 		Destroy(Current.PlacementObject);
 		for (int i = 0; i < Current.PlacementSymmetry.Length; i++)
 			if (Current.PlacementSymmetry[i])
@@ -111,6 +136,11 @@ void Update () {
 			return;
 		}
 
+		if (!Input.GetMouseButton(0))
+		{
+			DragActive = false;
+		}
+
 		if (!SelectionManager.Current.IsPointerOnGameplay())
 			return;
 
@@ -221,6 +251,16 @@ void Update () {
 			else if (Input.GetMouseButtonDown(0))
 			{
 				Place();
+				BeginDrag();
+			}
+			else if (Input.GetMouseButtonDown(1) && CurrentRemoveAction != null
+				&& Physics.Raycast(ray, out RaycastHit unitHit, 1000, 1 << SelectionManager.Current.DisableLayer))
+			{
+				CurrentRemoveAction(new List<GameObject> { unitHit.collider.gameObject }, true);
+			}
+			else if (DragActive)
+			{
+				ContinueDrag();
 			}
 		}
 		else if (PlacementObject.activeSelf)
@@ -349,7 +389,7 @@ void UpdateSymmetryObjects()
 		}
 	}
 
-	void Place()
+	void Place(bool RegisterUndo = true)
 	{
 		Vector3[] Positions = new Vector3[SymmetryMatrix.Length + 1];
 		Quaternion[] Rotations = new Quaternion[SymmetryMatrix.Length + 1];
@@ -366,7 +406,88 @@ void Place()
 			Scales[i + 1] = PlacementObject.transform.localScale;
 		}
 
-		CurrentPlaceAction(Positions, Rotations, Scales);
+		CurrentPlaceAction(Positions, Rotations, Scales, RegisterUndo);
+	}
+
+	private void BeginDrag()
+	{
+		if (PreviewUnitBP == null)
+		{
+			return;
+		}
+
+		Vector3 footprint = GetSkirtRect(PlacementObject.transform, PreviewUnitBP).Bounds.size;
+		// DragStep = new Vector2(Mathf.Max(footprint.z, 0.1f), Mathf.Max(footprint.x, 0.1f));
+		DragStep = new Vector2(Mathf.Max(footprint.x, 0.1f), Mathf.Max(footprint.z, 0.1f));
+		DragOrigin = PlacementObject.transform.position;
+		DragCell = Vector2Int.zero;
+		DragActive = true;
+	}
+
+	private void ContinueDrag()
+	{
+		Vector3 target = PlacementObject.transform.position;
+		// int targetX = Mathf.RoundToInt((target.x + DragOrigin.x));
+		// int targetZ = Mathf.RoundToInt((target.z +  DragOrigin.z));
+		Vector2Int targetCell = new(
+			Mathf.RoundToInt((target.x - DragOrigin.x) / DragStep.x),
+			Mathf.RoundToInt((target.z - DragOrigin.z) / DragStep.y));
+
+		// kept getting gaps in drag placement if mouse skipped,
+		// so instead loop through delta between two mouse pos
+		while (DragCell != targetCell)
+		{
+			Vector2Int remaining = targetCell - DragCell;
+			if (Mathf.Abs(remaining.x) >= Mathf.Abs(remaining.y))
+			{
+				DragCell.x += System.Math.Sign(remaining.x);
+			}
+			else
+			{
+				DragCell.y += System.Math.Sign(remaining.y);
+			}
+
+			Vector3 cellPos = GetDragCellPosition(DragCell);
+			if (!Input.GetKey(KeyCode.LeftShift) && IsUnitAt(cellPos))
+			{
+				continue;
+			}
+
+			PlacementObject.transform.position = cellPos;
+			UpdateSymmetryObjects();
+			Place(false);
+		}
+
+		PlacementObject.transform.position = GetDragCellPosition(DragCell);
+		UpdateSymmetryObjects();
+	}
+
+	private bool IsUnitAt(Vector3 position)
+	{
+		Bounds cell = new(position, new Vector3(DragStep.x - 0.01f, 1000f, DragStep.y - 0.01f));
+
+		Physics.SyncTransforms();
+		int count = Physics.OverlapBoxNonAlloc(position, cell.extents + new Vector3(NearbyDistanceThreshold, 0, NearbyDistanceThreshold), NearbyColliders,
+			Quaternion.identity, 1 << SelectionManager.Current.DisableLayer);
+
+		for (int i = 0; i < count; i++)
+		{
+			GameObject obj = NearbyColliders[i].gameObject;
+			GetGamedataFile.UnitBluePrint bp = GetUnitBP(obj);
+
+			if (bp != null && cell.Intersects(GetSkirtRect(obj.transform, bp).Bounds))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private Vector3 GetDragCellPosition(Vector2Int cell)
+	{
+		Vector3 cellPos = DragOrigin + new Vector3(cell.x * DragStep.x, 0, cell.y * DragStep.y);
+		return ScmapEditor.SnapToTerrain(cellPos, SnapToWater);
 	}
 
 	public delegate void DropAction();

Assets/Scripts/UI/Lists/ResourceObject.cs

@@ -6,7 +6,7 @@
 
 namespace FAF.MapEditor
 {
-	public class ResourceObject : MonoBehaviour, IBeginDragHandler, IDragHandler
+	public class ResourceObject : MonoBehaviour, IBeginDragHandler, IDragHandler, IPointerClickHandler
 	{
 
 		//public ResourceBrowser Controler;
@@ -42,6 +42,17 @@ public void Clicked()
 
 		}
 
+		public void OnPointerClick(PointerEventData eventData)
+		{
+			if (eventData.clickCount != 2 || ContentType != ContentTypes.Unit)
+			{
+				return;
+			}
+
+			ResourceBrowser.DragedObject = this;
+			EditMap.UnitsInfo.Current.SelectBrowserUnit();
+		}
+
 		public void OnDrag(PointerEventData eventData)
 		{
 

Assets/Scripts/UI/Tools/Units/UnitsInfo.cs

@@ -98,6 +98,11 @@ private void Update()
 
 				Generate();
 			}
+
+			if (Input.GetKeyDown(KeyCode.B) && !CameraControler.IsInputFieldFocused())
+			{
+				SwitchCreate();
+			}
 		}
 
 		GameObject[] AllObjects;

Assets/Scripts/UI/Tools/Units/UnitsInfo_Units.cs

@@ -46,7 +46,34 @@ public void OnDropUnit()
 			ResourceBrowser.ClearDrag();
 		}
 
+		public void SelectBrowserUnit()
+		{
+			OnDropUnit();
+
+			if (!isActiveAndEnabled)
+			{
+				return;
+			}
+
+			if (Creating)
+			{
+				OnClickCreate(true);
+			}
+			else
+			{
+				SwitchCreate();
+			}
+		}
+
 		public void DestroyUnits(List<GameObject> MarkerObjects, bool RegisterUndo = true)
+		{
+			RemoveUnits(MarkerObjects, RegisterUndo);
+
+			SelectionManager.Current.CleanSelection();
+			GoToSelection();
+		}
+
+		void RemoveUnits(List<GameObject> MarkerObjects, bool RegisterUndo)
 		{
 			int Count = MarkerObjects.Count;
 
@@ -71,9 +98,6 @@ public void DestroyUnits(List<GameObject> MarkerObjects, bool RegisterUndo = tru
 				if (u.Parent != null)
 					u.Parent.RemoveUnit(u);
 			}
-
-			SelectionManager.Current.CleanSelection();
-			GoToSelection();
 		}
 
 		public void SelectUnit()
@@ -215,7 +239,7 @@ public void OnClickCreate(bool Value)
 				PlacementManager.InstantiateAction = CreatePrefabAction;
 				PlacementManager.MinRotAngle = FreeRotation.isOn ? (0) : (90);
 				PlacementManager.SnapToWater = false;
-				PlacementManager.BeginPlacement(CreationPrefab, Place);
+				PlacementManager.BeginDragPlacement(CreationPrefab, Place, RemoveUnits);
 			}
 			else
 			{