Refactor to get rid of CharacterController (#28)

* Get rid of CharacterController

* Update .gitignore

* Some cleanup

Author: nucleartide

.gitignore

@@ -67,3 +67,6 @@ Assets/Plugins/polyperfect/
 
 # Local user settings.
 UserSettings/
+
+# Test builds.
+test_build*

Assets/Scenes/Game.unity

@@ -211,7 +211,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 366215642}
-  - component: {fileID: 366215645}
   - component: {fileID: 366215644}
   m_Layer: 0
   m_Name: Player
@@ -253,28 +252,9 @@ MonoBehaviour:
     PlayerRunSpeed: 10
     JumpHeight: 1
     GravityValue: 9.81
-    RotationSpeed: 30
-  characterController: {fileID: 366215645}
+    RotationSpeed: 15
   playerShoulderTarget: {fileID: 996116154}
   gameInput: {fileID: 297956314}
---- !u!143 &366215645
-CharacterController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 366215641}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Height: 2
-  m_Radius: 0.5
-  m_SlopeLimit: 45
-  m_StepOffset: 0.3
-  m_SkinWidth: 0.0001
-  m_MinMoveDistance: 0.001
-  m_Center: {x: 0, y: 1, z: 0}
 --- !u!1 &427920523
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameInput.cs

@@ -1,4 +1,3 @@
-using System;
 using UnityEngine;
 
 public class GameInput : MonoBehaviour
@@ -13,9 +12,10 @@ private void Awake()
         playerInputActions.Player.Enable();
     }
 
-    public Vector2 GetMovementNormalized()
+    public Vector3 GetMovement()
     {
-        return playerInputActions.Player.Move.ReadValue<Vector2>().normalized;
+        var move = playerInputActions.Player.Move.ReadValue<Vector2>();
+        return Vector3.ClampMagnitude(new Vector3(move.x, 0f, move.y), 1f);
     }
 
     public Vector2 GetLookAround()

Assets/Scripts/PlayerController.cs

@@ -1,16 +1,13 @@
 using System;
 using UnityEngine;
 
-/// <summary>
-/// Enables a GameObject to move with WASD and jump with Space.
-/// </summary>
-[RequireComponent(typeof(CharacterController))]
 public class PlayerController : MonoBehaviour
 {
     [Serializable]
     struct Configuration
     {
         public float PlayerWalkSpeed;
+
         public float PlayerRunSpeed;
 
         /// <summary>
@@ -29,30 +26,6 @@ struct Configuration
         public float RotationSpeed;
     }
 
-    [Serializable]
-    struct CurrentInput
-    {
-        /// <summary>
-        /// Current movement direction.
-        /// </summary>
-        public Vector3 Move;
-
-        /// <summary>
-        /// Whether player is running.
-        /// </summary>
-        public bool Run;
-
-        /// <summary>
-        /// Time elapsed since last frame.
-        /// </summary>
-        public float DeltaTime;
-
-        /// <summary>
-        /// Whether player is grounded.
-        /// </summary>
-        public bool IsGrounded;
-    }
-
     [SerializeField]
     Configuration configuration = new()
     {
@@ -63,10 +36,6 @@ struct CurrentInput
         RotationSpeed = 3.0f,
     };
 
-    [SerializeField]
-    [NotNull]
-    CharacterController characterController;
-
     [SerializeField]
     [NotNull]
     Transform playerShoulderTarget;
@@ -75,58 +44,26 @@ struct CurrentInput
     [NotNull]
     GameInput gameInput;
 
-    CurrentInput currentInput;
-    float verticalSpeed;
-
     public float HorizontalSpeed
     {
         get;
         private set;
     }
 
     /// <summary>
-    /// Used to compute currentSpeed. Do not use otherwise.
+    /// Used to compute HorizontalSpeed. Do not use otherwise.
     /// </summary>
     float horizontalSpeedDampingValue;
 
-    static CurrentInput GetCurrentInput(CharacterController controller, GameInput gameInput)
-    {
-        var movement = gameInput.GetMovementNormalized();
-        var input = new Vector3(movement.x, 0f, movement.y);
-        return new CurrentInput
-        {
-            Move = Vector3.ClampMagnitude(input, 1f),
-            Run = gameInput.GetRun(),
-            DeltaTime = Time.smoothDeltaTime,
-            IsGrounded = controller.isGrounded,
-        };
-    }
-
-    static float UpdateVerticalVelocity(float verticalVelocity, CurrentInput currentInput, Configuration config)
-    {
-        // Simulate force of gravity.
-        verticalVelocity -= config.GravityValue * Time.deltaTime;
-
-        // However,
-        if (currentInput.IsGrounded && verticalVelocity < 0)
-        {
-            // Then zero out y-component of velocity.
-            // Must be slightly negative so that CharacterController's .isGrounded computation returns true.
-            verticalVelocity = -.5f;
-        }
-
-        return verticalVelocity;
-    }
-
     private float TargetSpeed
     {
         get
         {
-            var isIdle = currentInput.Move == Vector3.zero;
+            var isIdle = gameInput.GetMovement() == Vector3.zero;
             if (isIdle)
                 return 0f;
 
-            if (currentInput.Run)
+            if (gameInput.GetRun())
                 return configuration.PlayerRunSpeed;
 
             return configuration.PlayerWalkSpeed;
@@ -135,25 +72,22 @@ private float TargetSpeed
 
     private void Update()
     {
-        currentInput = GetCurrentInput(characterController, gameInput);
-        verticalSpeed = UpdateVerticalVelocity(verticalSpeed, currentInput, configuration);
         HorizontalSpeed = Mathf.SmoothDamp(HorizontalSpeed, TargetSpeed, ref horizontalSpeedDampingValue, .3f);
 
         var yRotation = Quaternion.Euler(0f, playerShoulderTarget.eulerAngles.y, 0f);
-        var movementDirection = yRotation * currentInput.Move;
+        var movementDirection = yRotation * gameInput.GetMovement();
         FaceMovementDirection(movementDirection);
         Move(movementDirection);
     }
 
     private void Move(Vector3 movementDirection)
     {
-        characterController.Move(currentInput.DeltaTime * HorizontalSpeed * movementDirection);
-        characterController.Move(currentInput.DeltaTime * new Vector3(0f, verticalSpeed, 0f));
+        transform.position += Time.smoothDeltaTime * HorizontalSpeed * movementDirection;
     }
 
     private void FaceMovementDirection(Vector3 movementDirection)
     {
-        if (currentInput.Move != Vector3.zero)
+        if (gameInput.GetMovement() != Vector3.zero)
         {
             float singleStep = configuration.RotationSpeed * Time.smoothDeltaTime;
             transform.forward = Vector3.RotateTowards(transform.forward, movementDirection.normalized, singleStep, 0f);

ProjectSettings/BurstAotSettings_StandaloneOSX.json

@@ -0,0 +1,16 @@
+{
+  "MonoBehaviour": {
+    "Version": 4,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "EnableArmv9SecurityFeatures": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "CpuTargetsX64": 72,
+    "OptimizeFor": 0
+  }
+}

ProjectSettings/CommonBurstAotSettings.json

@@ -1,6 +1,6 @@
 {
   "MonoBehaviour": {
-    "Version": 3,
+    "Version": 4,
     "DisabledWarnings": ""
   }
 }

ProjectSettings/EditorBuildSettings.asset

@@ -6,6 +6,6 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/URPSampleScene.unity
-    guid: 99c9720ab356a0642a771bea13969a05
+    path: Assets/Scenes/Game.unity
+    guid: 3579100dc72eb420496990c1eb7e11a0
   m_configObjects: {}