Refactored jet factory; added ControllerCommand enum to remove magic strings

scripts/jet_controls/controller.gd

@@ -13,26 +13,27 @@ const PLAYER_MODE: int      = 1
 @onready var player: Player = $player
 
 
-func process(delta: float) -> String:
+
+func process(delta: float) -> Globals.ControllerCommand:
 	if CPU_MODE == control_mode:
 		return cpu.process(delta)
 	elif PLAYER_MODE == control_mode:
 		return player.process(delta)
 
-	return ""
+	return Globals.ControllerCommand.NONE
 
-func physics_process(delta: float) -> String:
+func physics_process(delta: float) -> Globals.ControllerCommand:
 	if CPU_MODE == control_mode:
 		return cpu.physics_process(delta)
 	elif PLAYER_MODE == control_mode:
 		return player.physics_process(delta)
 
-	return ""
+	return Globals.ControllerCommand.NONE
 
-func unhandled_input(event: InputEvent) -> String:
+func unhandled_input(event: InputEvent) -> Globals.ControllerCommand:
 	if CPU_MODE == control_mode:
 		return cpu.unhandled_input(event)
 	elif PLAYER_MODE == control_mode:
 		return player.unhandled_input(event)
 
-	return ""
+	return Globals.ControllerCommand.NONE

scripts/jet_controls/cpu.gd

@@ -1,11 +1,11 @@
 class_name CPU extends Node
 
 
-func process(_delta: float) -> String:
-	return ""
+func process(_delta: float) -> Globals.ControllerCommand:
+	return Globals.ControllerCommand.NONE
 
-func physics_process(_delta: float) -> String:
-	return ""
+func physics_process(_delta: float) -> Globals.ControllerCommand:
+	return Globals.ControllerCommand.NONE
 
-func unhandled_input(_event: InputEvent) -> String:
-	return ""
+func unhandled_input(_event: InputEvent) -> Globals.ControllerCommand:
+	return Globals.ControllerCommand.NONE

scripts/jet_controls/player.gd

@@ -1,28 +1,28 @@
 class_name Player extends Node
 
 
-func process(_delta: float) -> String:
+func process(_delta: float) -> Globals.ControllerCommand:
 	if Input.is_action_pressed("pull_up"):
-		return "pull_up"
+		return Globals.ControllerCommand.PULL_UP
 	if Input.is_action_pressed("push_down"):
-		return "push_down"
+		return Globals.ControllerCommand.PUSH_DOWN
 	if Input.is_action_pressed("yaw_left"):
-		return "yaw_left"
+		return Globals.ControllerCommand.YAW_LEFT
 	if Input.is_action_pressed("yaw_right"):
-		return "yaw_right"
+		return Globals.ControllerCommand.YAW_RIGHT
 	if Input.is_action_pressed("roll_left"):
-		return "roll_left"
+		return Globals.ControllerCommand.ROLL_LEFT
 	if Input.is_action_pressed("roll_right"):
-		return "roll_right"
+		return Globals.ControllerCommand.ROLL_RIGHT
 	if Input.is_action_pressed("throttle_up"):
-		return "throttle_up"
+		return Globals.ControllerCommand.THROTTLE_UP
 	if Input.is_action_pressed("throttle_down"):
-		return "throttle_down"
+		return Globals.ControllerCommand.THROTTLE_DOWN
 
-	return ""
+	return Globals.ControllerCommand.NONE
 
-func physics_process(_delta: float) -> String:
-	return ""
+func physics_process(_delta: float) -> Globals.ControllerCommand:
+	return Globals.ControllerCommand.NONE
 
-func unhandled_input(_event: InputEvent) -> String:
-	return ""
+func unhandled_input(_event: InputEvent) -> Globals.ControllerCommand:
+	return Globals.ControllerCommand.NONE