redoing ship controls

Author: garratt

3d Space Shooter/Assets/_project/Scenes/Main.unity

@@ -3398,6 +3398,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2281f4c2a9f0b5bb5935e631bb17c0fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _duration: 10
 --- !u!54 &1143532946915120791
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -17371,11 +17372,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 89fbcd3b94efd41b3989038306f19c6a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _movementInput: {fileID: 1292328209331252848}
+  _inputControls: {fileID: 1292328209331252848}
   _thrustForce: 7500
   _pitchForce: 2399
   _yawForce: 2000
   _rollForce: 1000
+  _blasters:
+  - {fileID: 2421867205600743989}
+  - {fileID: 9071191015319997490}
 --- !u!1 &6907367073426837087
 GameObject:
   m_ObjectHideFlags: 0

3d Space Shooter/Assets/_project/scripts/Managers/SerialManager.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SerialManager : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

3d Space Shooter/Assets/_project/scripts/Managers/SerialManager.cs.meta

@@ -10,19 +10,19 @@ public class DesktopMovementControls : MovementControlsBase
    public override float YawAmount {
         get
         {
-        if (Input.GetKey(KeyCode.A)) {
+        if (Input.GetKey(KeyCode.D)) {
             return 1f;
         }
-        return Input.GetKey(KeyCode.D) ? -1f : 0f;
+        return Input.GetKey(KeyCode.A) ? -1f : 0f;
         }
     }
    public override float PitchAmount {
         get
         {
-        if (Input.GetKey(KeyCode.W)) {
+        if (Input.GetKey(KeyCode.S)) {
             return 1f;
         }
-        return Input.GetKey(KeyCode.S) ? -1f : 0f;
+        return Input.GetKey(KeyCode.W) ? -1f : 0f;
         }  
    }
    public override float RollAmount {

3d Space Shooter/Assets/_project/scripts/ShipControls/DesktopMovementControls.cs

@@ -6,30 +6,40 @@
 public class ShipController : MonoBehaviour
 {
     [InlineEditor(InlineEditorObjectFieldModes.Boxed)]
-    [SerializeField] [Required] ShipMovementInput _movementInput;
+    [SerializeField] [Required] ShipInputControls _inputControls;
 
     [BoxGroup("Ship Movement Values")][SerializeField] [Range(1000f, 10000f)]
     float _thrustForce = 7500f,
     _pitchForce = 6000f,
     _yawForce = 2000f,
     _rollForce = 1000f;
+
+    [BoxGroup("Ship Components")]    [SerializeField]
+     private List<Blaster> _blasters;
 
     Rigidbody _rigidbody;
 
     [ShowInInspector][Range(-1.0f,1.0f)]
     float _thrustAmount, _pitchAmount, _yawAmount, _rollAmount;
 
-    ImovementControls ControlInput => _movementInput.MovementControls;
+    ImovementControls MovementInput => _inputControls.MovementControls;
+    IWeaponControls WeaponInput => _inputControls.WeaponControls;
+
+    void Start() {
+        foreach (Blaster blaster in _blasters) {
+            blaster.Init(WeaponInput);
+        }
+    }
 
     void Awake() {
         _rigidbody = GetComponent<Rigidbody>();
     }
 
     void Update() {
-        _thrustAmount = ControlInput.ThrustAmount;
-        _pitchAmount = ControlInput.PitchAmount;
-        _rollAmount = ControlInput.RollAmount;
-        _yawAmount = ControlInput.YawAmount;
+        _thrustAmount = MovementInput.ThrustAmount;
+        _pitchAmount = MovementInput.PitchAmount;
+        _rollAmount = MovementInput.RollAmount;
+        _yawAmount = MovementInput.YawAmount;
     }
 
     void FixedUpdate() {

3d Space Shooter/Assets/_project/scripts/ShipControls/ShipController.cs

@@ -1,24 +1,25 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
-public class ShipMovementInput : MonoBehaviour
+public class ShipInputControls : MonoBehaviour
 {
     [SerializeField] ShipInputManager.InputType _inputType = ShipInputManager.InputType.HumanDesktop;
 
     public ImovementControls MovementControls {get; private set;}
+    public IWeaponControls WeaponControls {get; private set;}
 
     // Start is called before the first frame update
     void Start()
     {
-        MovementControls = ShipInputManager.GetInputControls(_inputType);
+        MovementControls = ShipInputManager.GetMovementControls(_inputType);
+        WeaponControls = ShipInputManager.GetWeaponControls(_inputType);
 
     }
 
     // Update is called once per frame
     void OnDestroy()
     {
         MovementControls = null;
+        WeaponControls = null;
 
     }
 }

3d Space Shooter/Assets/_project/scripts/ShipControls/ShipMovementInput.cs renamed to 3d Space Shooter/Assets/_project/scripts/ShipControls/ShipInputControls.cs

@@ -12,14 +12,23 @@ public enum InputType {
         Bot
     }
 
-    public static ImovementControls GetInputControls(InputType inputType) {
+    public static ImovementControls GetMovementControls(InputType inputType) {
         return inputType switch {
             InputType.HumanDesktop => new DesktopMovementControls(),
             InputType.HumanMobile => null,
             InputType.Bot => null,
             _ => throw new ArgumentOutOfRangeException(nameof(inputType), inputType, null),
         };
 
+    }
+        public static IWeaponControls GetWeaponControls(InputType inputType) {
+        return inputType switch {
+            InputType.HumanDesktop => new DesktopWeaponControls(),
+            InputType.HumanMobile => null,
+            InputType.Bot => null,
+            _ => throw new ArgumentOutOfRangeException(nameof(inputType), inputType, null),
+        };
+
     }
 
 }

3d Space Shooter/Assets/_project/scripts/ShipControls/ShipMovementInput.cs.meta renamed to 3d Space Shooter/Assets/_project/scripts/ShipControls/ShipInputControls.cs.meta

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Sirenix.OdinInspector;
@@ -8,6 +9,8 @@ public class Blaster : MonoBehaviour
     [SerializeField] [Required] Projectile _projectilePrefab;
     [SerializeField] Transform _muzzle;
     [SerializeField] [Range(0f, 5f)] float _coolDownTime = .25f;
+
+    private IWeaponControls _weaponInput;
 
     bool CanFire {
         get {
@@ -30,7 +33,7 @@ void Update()
         if (_coolDown > 0 ) {
             _coolDown -= Time.deltaTime;
         }
-        if (Input.GetMouseButton(0))
+        if (_weaponInput != null && _weaponInput.PrimaryFired)
         {
             FireProjectile();
         }
@@ -45,4 +48,9 @@ public void FireProjectile()
         _coolDown = _coolDownTime;
         Instantiate(_projectilePrefab, _muzzle.position, transform.rotation);
     }
+
+    internal void Init(IWeaponControls weaponInput)
+    {
+        _weaponInput = weaponInput;
+    }
 }