Merge branch 'map' into model

# Conflicts:
#	Assets/Scenes/SampleScene.unity
#	Assets/Scripts/Interactors/Mannequin.cs

Assets/Data.meta

-fileFormatVersion: 2
-guid: 50bbbb7b70a6ab94da946d4123f25e75
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Models/Animation/jackson.controller

@@ -66,19 +66,19 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: shoot
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: isShooting
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

Assets/Prefabs/MapManager.prefab

@@ -48,9 +48,13 @@ MonoBehaviour:
   normalWall: {fileID: 2953616027608884528, guid: a4dcd71ec9f819f4e88c7b5ac24f4b0d,
     type: 3}
   mirror: {fileID: 17874052963739924, guid: 90282f1c82fff7545962b5ca66f1a102, type: 3}
+  objects:
+  - {fileID: 2534561534465535505, guid: 0b323beb318071144aef94132be66541, type: 3}
+  - {fileID: 6001025753464815805, guid: df6f1d8b9377ec346af4255abe290fbb, type: 3}
+  - {fileID: 33432975985984805, guid: ec20e06c4a993924791d02d7a4c9375c, type: 3}
   players: []
-  player: {fileID: 8862060874303168220, guid: 6ba287375b5ad4b458a7b7b99c6d6a08, type: 3}
+  player: {fileID: 494213313239918027, guid: 449b2ca4d925da541bb45c84b63aab98, type: 3}
   currentMap: {fileID: 0}
   surface: {fileID: 0}
   stage:
-  - {fileID: 7116745361094357555, guid: 32ff564f49869bf40a53d07394eb081b, type: 3}
+  - {fileID: 2496973653136699540, guid: dbb2e09c19fe5ad49b11a6b95e5ac9e8, type: 3}

Assets/Prefabs/MapObjects/jackson.prefab

@@ -611,9 +611,9 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 494213313239917623}
-  m_LocalRotation: {x: -0.6340379, y: -0.28484753, z: 0.24146551, w: 0.67716485}
-  m_LocalPosition: {x: 0.000005839104, y: 0.0015373584, z: -0.0000003303768}
-  m_LocalScale: {x: 0.9999998, y: 0.99999994, z: 1}
+  m_LocalRotation: {x: -0.6340379, y: -0.28484744, z: 0.24146542, w: 0.6771649}
+  m_LocalPosition: {x: 0, y: 0.0015373576, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 494213313239497169}
   m_Father: {fileID: 494213313239497109}
@@ -1343,7 +1343,6 @@ Transform:
   m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
   m_Children:
   - {fileID: 494213313239497099}
-  - {fileID: 494213313239497139}
   - {fileID: 494213313239497179}
   - {fileID: 7259129854443835404}
   m_Father: {fileID: 0}
@@ -1433,6 +1432,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   head: {fileID: 3233955354714130270}
+  shootingArm: {fileID: 0}
 --- !u!1 &494213313239918029
 GameObject:
   m_ObjectHideFlags: 0
@@ -1552,11 +1552,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 494213313239918035}
   m_LocalRotation: {x: -0.7071068, y: 2.9343448e-11, z: 3.9904864e-11, w: 0.7071067}
-  m_LocalPosition: {x: -4.6566122e-11, y: 0.000000027216437, z: 0.0000000020648396}
+  m_LocalPosition: {x: 0, y: -1.723, z: 0}
   m_LocalScale: {x: 100, y: 100, z: 100}
   m_Children: []
-  m_Father: {fileID: 494213313239497131}
-  m_RootOrder: 1
+  m_Father: {fileID: 7259129854443835404}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &494213313228417203
 SkinnedMeshRenderer:
@@ -2282,7 +2282,7 @@ Transform:
   m_LocalScale: {x: 100, y: 100, z: 100}
   m_Children: []
   m_Father: {fileID: 494213313239497131}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &494213313228417201
 SkinnedMeshRenderer:
@@ -2478,7 +2478,8 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1.723, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 494213313239497139}
   m_Father: {fileID: 494213313239497131}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Prefabs/Objects/camera.prefab

