adde compound command calling for multi input control; added notes on dot product; testing stuff in skunk works folder
This commit is contained in:
@@ -10,27 +10,27 @@ class_name JetController extends Node
|
||||
@onready var player: Player = $player
|
||||
|
||||
|
||||
func process(delta: float) -> Globals.ControllerCommand:
|
||||
func process(delta: float) -> Globals.CompoundCommand:
|
||||
match control_mode:
|
||||
Globals.ControlMode.CPU_MODE:
|
||||
return cpu.process(delta)
|
||||
Globals.ControlMode.PLAYER_MODE:
|
||||
return player.process(delta)
|
||||
_:
|
||||
return Globals.ControllerCommand.NONE
|
||||
return Globals.CompoundCommand.new()
|
||||
|
||||
func physics_process(delta: float) -> Globals.ControllerCommand:
|
||||
func physics_process(delta: float) -> Globals.CompoundCommand:
|
||||
if Globals.ControlMode.CPU_MODE == control_mode:
|
||||
return cpu.physics_process(delta)
|
||||
elif Globals.ControlMode.PLAYER_MODE == control_mode:
|
||||
return player.physics_process(delta)
|
||||
|
||||
return Globals.ControllerCommand.NONE
|
||||
return Globals.CompoundCommand.new()
|
||||
|
||||
func unhandled_input(event: InputEvent) -> Globals.ControllerCommand:
|
||||
func unhandled_input(event: InputEvent) -> Globals.CompoundCommand:
|
||||
if Globals.ControlMode.CPU_MODE == control_mode:
|
||||
return cpu.unhandled_input(event)
|
||||
elif Globals.ControlMode.PLAYER_MODE == control_mode:
|
||||
return player.unhandled_input(event)
|
||||
|
||||
return Globals.ControllerCommand.NONE
|
||||
return Globals.CompoundCommand.new()
|
||||
|
||||
+20
-18
@@ -1,46 +1,48 @@
|
||||
class_name CPU extends Node
|
||||
|
||||
|
||||
var command: Globals.ControllerCommand = Globals.ControllerCommand.NONE
|
||||
var throttle: Globals.ControllerCommand = Globals.ControllerCommand.NONE
|
||||
var commands: Globals.CompoundCommand = Globals.CompoundCommand.new()
|
||||
|
||||
|
||||
func process(_delta: float) -> Globals.ControllerCommand:
|
||||
return command
|
||||
func process(_delta: float) -> Globals.CompoundCommand:
|
||||
return commands
|
||||
|
||||
func physics_process(_delta: float) -> Globals.ControllerCommand:
|
||||
return command
|
||||
func physics_process(_delta: float) -> Globals.CompoundCommand:
|
||||
return commands
|
||||
|
||||
func unhandled_input(_event: InputEvent) -> Globals.ControllerCommand:
|
||||
return command
|
||||
func unhandled_input(_event: InputEvent) -> Globals.CompoundCommand:
|
||||
return commands
|
||||
|
||||
|
||||
func pitch_up() -> void:
|
||||
command = Globals.ControllerCommand.PITCH_UP
|
||||
commands.PITCH = Globals.ControllerCommand.PITCH_UP
|
||||
|
||||
func pitch_down() -> void:
|
||||
command = Globals.ControllerCommand.PITCH_DOWN
|
||||
commands.PITCH = Globals.ControllerCommand.PITCH_DOWN
|
||||
|
||||
func yaw_left() -> void:
|
||||
command = Globals.ControllerCommand.YAW_LEFT
|
||||
commands.YAW = Globals.ControllerCommand.YAW_LEFT
|
||||
|
||||
func yaw_right() -> void:
|
||||
command = Globals.ControllerCommand.YAW_RIGHT
|
||||
commands.YAW = Globals.ControllerCommand.YAW_RIGHT
|
||||
|
||||
func roll_left() -> void:
|
||||
command = Globals.ControllerCommand.ROLL_LEFT
|
||||
commands.ROLL = Globals.ControllerCommand.ROLL_LEFT
|
||||
|
||||
func roll_right() -> void:
|
||||
command = Globals.ControllerCommand.ROLL_RIGHT
|
||||
commands.ROLL = Globals.ControllerCommand.ROLL_RIGHT
|
||||
|
||||
func throttle_up() -> void:
|
||||
throttle = Globals.ControllerCommand.THROTTLE_UP
|
||||
commands.THROTTLE = Globals.ControllerCommand.THROTTLE_UP
|
||||
|
||||
func throttle_down() -> void:
|
||||
throttle = Globals.ControllerCommand.THROTTLE_DOWN
|
||||
commands.THROTTLE = Globals.ControllerCommand.THROTTLE_DOWN
|
||||
|
||||
func throttle_neutral() -> void:
|
||||
throttle = Globals.ControllerCommand.NONE
|
||||
commands.THROTTLE = Globals.ControllerCommand.NONE
|
||||
|
||||
func no_action() -> void:
|
||||
command = Globals.ControllerCommand.NONE
|
||||
commands.PITCH = Globals.ControllerCommand.NONE
|
||||
commands.YAW = Globals.ControllerCommand.NONE
|
||||
commands.ROLL = Globals.ControllerCommand.NONE
|
||||
commands.THROTTLE = Globals.ControllerCommand.NONE
|
||||
|
||||
@@ -1,28 +1,42 @@
|
||||
class_name Player extends Node
|
||||
|
||||
|
||||
func process(_delta: float) -> Globals.ControllerCommand:
|
||||
var commands: Globals.CompoundCommand = Globals.CompoundCommand.new()
|
||||
|
||||
|
||||
func process(_delta: float) -> Globals.CompoundCommand:
|
||||
no_action()
|
||||
|
||||
if Input.is_action_pressed("pitch_up"):
|
||||
return Globals.ControllerCommand.PITCH_UP
|
||||
if Input.is_action_pressed("pitch_down"):
|
||||
return Globals.ControllerCommand.PITCH_DOWN
|
||||
commands.PITCH = Globals.ControllerCommand.PITCH_UP
|
||||
elif Input.is_action_pressed("pitch_down"):
|
||||
commands.PITCH = Globals.ControllerCommand.PITCH_DOWN
|
||||
|
||||
if Input.is_action_pressed("yaw_left"):
|
||||
return Globals.ControllerCommand.YAW_LEFT
|
||||
if Input.is_action_pressed("yaw_right"):
|
||||
return Globals.ControllerCommand.YAW_RIGHT
|
||||
commands.YAW = Globals.ControllerCommand.YAW_LEFT
|
||||
elif Input.is_action_pressed("yaw_right"):
|
||||
commands.YAW = Globals.ControllerCommand.YAW_RIGHT
|
||||
|
||||
if Input.is_action_pressed("roll_left"):
|
||||
return Globals.ControllerCommand.ROLL_LEFT
|
||||
if Input.is_action_pressed("roll_right"):
|
||||
return Globals.ControllerCommand.ROLL_RIGHT
|
||||
commands.ROLL = Globals.ControllerCommand.ROLL_LEFT
|
||||
elif Input.is_action_pressed("roll_right"):
|
||||
commands.ROLL = Globals.ControllerCommand.ROLL_RIGHT
|
||||
|
||||
if Input.is_action_pressed("throttle_up"):
|
||||
return Globals.ControllerCommand.THROTTLE_UP
|
||||
if Input.is_action_pressed("throttle_down"):
|
||||
return Globals.ControllerCommand.THROTTLE_DOWN
|
||||
commands.THROTTLE = Globals.ControllerCommand.THROTTLE_UP
|
||||
elif Input.is_action_pressed("throttle_down"):
|
||||
commands.THROTTLE = Globals.ControllerCommand.THROTTLE_DOWN
|
||||
|
||||
return Globals.ControllerCommand.NONE
|
||||
return commands
|
||||
|
||||
func physics_process(_delta: float) -> Globals.ControllerCommand:
|
||||
return Globals.ControllerCommand.NONE
|
||||
func physics_process(_delta: float) -> Globals.CompoundCommand:
|
||||
return Globals.CompoundCommand.new()
|
||||
|
||||
func unhandled_input(_event: InputEvent) -> Globals.ControllerCommand:
|
||||
return Globals.ControllerCommand.NONE
|
||||
func unhandled_input(_event: InputEvent) -> Globals.CompoundCommand:
|
||||
return Globals.CompoundCommand.new()
|
||||
|
||||
func no_action() -> void:
|
||||
commands.PITCH = Globals.ControllerCommand.NONE
|
||||
commands.YAW = Globals.ControllerCommand.NONE
|
||||
commands.ROLL = Globals.ControllerCommand.NONE
|
||||
commands.THROTTLE = Globals.ControllerCommand.NONE
|
||||
|
||||
Reference in New Issue
Block a user