menu

Assets/Src/ShipControls.cs

@@ -1,11 +1,11 @@
 using UnityEngine;
 using UnityEngine.InputSystem;
 
-public class ShipControls : MonoBehaviour, ShipInput.IMovementActions {
+public class ShipControls : MonoBehaviour, SpaceRaceInput.IShipActions {
     public Camera aim;
     public Timing timing;
 
-    ShipInput shipInput;
+    SpaceRaceInput input;
     InputAction lookAction;
     InputAction accelerateAction;
     InputAction decelerateAction;
@@ -39,7 +39,7 @@ public class ShipControls : MonoBehaviour, ShipInput.IMovementActions {
         rigidBody.freezeRotation = true;
 
         initialPosition = rigidBody.transform.position;
-        initialAim = aim.transform.rotation;
+        initialAim = rigidBody.transform.rotation;
         initialForce = Vector3.forward;
 
         thrust = Vector3.zero;
@@ -54,15 +54,15 @@ public class ShipControls : MonoBehaviour, ShipInput.IMovementActions {
         camYaw = initialAim.eulerAngles.y;
         forceMode = ForceMode.Acceleration;
 
-        if (shipInput == null) {
-            shipInput = new ShipInput();
-            shipInput.movement.SetCallbacks(this);
+        if (input == null) {
+            input = new SpaceRaceInput();
+            input.ship.SetCallbacks(this);
         }
-        shipInput.movement.Enable();
+        input.ship.Enable();
 
-        lookAction = shipInput.FindAction("look");
-        accelerateAction = shipInput.FindAction("accelerate");
-        decelerateAction = shipInput.FindAction("decelerate");
+        lookAction = input.FindAction("look");
+        accelerateAction = input.FindAction("accelerate");
+        decelerateAction = input.FindAction("decelerate");
     }
 
     void Update() {
@@ -158,6 +158,7 @@ public class ShipControls : MonoBehaviour, ShipInput.IMovementActions {
         rigidBody.transform.forward = initialForce;
         rigidBody.velocity = new Vector3(0f, 0f, 0f);
         rigidBody.angularVelocity = new Vector3(0f, 0f, 0f);
+        rigidBody.transform.rotation = initialAim;
         aim.transform.rotation = initialAim;
 
         camPitch = initialAim.eulerAngles.x;