added skunk works folder; added sub viewport ui option; wip testing logic
This commit is contained in:
+2
-2
@@ -21,7 +21,7 @@ var direction = (jet.target.global_position - jet.global_position).normalized()
|
|||||||
-- We're upside down If +-270 (or increments of that I.E +- 540, etc).
|
-- We're upside down If +-270 (or increments of that I.E +- 540, etc).
|
||||||
|
|
||||||
Can we normalize rotation and from that treat slices of the circle as specific command zones?
|
Can we normalize rotation and from that treat slices of the circle as specific command zones?
|
||||||
I.E if target jet infront and and to the right by 45 degrees we yaw?
|
I.E if target a jet in front and and to the right by 45 degrees we yaw instead of roll?
|
||||||
|
|
||||||
Imagine the current situation is us observing our CPU controlled jet from
|
Imagine the current situation is us observing our CPU controlled jet from
|
||||||
the 3rd person view from behind. The jet is level to the horizon of our world.
|
the 3rd person view from behind. The jet is level to the horizon of our world.
|
||||||
@@ -30,7 +30,7 @@ ____________________________________________
|
|||||||
| |
|
| |
|
||||||
| |
|
| |
|
||||||
| | |
|
| | |
|
||||||
| - jet - |
|
| -- jet -- |
|
||||||
| | |
|
| | |
|
||||||
| |
|
| |
|
||||||
| |
|
| |
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[gd_scene load_steps=11 format=3 uid="uid://cx5ewmp2xcuia"]
|
[gd_scene load_steps=12 format=3 uid="uid://cx5ewmp2xcuia"]
|
||||||
|
|
||||||
[ext_resource type="PackedScene" uid="uid://bhjfvc7gkrvah" path="res://base_environment.tscn" id="1_80nbo"]
|
[ext_resource type="PackedScene" uid="uid://bhjfvc7gkrvah" path="res://base_environment.tscn" id="1_80nbo"]
|
||||||
[ext_resource type="PackedScene" uid="uid://dk32bn35qku60" path="res://scripts/controllers/factory_systems/factories/jet_factory.tscn" id="2_e2o6t"]
|
[ext_resource type="PackedScene" uid="uid://dk32bn35qku60" path="res://scripts/controllers/factory_systems/factories/jet_factory.tscn" id="2_e2o6t"]
|
||||||
@@ -10,6 +10,7 @@
|
|||||||
[ext_resource type="PackedScene" uid="uid://bgrku2wvaadgg" path="res://scripts/controllers/spawn_system/spawner.tscn" id="5_ryrav"]
|
[ext_resource type="PackedScene" uid="uid://bgrku2wvaadgg" path="res://scripts/controllers/spawn_system/spawner.tscn" id="5_ryrav"]
|
||||||
[ext_resource type="PackedScene" uid="uid://ir8lwj1gx7m2" path="res://scripts/controllers/game_system/game_controller.tscn" id="7_vef74"]
|
[ext_resource type="PackedScene" uid="uid://ir8lwj1gx7m2" path="res://scripts/controllers/game_system/game_controller.tscn" id="7_vef74"]
|
||||||
[ext_resource type="PackedScene" uid="uid://gb85fimcn0ya" path="res://scripts/controllers/cpu_system/cpu_controller.tscn" id="9_vef74"]
|
[ext_resource type="PackedScene" uid="uid://gb85fimcn0ya" path="res://scripts/controllers/cpu_system/cpu_controller.tscn" id="9_vef74"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://d0esuq6urlrjh" path="res://scenes/ui/base_ui.tscn" id="11_mfdv2"]
|
||||||
|
|
||||||
[node name="game" type="Node3D"]
|
[node name="game" type="Node3D"]
|
||||||
|
|
||||||
@@ -51,3 +52,5 @@ jets_collection = NodePath("../../jets_collection")
|
|||||||
|
|
||||||
[node name="cpu_controller" parent="controller_manager" node_paths=PackedStringArray("jets_collection") instance=ExtResource("9_vef74")]
|
[node name="cpu_controller" parent="controller_manager" node_paths=PackedStringArray("jets_collection") instance=ExtResource("9_vef74")]
|
||||||
jets_collection = NodePath("../../jets_collection")
|
jets_collection = NodePath("../../jets_collection")
|
||||||
|
|
||||||
|
[node name="base_ui" parent="." instance=ExtResource("11_mfdv2")]
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ class_name Jet extends CharacterBody3D
|
|||||||
|
|
||||||
@onready var camera: Camera3D = $camera
|
@onready var camera: Camera3D = $camera
|
||||||
@onready var controller: JetController = $controller
|
@onready var controller: JetController = $controller
|
||||||
|
@onready var target_ray: RayCast3D = $target_ray
|
||||||
|
|
||||||
var control_frame: BaseJet = null
|
var control_frame: BaseJet = null
|
||||||
var target: Jet = null
|
var target: Jet = null
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
class_name BaseUi extends Control
|
||||||
|
|
||||||
|
|
||||||
|
@onready var ui_viewport: UIViewport = $ui_viewport
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://dccwod1q2mvey
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
[gd_scene load_steps=3 format=3 uid="uid://d0esuq6urlrjh"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://dccwod1q2mvey" path="res://scenes/ui/base_ui.gd" id="1_mlarl"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://be2rcw7fje32a" path="res://scenes/ui/ui_viewport.tscn" id="2_nn855"]
|
||||||
|
|
||||||
|
[node name="base_ui" type="Control"]
|
||||||
|
layout_mode = 3
|
||||||
|
anchors_preset = 0
|
||||||
|
script = ExtResource("1_mlarl")
|
||||||
|
|
||||||
|
[node name="ui_viewport" parent="." instance=ExtResource("2_nn855")]
|
||||||
|
layout_mode = 0
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
class_name UIViewport extends SubViewportContainer
|
||||||
|
|
||||||
|
|
||||||
|
# NOTE: https://www.reddit.com/r/godot/comments/15ikgr4/is_it_possible_for_a_subviewport_to_use_a/
|
||||||
|
|
||||||
|
|
||||||
|
@export var view_camera: Camera3D:
|
||||||
|
get: return _view_camera
|
||||||
|
set(value):
|
||||||
|
_view_camera = value
|
||||||
|
if _view_camera and camera:
|
||||||
|
camera.projection = _view_camera.projection
|
||||||
|
camera.size = _view_camera.size
|
||||||
|
|
||||||
|
@onready var sub_viewport: SubViewport = $sub_viewport
|
||||||
|
@onready var camera: Camera3D = $sub_viewport/camera
|
||||||
|
|
||||||
|
var _view_camera: Camera3D
|
||||||
|
|
||||||
|
func _process(_delta: float) -> void:
|
||||||
|
if view_camera and camera:
|
||||||
|
camera.global_transform = view_camera.global_transform
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://jmbcc6a3pnof
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
[gd_scene load_steps=2 format=3 uid="uid://be2rcw7fje32a"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://jmbcc6a3pnof" path="res://scenes/ui/ui_viewport.gd" id="1_2a424"]
|
||||||
|
|
||||||
|
[node name="ui_viewport" type="SubViewportContainer"]
|
||||||
|
offset_right = 40.0
|
||||||
|
offset_bottom = 40.0
|
||||||
|
script = ExtResource("1_2a424")
|
||||||
|
|
||||||
|
[node name="sub_viewport" type="SubViewport" parent="."]
|
||||||
|
transparent_bg = true
|
||||||
|
handle_input_locally = false
|
||||||
|
render_target_update_mode = 4
|
||||||
|
|
||||||
|
[node name="camera" type="Camera3D" parent="sub_viewport"]
|
||||||
@@ -16,9 +16,6 @@ func _controller_message(event: BaseEvent) -> void:
|
|||||||
|
|
||||||
func handle_init_spawns_loaded_event() -> void:
|
func handle_init_spawns_loaded_event() -> void:
|
||||||
for jet: Jet in jets_collection.get_children():
|
for jet: Jet in jets_collection.get_children():
|
||||||
if Globals.ControlMode.PLAYER_MODE == jet.controller.control_mode:
|
|
||||||
continue
|
|
||||||
|
|
||||||
create_jet_plan(jet)
|
create_jet_plan(jet)
|
||||||
|
|
||||||
func create_jet_plan(jet: Jet) -> void:
|
func create_jet_plan(jet: Jet) -> void:
|
||||||
@@ -37,56 +34,14 @@ func assign_jet_target(jet: Jet) -> void:
|
|||||||
func process_jet_plan(jet: Jet) -> void:
|
func process_jet_plan(jet: Jet) -> void:
|
||||||
if not is_instance_valid(jet.target): return
|
if not is_instance_valid(jet.target): return
|
||||||
|
|
||||||
var direction: Vector3 = (
|
var target_local_position: Vector3 = jet.to_local(jet.target.global_position)
|
||||||
jet.target.global_position - jet.global_position
|
var target_direction: Vector3 = target_local_position.normalized()
|
||||||
).normalized()
|
jet.target_ray.target_position = target_direction * 8
|
||||||
|
|
||||||
var target_basis = Basis.looking_at(direction, Vector3.UP)
|
|
||||||
var target_rotation = target_basis.get_euler()
|
|
||||||
var current_rotation = jet.global_rotation
|
|
||||||
|
|
||||||
var yaw_error = wrapf(
|
|
||||||
target_rotation.y - current_rotation.y,
|
|
||||||
-PI,
|
|
||||||
PI
|
|
||||||
)
|
|
||||||
|
|
||||||
var pitch_error = wrapf(
|
|
||||||
target_rotation.x - current_rotation.x,
|
|
||||||
-PI,
|
|
||||||
PI
|
|
||||||
)
|
|
||||||
|
|
||||||
var deadzone = deg_to_rad(2.0)
|
|
||||||
|
|
||||||
if yaw_error > deadzone:
|
|
||||||
jet.controller.cpu.yaw_right()
|
|
||||||
elif yaw_error < -deadzone:
|
|
||||||
jet.controller.cpu.yaw_left()
|
|
||||||
else:
|
|
||||||
jet.controller.cpu.no_action()
|
|
||||||
|
|
||||||
if pitch_error > deadzone:
|
|
||||||
jet.controller.cpu.pitch_down()
|
|
||||||
elif pitch_error < -deadzone:
|
|
||||||
jet.controller.cpu.pitch_up()
|
|
||||||
|
|
||||||
|
|
||||||
|
jet.controller.cpu.yaw_left()
|
||||||
|
|
||||||
|
#var direction: Vector3 = (
|
||||||
|
#jet.target.global_position - jet.global_position
|
||||||
#func process_jet_plan(jet: Jet) -> void:
|
#).normalized()
|
||||||
#var direction = (jet.target.global_position - jet.global_position).normalized()
|
#
|
||||||
#var target_basis = jet.looking_at(direction, Vector3.UP)
|
|
||||||
#var target_rotation = target_basis.get_euler()
|
|
||||||
|
|
||||||
|
|
||||||
#var direction = jet.target.global_position - jet.global_position
|
|
||||||
#var desired_rotation = jet.look_rotation(direction)
|
|
||||||
|
|
||||||
#var rotation_error = desired_rotation - jet.rotation
|
|
||||||
|
|
||||||
#jet.pitch_input = calculate_pitch(rotation_error)
|
|
||||||
#jet.yaw_input = calculate_yaw(rotation_error)
|
|
||||||
#jet.roll_input = calculate_roll(rotation_error)
|
|
||||||
#jet.throttle = calculate_throttle(distance)
|
|
||||||
|
|||||||
@@ -32,6 +32,10 @@ func spawn_axis_jet():
|
|||||||
Globals.Faction.AXIS, jet_factory.create_cpu_jet
|
Globals.Faction.AXIS, jet_factory.create_cpu_jet
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# TODO: remove after testing
|
||||||
|
var ui_viewport: UIViewport = get_node("../../base_ui/ui_viewport")
|
||||||
|
ui_viewport.view_camera = _jet.camera
|
||||||
|
|
||||||
func spawn_jet(faction: Globals.Faction, callback: Callable) -> Jet:
|
func spawn_jet(faction: Globals.Faction, callback: Callable) -> Jet:
|
||||||
var jet: Jet = null
|
var jet: Jet = null
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
[gd_scene load_steps=4 format=3 uid="uid://bfp4ltw0borib"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://be64wnjbfhnhh" path="res://scenes/jet.gd" id="1_v0bd5"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://b5btmjvj2gosl" path="res://scripts/jet_controls/controller.tscn" id="2_m0r07"]
|
||||||
|
|
||||||
|
[sub_resource type="BoxShape3D" id="BoxShape3D_31fu5"]
|
||||||
|
size = Vector3(3, 2, 18)
|
||||||
|
|
||||||
|
[node name="jet" type="CharacterBody3D"]
|
||||||
|
motion_mode = 1
|
||||||
|
script = ExtResource("1_v0bd5")
|
||||||
|
|
||||||
|
[node name="camera" type="Camera3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 18)
|
||||||
|
far = 10000.0
|
||||||
|
|
||||||
|
[node name="collision" type="CollisionShape3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.17266846, -0.17565918, -1.5986328)
|
||||||
|
shape = SubResource("BoxShape3D_31fu5")
|
||||||
|
|
||||||
|
[node name="target_ray" type="RayCast3D" parent="."]
|
||||||
|
collision_mask = 8
|
||||||
|
collide_with_areas = true
|
||||||
|
debug_shape_custom_color = Color(0.76862746, 0, 0, 1)
|
||||||
|
|
||||||
|
[node name="controller" parent="." instance=ExtResource("2_m0r07")]
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
@tool
|
||||||
|
class_name TestWorld extends Node3D
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
func _process(delta: float) -> void:
|
||||||
|
var jet: Jet = $jet
|
||||||
|
var jet2: Jet = $jet2
|
||||||
|
var target_ray: RayCast3D = jet.get_node("target_ray")
|
||||||
|
|
||||||
|
var direction: Vector3 = (
|
||||||
|
jet2.global_position - jet.global_position
|
||||||
|
).normalized()
|
||||||
|
target_ray.target_position = direction
|
||||||
|
|
||||||
|
#var target_basis = Basis.looking_at(direction, Vector3.UP)
|
||||||
|
#var target_rotation = target_basis.get_euler()
|
||||||
|
#var current_rotation = jet.global_rotation
|
||||||
|
|
||||||
|
#print(jet.global_rotation)
|
||||||
|
#print(target_rotation)
|
||||||
|
#jet.global_rotation = target_rotation
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://emw28v4vimpy
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
[gd_scene load_steps=3 format=3 uid="uid://boihqkqrbm0ti"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://emw28v4vimpy" path="res://skunk_works/test_world.gd" id="1_nnwr0"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://bfp4ltw0borib" path="res://skunk_works/jet.tscn" id="2_iba6n"]
|
||||||
|
|
||||||
|
[node name="test_world" type="Node3D"]
|
||||||
|
script = ExtResource("1_nnwr0")
|
||||||
|
|
||||||
|
[node name="jet" parent="." instance=ExtResource("2_iba6n")]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, 0)
|
||||||
|
|
||||||
|
[node name="jet2" parent="." instance=ExtResource("2_iba6n")]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 38, 41, 62)
|
||||||
Reference in New Issue
Block a user