@@ -26,7 +26,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6001025753464815801}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0.3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6001025753464593565}
@@ -170,7 +170,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6001025753464815807}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0.3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6001025753464593565}

Assets/Scripts/CameraController.cs

@@ -8,13 +8,14 @@ public class CameraController : MonoBehaviour
     public float dragSpeed;
     Vector3 previousPos;
     Vector3 previousAngle;
-    float shootingFov = 60f;
-    float mapFov = 40f;
+    float shootingFov = 40f;
+    float mapFov = 20f;
     float rotationX = 0;
     float rotationY = 0;
     float sensitivity = 30;
 
     Vector3 centerPos = new Vector3(0, 0, 0);
+
     /// <summary>
     /// Move camera.
     /// </summary>
@@ -76,6 +77,9 @@ public class CameraController : MonoBehaviour
         rotationX = transform.eulerAngles.y;
         rotationY = transform.eulerAngles.x;
         PlayerController.inst.isZooming = false;
+        PlayerController.inst.currentPlayer.GetComponent<Animator>().SetBool("isShooting", true);
+        PlayerController.inst.currentPlayer.GetComponent<Player>().head.SetActive(false);
+
     }
     /// <summary>
     /// Zoom out from player.
@@ -87,17 +91,15 @@ public class CameraController : MonoBehaviour
         Vector3 posDiff = (previousPos - transform.position) / 40;
         float fovDiff = (mapFov - shootingFov) / 40f;
         PlayerController.inst.isZooming = true;
+        PlayerController.inst.currentPlayer.GetComponent<Animator>().SetBool("isShooting", false);
+        PlayerController.inst.currentPlayer.GetComponent<Player>().head.SetActive(true);
         Vector3 tempAngle = new Vector3(transform.eulerAngles.x > 180 ? transform.eulerAngles.x - 360 : transform.eulerAngles.x,
             transform.eulerAngles.y > 180 ? transform.eulerAngles.y - 360 : transform.eulerAngles.y,
             transform.eulerAngles.z > 180 ? transform.eulerAngles.z - 360 : transform.eulerAngles.z);
-
         Vector3 angleDiff = (previousAngle - tempAngle) / 40;
         angleDiff = new Vector3(angleDiff.x > 180 ? 360 - angleDiff.x : angleDiff.x,
             angleDiff.y > 180 ? 360 - angleDiff.y : angleDiff.y,
             angleDiff.z > 180 ? 360 - angleDiff.z : angleDiff.z);
-        Debug.Log(previousAngle + "previousAngle");
-        Debug.Log(tempAngle + "tempAngle");
-        Debug.Log(angleDiff + "angleDiff");
         for (int i = 0; i < 40; i++)
         {
             yield return null;

Assets/Scripts/Interactors/Mannequin.cs

@@ -44,13 +44,8 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
 			Color = Color.black;
         }
     }
-
-    public void Init(Floor floor)
-    {
-        this.floor = floor;
-    }
-
-    public void SetColor(bool isWhite)
+    
+    public void Init(bool isWhite)
     {
         Color = isWhite ? Color.white : Color.black;
     }

Assets/Scripts/Map/Map.cs

@@ -22,11 +22,6 @@ public class Map : MonoBehaviour
     /// <returns></returns>
     public Floor GetFloorAtPos(Vector2Int pos)
     {
-        if ((pos.x >= 0 ? (pos.x > maxMapSize / 2) : (pos.x < -maxMapSize / 2)) || (pos.y >= 0 ? (pos.y > maxMapSize / 2) : (pos.y < -maxMapSize / 2)))
-        {
-            Debug.Log("Input size exceeds map's max size.");
-            return null;
-        }
         return floorGrid.ContainsKey(pos) ? floorGrid[pos] : null;
     }
     /// <summary>
@@ -39,6 +34,15 @@ public class Map : MonoBehaviour
         return wallGrid.ContainsKey(pos) ? wallGrid[pos] : null;
     }
     /// <summary>
