game(scripts): merge players

RunningLateGame/Assets/Scripts/MarkPlayer.cs

@@ -1,35 +0,0 @@
-/*
- * author: mark joshwel
- * date: 27/5/2024
- * description: script for handling player interactivity
- */
-
-using UnityEngine;
-
-/// <summary>
-///     class for handling player interactivity
-/// </summary>
-public class MarkPlayer : MonoBehaviour
-{
-    /// <summary>
-    ///     game manager instance
-    /// </summary>
-    private GameManager _game;
-
-    /// <summary>
-    ///     initialisation function
-    /// </summary>
-    private void Start()
-    {
-        _game = GameManager.Instance;
-    }
-
-    /// <summary>
-    ///     function called by the input system when escape is paused
-    /// </summary>
-    public void OnPause()
-    {
-        Debug.Log("escape pressed");
-        _game.SetDisplayState(_game.Paused ? GameManager.DisplayState.Game : GameManager.DisplayState.OverlayPauseMenu);
-    }
-}

RunningLateGame/Assets/Scripts/MarkPlayer.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 995d26dc842b43269f0cfd51fe4e32ef
-timeCreated: 1723266626

RunningLateGame/Assets/Scripts/Player.cs

@@ -1,53 +1,61 @@
 /*
- * author: ryan lin
+ * author: ryan lin, mark joshwel
- * date: 8/8/2024
+ * date: 11/8/2024
- * description: TODO
+ * description: player interaction behaviour
  */
 
 using UnityEngine;
 
 /// <summary>
-///     TODO
+///     player interaction behaviour
 /// </summary>
 public class Player : MonoBehaviour
 {
     /// <summary>
-    ///     TODO
+    ///     the position of the player
     /// </summary>
     [SerializeField] private Transform playerPosition;
 
     /// <summary>
-    ///     TODO
+    ///     the maximum distance the player can interact with objects
     /// </summary>
-    [SerializeField] private float seeDistance;
+    [SerializeField] private float interactableDistance;
 
     /// <summary>
-    ///     TODO
+    ///     the layers the raycast should interact with
     /// </summary>
     public LayerMask raycastLayers;
 
-    /// <summary>
+    // /// <summary>
-    ///     TODO
+    // ///     the current interactable object the player is looking at
-    /// </summary>
+    // /// </summary>
-    private bool _active;
+    // private CommonInteractable _currentInteractable;
 
     /// <summary>
-    ///     TODO
+    ///     game manager instance
     /// </summary>
-    private CommonInteractable _currentInteractable;
+    private GameManager _game;
 
     /// <summary>
-    ///     TODO
+    ///     whether the player is looking at an interactable object
     /// </summary>
     private bool _raycast;
 
     /// <summary>
-    ///     TODO
+    ///     the raycast hit information
     /// </summary>
     public RaycastHit Hit;
 
     /// <summary>
-    ///     TODO
+    ///     initialisation function
+    /// </summary>
+    private void Start()
+    {
+        _game = GameManager.Instance;
+    }
+
+    /// <summary>
+    ///     raycast performer for interactable objects
     /// </summary>
     private void Update()
     {
@@ -55,24 +63,41 @@ private void Update()
             playerPosition.position,
             playerPosition.TransformDirection(Vector3.forward),
             out Hit,
-            seeDistance,
+            interactableDistance,
             raycastLayers
         );
         Debug.DrawRay(
             playerPosition.position,
-            playerPosition.TransformDirection(Vector3.forward) * seeDistance,
+            playerPosition.TransformDirection(Vector3.forward) * interactableDistance,
             Color.green
         );
+        
+        if (!_raycast) return;
+
+        // show an interaction prompt if we're looking at an interactable object
+        var prompt = Hit.collider.GetComponent<CommonInteractable>()?.interactionPrompt;
+        if (prompt != "")
+        {
+            Debug.Log(prompt);
+        }
     }
 
     /// <summary>
-    ///     TODO
+    ///     handles the action when the player interacts with an object
     /// </summary>
     private void OnAction()
     {
-        Debug.Log("test");
+        if (!_raycast) return;
-        if (_raycast)
+        Hit.collider.GetComponent<CommonInteractable>()?.Interact();
-            if (Hit.transform.CompareTag("Interactable"))
+        // _currentInteractable?.Interact();
-                Hit.transform.GetComponent<CommonInteractable>().Interact();
+    }
+
+    /// <summary>
+    ///     function called by the input system when escape is paused
+    /// </summary>
+    public void OnPause()
+    {
+        Debug.Log("escape pressed");
+        _game.SetDisplayState(_game.Paused ? GameManager.DisplayState.Game : GameManager.DisplayState.OverlayPauseMenu);
     }
 }