From 324a01c1655cd21e32fd779d906ef3dd1a24f18b Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Fri, 6 Nov 2026 18:00:33 -0600 Subject: [PATCH] Cleanup controller logic; tested more dot product stuff --- autoloads/globals.gd | 8 +-- scenes/jet.gd | 12 +--- .../controllers/cpu_system/cpu_controller.gd | 7 ++- scripts/jet_controls/controller.gd | 16 ----- scripts/jet_controls/cpu.gd | 7 --- scripts/jet_controls/player.gd | 6 -- skunk_works/test_world.gd | 61 ++++++++++--------- skunk_works/test_world.tscn | 2 +- 8 files changed, 42 insertions(+), 77 deletions(-) diff --git a/autoloads/globals.gd b/autoloads/globals.gd index 0204a9a..0bb621a 100644 --- a/autoloads/globals.gd +++ b/autoloads/globals.gd @@ -40,7 +40,7 @@ enum CompoundCommandType { } class CompoundCommand: - var PITCH: int = ControllerCommand.NONE - var YAW: int = 0 - var ROLL: int = 0 - var THROTTLE: int = 0 + var PITCH: int = ControllerCommand.NONE + var YAW: int = ControllerCommand.NONE + var ROLL: int = ControllerCommand.NONE + var THROTTLE: int = ControllerCommand.NONE diff --git a/scenes/jet.gd b/scenes/jet.gd index c40bacd..4ba0a03 100644 --- a/scenes/jet.gd +++ b/scenes/jet.gd @@ -19,23 +19,15 @@ var targeted_by: Jet = null func _ready() -> void: pass -#func _process(delta: float) -> void: - #var action: Globals.CompoundCommand = controller.process(delta) - #if action: - #control_frame.do_action(action, delta, self) - -func _physics_process(delta: float) -> void: +func _process(delta: float) -> void: var action: Globals.CompoundCommand = controller.process(delta) if action: control_frame.do_action(action, delta, self) +func _physics_process(_delta: float) -> void: velocity = -transform.basis.z * control_frame.speed move_and_slide() -#func _unhandled_input(event: InputEvent) -> void: - #var action: Globals.CompoundCommand = controller.unhandled_input(event) - #if not action: return - func set_model(model: Node) -> void: add_child(model) diff --git a/scripts/controllers/cpu_system/cpu_controller.gd b/scripts/controllers/cpu_system/cpu_controller.gd index 66776c0..017920a 100644 --- a/scripts/controllers/cpu_system/cpu_controller.gd +++ b/scripts/controllers/cpu_system/cpu_controller.gd @@ -36,15 +36,16 @@ func process_jet_plan(jet: Jet) -> void: var target_local_position: Vector3 = jet.to_local(jet.target.global_position) var target_direction: Vector3 = target_local_position.normalized() - jet.target_ray.target_position = target_direction * 8 + jet.target_ray.target_position = target_direction #NOTE: When using unit (normalized) vectors, the result will always be # between -1.0 (180 degree angle) when the vectors are facing opposite # directions, and 1.0 (0 degree angle) when the vectors are aligned. - var forward_dot: float = target_direction.dot(Vector3.UP) + var ud_dot: float = target_direction.dot(Vector3.FORWARD) var lr_dot: float = target_direction.dot(Vector3.RIGHT) - print(rad_to_deg(cosh(forward_dot))) + + jet.controller.cpu.yaw_left() diff --git a/scripts/jet_controls/controller.gd b/scripts/jet_controls/controller.gd index 966d53c..f878b1c 100644 --- a/scripts/jet_controls/controller.gd +++ b/scripts/jet_controls/controller.gd @@ -18,19 +18,3 @@ func process(delta: float) -> Globals.CompoundCommand: return player.process(delta) _: return Globals.CompoundCommand.new() - -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.CompoundCommand.new() - -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.CompoundCommand.new() diff --git a/scripts/jet_controls/cpu.gd b/scripts/jet_controls/cpu.gd index 35694f4..39b5c8a 100644 --- a/scripts/jet_controls/cpu.gd +++ b/scripts/jet_controls/cpu.gd @@ -7,13 +7,6 @@ var commands: Globals.CompoundCommand = Globals.CompoundCommand.new() func process(_delta: float) -> Globals.CompoundCommand: return commands -func physics_process(_delta: float) -> Globals.CompoundCommand: - return commands - -func unhandled_input(_event: InputEvent) -> Globals.CompoundCommand: - return commands - - func pitch_up() -> void: commands.PITCH = Globals.ControllerCommand.PITCH_UP diff --git a/scripts/jet_controls/player.gd b/scripts/jet_controls/player.gd index 92d4955..4265e30 100644 --- a/scripts/jet_controls/player.gd +++ b/scripts/jet_controls/player.gd @@ -29,12 +29,6 @@ func process(_delta: float) -> Globals.CompoundCommand: return commands -func physics_process(_delta: float) -> Globals.CompoundCommand: - return Globals.CompoundCommand.new() - -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 diff --git a/skunk_works/test_world.gd b/skunk_works/test_world.gd index 19f6a37..12a12cf 100644 --- a/skunk_works/test_world.gd +++ b/skunk_works/test_world.gd @@ -1,40 +1,41 @@ class_name TestWorld extends Node3D +@onready var jet: Node3D = $jet +@onready var jet2: Node3D = $jet2 +var target_ray: RayCast3D + + +func _ready() -> void: + target_ray = jet.get_node("target_ray") func _process(delta: float) -> void: - var jet: Node3D = $jet - var jet2: Node3D = $jet2 - var target_ray: RayCast3D = jet.get_node("target_ray") - - #var direction: Vector3 = ( - #jet2.global_position - jet.global_position - #).normalized() - var target_direction = jet.to_local(jet2.global_position).normalized() - #var target_direction = jet.to_local(jet2.global_position) - - target_ray.target_position = target_direction * 2 - - # NOTE: (From GPT) Mostly works but with precession nor do I really understand it... - #var forward_dot: float = target_direction.dot(Vector3.UP) - #print(forward_dot) - #print(jet.rotation.angle_to()) - #print("Up: " + str((target_direction).dot(Vector3.UP)) ) - print("Forward: " + str((target_direction).dot(Vector3.FORWARD)) ) + #test_dot_product(delta) + pass +func test_dot_product(_delta: float) -> void: + #NOTE: When using unit (normalized) vectors, the result will always be + # between -1.0 (180 degree angle) when the vectors are facing opposite + # directions, and 1.0 (0 degree angle) when the vectors are aligned. + var target_local_position: Vector3 = jet.to_local(jet2.global_position) + var target_direction: Vector3 = target_local_position.normalized() + target_ray.target_position = target_direction + var forward_dot: float = target_direction.dot(Vector3.UP) + var ud_dot: float = target_direction.dot(Vector3.FORWARD) + var lr_dot: float = target_direction.dot(Vector3.RIGHT) + #NOTE: if neg 'below'; if pos 'above'. + # Need window between +-0.2 or something for centered + print("Forward : ", forward_dot) + #print("Forward : ", rad_to_deg(cosh(forward_dot))) + #NOTE: if neg 'behind'; if pos 'ahead'. + # Need window between +-0.2 or something for centered + print("Up | Down : ", ud_dot) + #print("Up | Down : ", rad_to_deg(cosh(ud_dot))) - - # NOTE: (From GPT) Mostly works but with precession nor do I really understand it... - #var forward_dot: float = target_direction.dot(Vector3.UP) - #if forward_dot >= cos(deg_to_rad(37.5)): - #get_node("../../base_ui/target_position_fb").text = "infront" - #jet.controller.cpu.no_action() - #else: - #get_node("../../base_ui/target_position_fb").text = "behind" - #if target_direction.x >= 0.2: - #jet.controller.cpu.yaw_right() - #elif target_direction.x <= -0.2: - #jet.controller.cpu.yaw_left() + #NOTE: if neg 'left'; if pos 'right'. + # Need window between +-0.2 or something for centered + print("Left | Right : ", lr_dot) + #print("Left | Right : ", rad_to_deg(cosh(lr_dot))) diff --git a/skunk_works/test_world.tscn b/skunk_works/test_world.tscn index 3656c02..c3f1c11 100644 --- a/skunk_works/test_world.tscn +++ b/skunk_works/test_world.tscn @@ -85,7 +85,7 @@ transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, -2) mesh = SubResource("BoxMesh_530sk") [node name="jet2" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.4830952, 10.637592, -22.128391) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.668, 7.773, -22.128) [node name="target_ray" type="RayCast3D" parent="jet2"]