+    /// Get object at position.
+    /// </summary>
+    /// <param name="pos">Position of object.</param>
+    /// <returns></returns>
+    public IObject GetObjectAtPos(Vector2Int pos)
+    {
+        return objectGrid.ContainsKey(pos) ? objectGrid[pos] : null;
+    }
+    /// <summary>
     /// Create floor at position.
     /// </summary>
     /// <param name="pos">Position of floor.</param>
@@ -97,7 +101,7 @@ public class Map : MonoBehaviour
     /// Create wall at position.
     /// </summary>
     /// <param name="pos">Position of wall.</param>
-    /// <param name="wallType">Type of walls.</param>
+    /// <param name="wallType">Type of wall.</param>
     public void CreateWall(Vector2 pos, WallType wallType)
     {
         if (((int)pos.x >= 0 ? ((int)pos.x > maxMapSize / 2) : ((int)pos.x < -maxMapSize / 2)) || ((int)pos.y >= 0 ? ((int)pos.y > maxMapSize / 2) : ((int)pos.y < -maxMapSize / 2)))
@@ -158,6 +162,54 @@ public class Map : MonoBehaviour
         else
             Debug.Log("Wall doesn't exists between : " + pos);
     }
+    /// <summary>
+    /// Create object at position.
+    /// </summary>
+    /// <param name="pos">Position of object.</param>
+    /// <param name="objType">Type of object.</param>
+    public void CreateObject(Vector2Int pos, ObjType objType)
+    {
+        if ((pos.x >= 0 ? (pos.x > maxMapSize / 2) : (pos.x < -maxMapSize / 2)) || (pos.y >= 0 ? (pos.y > maxMapSize / 2) : (pos.y < -maxMapSize / 2)))
+        {
+            Debug.Log("Input size exceeds map's max size.");
+            return;
+        }
+        if (!objectGrid.ContainsKey(pos))
+        {
+            objectGrid.Add(pos, Instantiate(MapManager.inst.objects[(int)objType - 1], new Vector3(pos.x, 0, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>());
+            switch (objType)
+            {
+                case ObjType.Briefcase:
+                    objectGrid[pos].GetObject().GetComponent<Briefcase>().Init(GetFloorAtPos(pos));
+                    return;
+                case ObjType.Camera:
+                    objectGrid[pos].GetObject().GetComponent<CameraTurret>().Init(GetFloorAtPos(pos));
+                    return;
+                //Need to make mannequin init
+                /*case ObjType.Mannequin:
+                    objectGrid[pos].GetObject().GetComponent<Mannequin>().Init(GetFloorAtPos(pos));
+                    return;*/
+            }
+            StartCoroutine(MapManager.inst.Rebaker());
+        }
+        else
+            Debug.Log("Object already exists at : (" + pos.x + ", " + pos.y + ")");
+    }
+    /// <summary>
+    /// Remove Object at position.
+    /// </summary>
+    /// <param name="pos">Position of object.</param>
+    public void RemoveObject(Vector2Int pos)
+    {
+        if (objectGrid.ContainsKey(pos))
+        {
+            Destroy(objectGrid[pos].GetObject());
+            objectGrid.Remove(pos);
+            StartCoroutine(MapManager.inst.Rebaker());
+        }
+        else
+            Debug.Log("Object doesn't exists between : " + pos);
+    }
 
     private void LoadObjects()
     {
@@ -185,6 +237,7 @@ public class Map : MonoBehaviour
     {
         floorGrid = new Dictionary<Vector2Int, Floor>();
         wallGrid = new Dictionary<Vector2, Wall>();
+        objectGrid = new Dictionary<Vector2Int, IObject>();
         startFloors = new List<Floor>();
     }
 
@@ -196,7 +249,7 @@ public class Map : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        Debug.Log((-0.5 * 10) % 10);
+
     }
 
     // Update is called once per frame

Assets/Scripts/MapManager.cs

@@ -10,6 +10,7 @@ public class MapManager : SingletonBehaviour<MapManager>
     public Floor floor;
     public NormalWall normalWall;
     public Mirror mirror;
+    public GameObject[] objects;
     public List<GameObject> players;
     public GameObject player;
     public Map currentMap;

Assets/Scripts/Player.cs

@@ -12,9 +12,13 @@ public class Player : MonoBehaviour
 
     Coroutine playerArrivalCheck;
     public GameObject head;
+    public GameObject shootingArm;
     Animator anim;
-    NavMeshAgent agent;
 
+    /// <summary>
+    /// Set this player as the current player.
+    /// </summary>
+    /// <returns></returns>
     public IEnumerator SetCurrentPlayer()
     {
         GetComponent<NavMeshObstacle>().enabled = false;
@@ -22,6 +26,10 @@ public class Player : MonoBehaviour
         GetComponent<NavMeshAgent>().enabled = true;
         StartCoroutine(MapManager.inst.Rebaker());
     }
+    /// <summary>
+    /// Reset this player from the current player.
+    /// </summary>
+    /// <returns></returns>
     public void ResetCurrentPlayer()
     {
         GetComponent<NavMeshAgent>().enabled = false;
@@ -67,11 +75,16 @@ public class Player : MonoBehaviour
         anim.SetBool("isWalking", false);
         PlayerController.inst.isPlayerMoving = false;
     }
+    /// <summary>
+    /// Count 2 second to make player in shooting mode.
+    /// </summary>
+    /// <param name="startTime">Start time of the timer.</param>
+    /// <returns></returns>
     public IEnumerator CountPlayerClick(float startTime)
     {
         float time = Time.time;
         float endTime = startTime + 2;
-        while(time <= endTime)
+        while (time <= endTime)
         {
             yield return null;
             time = Time.time;
@@ -84,11 +97,12 @@ public class Player : MonoBehaviour
             StartCoroutine(Camera.main.GetComponent<CameraController>().ZoomInAtPlayer(this));
         }
     }
+
+
     // Start is called before the first frame update
     void Start()
     {
         anim = GetComponent<Animator>();
-        agent = GetComponent<NavMeshAgent>();
     }
 
     // Update is called once per frame
@@ -96,10 +110,4 @@ public class Player : MonoBehaviour
     {
 
     }
-
-    private void LateUpdate()
-    {
-        if(agent.isActiveAndEnabled && agent.velocity.magnitude > 0)
-            transform.rotation = Quaternion.LookRotation(agent.velocity.normalized);
-    }
 }

Assets/Scripts/PlayerController.cs

@@ -40,31 +40,36 @@ public class PlayerController : SingletonBehaviour<PlayerController>
 			prePos = MapPos;
 		}
 
