Merge branch 'interact'

# Conflicts:
#	Assets/Scripts/PlayerController.cs

Assets/Scripts/Extensions/Vector2IntExtensions.cs

@@ -4,13 +4,10 @@ using UnityEngine;
 
 public static class Vector2IntExtensions
 {
-	public static bool IsInSquareArea(this Vector2Int a, Vector2Int b, int size)
-	{
-        bool xdiff = Mathf.Abs(a.x - b.x) <= size;
-        bool ydiff = Mathf.Abs(a.y - b.y) <= size;
-        return (xdiff && !ydiff) || (!xdiff && ydiff);
-	}
-
+    public static bool IsInAdjacentArea(this Vector2Int a, Vector2Int b, int size)
+    {
+        return (a - b).magnitude <= size;
+    }
     public static int ManhattanDistance(this Vector2Int a, Vector2Int b)
     {
         return Mathf.Abs(a.x - b.x) + Mathf.Abs(a.y - b.y);

Assets/Scripts/Interactors/CameraTurret.cs

@@ -21,9 +21,9 @@ public class CameraTurret : MonoBehaviour, IObject, IBreakable, IPlayerInteracto
 
     public void Interact(Vector2Int pos)
     {
-		if (Position.IsInSquareArea(pos, 1))
+		if (Position.IsInAdjacentArea(pos, 1))
 		{
-			Debug.Log("Stage Restart!");
+			Debug.Log(Position.x + " " + Position.y +" Stage Restart!");
 			//TODO : Restart Level
 		}
     }

Assets/Scripts/PlayerController.cs

@@ -16,8 +16,11 @@ public class PlayerController : SingletonBehaviour<PlayerController>
         get
         {
             Vector2Int pos = Vector2Int.zero;
-            pos.x = Mathf.RoundToInt(transform.position.x);
-            pos.y = Mathf.RoundToInt(transform.position.y);
+            if (currentPlayer)
+            {
+                pos.x = Mathf.RoundToInt(currentPlayer.transform.position.x);
+                pos.y = Mathf.RoundToInt(currentPlayer.transform.position.z);   
+            }
             return pos;
         }
     }