itdominator/GrowlerFury
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved scripts to scripts folder; added data structure for jets; further control flow work

Browse Source
This commit is contained in:
itdominator
2026-10-18 16:06:22 -05:00
parent 708559b64a
commit a40366ca32
18 changed files with 106 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/control_modes/cpu.gd
-11
View File
@@ -1,11 +0,0 @@
class_name CPU extends Node
func process(_delta: float) -> String:
return ""
func physics_process(_delta: float) -> String:
return ""
func unhandled_input(_event: InputEvent) -> String:
return ""
scenes/control_modes/cpu.gd.uid
-1
View File
@@ -1 +0,0 @@
uid://co4w1q06mtmjx
scenes/control_modes/cpu.tscn
-6
View File
@@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://baiynrn3xqvqh"]
[ext_resource type="Script" uid="uid://co4w1q06mtmjx" path="res://scenes/control_modes/cpu.gd" id="1_72ynb"]
[node name="cpu" type="Node"]
script = ExtResource("1_72ynb")
scenes/control_modes/jet_controller.gd
-35
View File
@@ -1,35 +0,0 @@
class_name JetController extends Node
const CPU_MODE: int = 0
const PLAYER_MODE: int = 1
@export_enum("CPU:0", "PLAYER:1") var control_mode: int = PLAYER_MODE
@onready var cpu: CPU = $cpu
@onready var player: Player = $player
func process(delta: float) -> String:
if CPU_MODE == control_mode:
return cpu.process(delta)
elif PLAYER_MODE == control_mode:
return player.process(delta)
return ""
func physics_process(delta: float) -> String:
if CPU_MODE == control_mode:
return cpu.physics_process(delta)
elif PLAYER_MODE == control_mode:
return player.physics_process(delta)
return ""
func unhandled_input(event: InputEvent) -> String:
if CPU_MODE == control_mode:
return cpu.unhandled_input(event)
elif PLAYER_MODE == control_mode:
return player.unhandled_input(event)
return ""
scenes/control_modes/jet_controller.gd.uid
-1
View File
@@ -1 +0,0 @@
uid://d2hwj8lth1mmo
scenes/control_modes/jet_controller.tscn
-12
View File
@@ -1,12 +0,0 @@
[gd_scene load_steps=4 format=3 uid="uid://b5btmjvj2gosl"]
[ext_resource type="Script" uid="uid://d2hwj8lth1mmo" path="res://scenes/control_modes/jet_controller.gd" id="1_chekb"]
[ext_resource type="PackedScene" uid="uid://baiynrn3xqvqh" path="res://scenes/control_modes/cpu.tscn" id="2_xyvvi"]
[ext_resource type="PackedScene" uid="uid://87s4f2f202g2" path="res://scenes/control_modes/player.tscn" id="3_c27ir"]
[node name="jet_controller" type="Node"]
script = ExtResource("1_chekb")
[node name="cpu" parent="." instance=ExtResource("2_xyvvi")]
[node name="player" parent="." instance=ExtResource("3_c27ir")]
scenes/control_modes/player.gd
-11
View File
@@ -1,11 +0,0 @@
class_name Player extends Node
func process(_delta: float) -> String:
return ""
func physics_process(_delta: float) -> String:
return ""
func unhandled_input(_event: InputEvent) -> String:
return ""
scenes/control_modes/player.gd.uid
-1
View File
@@ -1 +0,0 @@
uid://bbugo3nlb76k7
scenes/control_modes/player.tscn
-6
View File
@@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://87s4f2f202g2"]
[ext_resource type="Script" uid="uid://bbugo3nlb76k7" path="res://scenes/control_modes/player.gd" id="1_3256j"]
[node name="player" type="Node"]
script = ExtResource("1_3256j")
scenes/jet.gd
+14 -34
View File
@@ -1,18 +1,15 @@
class_name Jet extends Node3D
const ALLIES_SIDE: int = 0
const ALLY_JET = preload("uid://cfcid44xnsbdt")
const AXIS_SIDE: int = 1
const AXIS_JET = preload("uid://d07rxx62esueq")
var ALLIES_SIDE: EaglePlus = EaglePlus.new()
var AXIS_SIDE: SakerFalcon = SakerFalcon.new()
@export_enum("CPU:0", "PLAYER:1") var control_mode: int = JetController.CPU_MODE
@export_enum("Allies:0", "Axis:1") var CONFLICT_SIDE: int = ALLIES_SIDE
@export_enum("Allies:0", "Axis:1") var CONFLICT_SIDE: int = ALLIES_SIDE.CONFLICT_SIDE
const JET_MODEL: Dictionary = {
ALLIES_SIDE: ALLY_JET,
AXIS_SIDE: AXIS_JET
ALLIES_SIDE.CONFLICT_SIDE: ALLIES_SIDE.MODEL,
AXIS_SIDE.CONFLICT_SIDE: AXIS_SIDE.MODEL
}
@onready var camera: Camera3D = $camera
@@ -20,7 +17,7 @@ const JET_MODEL: Dictionary = {
func _ready() -> void:
load_jet(CONFLICT_SIDE)
_load_jet(CONFLICT_SIDE)
if JetController.CPU_MODE == control_mode:
set_as_cpu()
@@ -31,16 +28,18 @@ func _process(delta: float) -> void:
var action = controller.process(delta)
if not action: return
func _physics_process(delta: float) -> void:
controller.physics_process(delta)
#func _physics_process(delta: float) -> void:
#var action = controller.physics_process(delta)
#if not action: return
func _unhandled_input(event: InputEvent) -> void:
controller.unhandled_input(event)
#func _unhandled_input(event: InputEvent) -> void:
#var action = controller.unhandled_input(event)
#if not action: return
func load_jet(type: int = CONFLICT_SIDE):
func _load_jet(type: int = CONFLICT_SIDE):
add_child( JET_MODEL[type].instantiate() )
func set_as_player():
camera.current = true
controller.control_mode = controller.PLAYER_MODE
@@ -48,22 +47,3 @@ func set_as_player():
func set_as_cpu():
camera.current = false
controller.control_mode = controller.CPU_MODE
func pull_up():
pass
func push_down():
pass
func yaw_left():
pass
func yaw_right():
pass
func roll_left():
pass
func roll_right():
pass
scenes/jet.tscn
+1 -1
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://mtfp7066molc"]
[ext_resource type="Script" uid="uid://be64wnjbfhnhh" path="res://scenes/jet.gd" id="1_l0pwp"]
[ext_resource type="PackedScene" uid="uid://b5btmjvj2gosl" path="res://scenes/control_modes/jet_controller.tscn" id="2_t5v3o"]
[ext_resource type="PackedScene" uid="uid://b5btmjvj2gosl" path="res://scripts/control_modes/jet_controller.tscn" id="2_t5v3o"]
[node name="jet" type="Node3D"]
script = ExtResource("1_l0pwp")