+        //Control player only if camera is not zooming in to or out from the current player
         if (!isZooming)
         {
-            if (Input.GetMouseButtonDown(0) && !isPlayerMoving && !isPlayerShooting)
+            if (Input.GetMouseButtonDown(0))
             {
-                Ray mouseRay = Camera.main.ScreenPointToRay(Input.mousePosition);
-                RaycastHit hit;
-                if (Physics.Raycast(mouseRay, out hit) && hit.collider.gameObject.tag.Equals("Player"))
+                //Move the current player.
+                if(!isPlayerMoving && !isPlayerShooting)
                 {
-                    if (currentPlayer != null)
-                        currentPlayer.ResetCurrentPlayer();
-                    currentPlayer = hit.transform.gameObject.GetComponent<Player>();
-                    StartCoroutine(currentPlayer.SetCurrentPlayer());
-                    StartCoroutine(currentPlayer.CountPlayerClick(Time.time));
-                    Debug.Log(hit.collider.gameObject.tag);
-                }
-                else if (Physics.Raycast(mouseRay, out hit) && hit.collider.gameObject.tag.Equals("floor"))
-                {
-                    if (currentPlayer != null)
-                        currentPlayer.MovePlayer(hit.collider.gameObject.transform.position);
-                    Debug.Log(hit.collider.gameObject.tag);
-                }
-                else if (hit.collider == null)
-                {
-                    if (currentPlayer != null)
-                        currentPlayer.ResetCurrentPlayer();
+                    Ray mouseRay = Camera.main.ScreenPointToRay(Input.mousePosition);
+                    RaycastHit hit;
+                    if (Physics.Raycast(mouseRay, out hit) && hit.collider.gameObject.tag.Equals("Player"))
+                    {
+                        if (currentPlayer != null)
+                            currentPlayer.ResetCurrentPlayer();
+                        currentPlayer = hit.transform.gameObject.GetComponent<Player>();
+                        StartCoroutine(currentPlayer.SetCurrentPlayer());
+                        StartCoroutine(currentPlayer.CountPlayerClick(Time.time));
+                        Debug.Log(hit.collider.gameObject.tag);
+                    }
+                    else if (Physics.Raycast(mouseRay, out hit) && hit.collider.gameObject.tag.Equals("floor"))
+                    {
+                        if (currentPlayer != null)
+                            currentPlayer.MovePlayer(hit.collider.gameObject.transform.position);
+                        Debug.Log(hit.collider.gameObject.tag);
+                    }
+                    else if (hit.collider == null)
+                    {
+                        if (currentPlayer != null)
+                            currentPlayer.ResetCurrentPlayer();
+                    }
                 }
             }
             else if (Input.GetMouseButtonDown(1) && isPlayerShooting)
@@ -73,4 +78,19 @@ public class PlayerController : SingletonBehaviour<PlayerController>
             }
         }
     }
