플레이어 컨트롤로 초안 완성/카메라 시점 개선

Grapplers/Assets/Scripts/CameraController.cs

@@ -25,14 +25,14 @@ public class CameraController : MonoBehaviour
     private void Update()
     {
         currentX += Input.GetAxis("Mouse X");
-        currentY = Mathf.Clamp(currentY - Input.GetAxis("Mouse Y"), -60, 60);
+        currentY = Mathf.Clamp(currentY - Input.GetAxis("Mouse Y"), -89, 89);
     }
 
     private void LateUpdate()
     {
         Vector3 dir = new Vector3(0, 0, -distance);
         Quaternion rotation = Quaternion.Euler(currentY, currentX, 0);
-        transform.position = offset + target.position + rotation * dir;
+        transform.position = /*offset +*/ target.position + rotation * dir;
         target.rotation = Quaternion.Euler(0, currentX, 0);
         transform.LookAt(target.position + offset);
     }

Grapplers/Assets/Scripts/DistanceJoint3D.cs

@@ -24,8 +24,9 @@ public class DistanceJoint3D : MonoBehaviour
     {
         if (distance > 0)
         {
-            distance  = Mathf.Max(0, distance - 50 * Time.deltaTime);
-        }
+			distance  = Mathf.Max(0, distance - 100 * Time.deltaTime);
+			//distance = Mathf.Lerp(distance, 0, 0.8f);
+		}
     }
     private void FixedUpdate()
     {

Grapplers/Assets/Scripts/HookBehaviour.cs

@@ -12,7 +12,12 @@ public class HookBehaviour : MonoBehaviour
     [SerializeField]
     private Rigidbody rb;
 
-    private void Awake()
+	private void OnDrawGizmos()
+	{
+		
+	}
+
+	private void Awake()
     {
         rb = GetComponent<Rigidbody>();
         gameObject.SetActive(false);
@@ -26,7 +31,6 @@ public class HookBehaviour : MonoBehaviour
 
     private void OnCollisionEnter(Collision collision)
     {
-        Debug.Log(collision.gameObject);
         rb.velocity = Vector3.zero;
         rb.isKinematic = true;
         player.GetComponent<PlayerController>().ActiveWire();

Grapplers/Assets/Scripts/PlayerController.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 public class PlayerController : MonoBehaviour
 {
     public float distance = 10.0f;
-    //private CharacterController cc;
+
 
     float velocityY = 0.0f;
     const float gravity = 9.8f;
@@ -14,22 +14,44 @@ public class PlayerController : MonoBehaviour
     public HookBehaviour hook;
 
     private Rigidbody rb;
-    private DistanceJoint3D joint; 
+	private CapsuleCollider col;
+	private DistanceJoint3D joint; 
     private bool isWired;
 
+
+
+	[SerializeField]
+	private Transform groundChecker;
+	[SerializeField]
+	private LayerMask groundMask;
+	private bool IsGrounded
+	{
+		get {
+			return Physics.OverlapSphere(groundChecker.position, 0.01f, groundMask).Length > 0;
+		}
+	}
+
 #if UNITY_EDITOR
     private void OnDrawGizmos()
     {
-        Gizmos.DrawLine(transform.position, (transform.position - Camera.main.transform.position) * 10);
-    }
+		Gizmos.color = Color.red;
+        Gizmos.DrawLine(transform.position, Camera.main.transform.forward.normalized * 200);
+
+		if (!IsGrounded)
+			Gizmos.color = Color.green;
+		Gizmos.DrawSphere(groundChecker.position, 0.1f);
+	}
 #endif
 
     private void Start()
     {
-        //cc = GetComponent<CharacterController>();
         Cursor.lockState = CursorLockMode.Locked;
         joint = GetComponent<DistanceJoint3D>();
         rb = GetComponent<Rigidbody>();
+		col = GetComponent<CapsuleCollider>();
+
+		//col.enabled = !IsGrounded;
+		//cc.enabled = IsGrounded;
     }
     private void Update()
     {
@@ -45,22 +67,18 @@ public class PlayerController : MonoBehaviour
             else
                 ReturnHook();
         }
-
-        if (!isWired)
-        {
-            /*
-            if (Input.GetButtonDown("Jump") && cc.isGrounded)
-                velocityY = 5.0f;
-            if (!cc.isGrounded)
-                velocityY -= gravity * Time.deltaTime;
-            cc.Move(horizontal * transform.right + vertical * transform.forward + new Vector3(0, velocityY, 0) * Time.deltaTime);
-            */
-        }
+		
+		if (IsGrounded)
+		{
+			rb.velocity = (horizontal * transform.right + vertical * transform.forward).normalized * 10.0f;
+			if (Input.GetButtonDown("Jump"))
+				rb.velocity += new Vector3(0, 5 -rb.velocity.y, 0);
+		}
         else
         {
-
+			rb.AddForce(horizontal * transform.right + vertical * transform.forward * 10.0f);
         }
-    }
+	}
 
     private void LateUpdate()
     {
@@ -72,7 +90,7 @@ public class PlayerController : MonoBehaviour
         joint.enabled = false;
         hook.gameObject.SetActive(true);
         hook.transform.position = transform.position;
-        hook.EnableHook((transform.position - Camera.main.transform.position).normalized * 200);
+        hook.EnableHook(Camera.main.transform.forward.normalized * 200);
     }
 
     private void ReturnHook()