+
+    void LateUpdate()
+    {
+        if (currentPlayer != null && currentPlayer.GetComponent<NavMeshAgent>().velocity.magnitude > 0)
+            transform.rotation = Quaternion.LookRotation(currentPlayer.GetComponent<NavMeshAgent>().velocity.normalized);
+        if (isPlayerShooting)
+        {
+            Quaternion destinationRotation = Quaternion.Euler(new Vector3(transform.eulerAngles.x, Camera.main.transform.eulerAngles.y, currentPlayer.transform.eulerAngles.z));
+            currentPlayer.transform.rotation = Quaternion.Lerp(currentPlayer.transform.rotation, destinationRotation, Time.deltaTime * 10);
+            Debug.Log(currentPlayer.shootingArm.transform.position);
+            Debug.Log(currentPlayer.shootingArm.transform.eulerAngles);
+            Debug.Log(Camera.main.transform.position);
+            Debug.Log(Camera.main.transform.eulerAngles);
+        }
+    }
 }

Assets/Scripts/TestTools.cs

@@ -9,7 +9,7 @@ public class TestTools : MonoBehaviour
 
     public InputField wallXInput, wallYInput;
 
-    /*public void AddFloor()
+    public void AddFloor()
     {
         MapManager.inst.currentMap.CreateFloor(new Vector2Int(int.Parse(floorXInput.text), int.Parse(floorYInput.text)));
     }
@@ -19,12 +19,20 @@ public class TestTools : MonoBehaviour
     }
     public void AddWall()
     {
-        MapManager.inst.currentMap.CreateWall(new Vector2(float.Parse(wallXInput.text), float.Parse(wallYInput.text)));
+        MapManager.inst.currentMap.CreateWall(new Vector2(float.Parse(wallXInput.text), float.Parse(wallYInput.text)), WallType.Normal);
     }
     public void RemoveWall()
     {
         MapManager.inst.currentMap.RemoveWall(new Vector2(float.Parse(wallXInput.text), float.Parse(wallYInput.text)));
     }
+    public void AddTurret()
+    {
+        MapManager.inst.currentMap.CreateObject(new Vector2Int(int.Parse(floorXInput.text), int.Parse(floorYInput.text)), ObjType.Camera);
+    }
+    public void RemoveTurret()
+    {
+        MapManager.inst.currentMap.RemoveObject(new Vector2Int(int.Parse(floorXInput.text), int.Parse(floorYInput.text)));
+    }
 
     public void SaveMap()
     {
@@ -33,7 +41,7 @@ public class TestTools : MonoBehaviour
     public void LoadMap()
     {
         MapManager.inst.LoadMap(MapManager.inst.stage[1]);
-    }*/
+    }
 
     // Start is called before the first frame update
     void Start()