From 0da3a4eedc267e8ca565ce29f0c3754b51217d7f Mon Sep 17 00:00:00 2001 From: Bel LaPointe <153096461+breel-render@users.noreply.github.com> Date: Fri, 22 Aug 2025 13:31:37 -0600 Subject: [PATCH] i think less gdscript is key --- .../Characters/Movers/Players/wasd.gd | 17 ++++++++++ .../Characters/Movers/Players/wasd.gd.uid | 1 + .../Characters/Movers/{pedal.gd => mover.gd} | 5 ++- .../Movers/{pedal.gd.uid => mover.gd.uid} | 0 .../Characters/Players/Kobolds/Baby/baby.gd | 1 + .../Characters/Players/Kobolds/Baby/baby.tscn | 34 +++++++++++++++++++ .../Characters/Players/Kobolds/kobold.gd | 3 ++ .../Entities/Characters/Players/player.gd | 15 +------- .../Entities/Characters/character.gd | 3 +- Examples/mvp-walk-with-collision/root.tscn | 32 +++-------------- 10 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 Examples/mvp-walk-with-collision/Entities/Characters/Movers/Players/wasd.gd create mode 100644 Examples/mvp-walk-with-collision/Entities/Characters/Movers/Players/wasd.gd.uid rename Examples/mvp-walk-with-collision/Entities/Characters/Movers/{pedal.gd => mover.gd} (97%) rename Examples/mvp-walk-with-collision/Entities/Characters/Movers/{pedal.gd.uid => mover.gd.uid} (100%) create mode 100644 Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/Baby/baby.tscn mode change 100755 => 100644 Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/kobold.gd diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/Movers/Players/wasd.gd b/Examples/mvp-walk-with-collision/Entities/Characters/Movers/Players/wasd.gd new file mode 100644 index 0000000..2666706 --- /dev/null +++ b/Examples/mvp-walk-with-collision/Entities/Characters/Movers/Players/wasd.gd @@ -0,0 +1,17 @@ +extends "res://Entities/Characters/Movers/mover.gd" + +func _input(event): + if event is InputEventKey: + match event.keycode: + KEY_W: + self.state_move_forward = event.pressed + KEY_A: + self.state_move_left = event.pressed + KEY_S: + self.state_move_backward = event.pressed + KEY_D: + self.state_move_right = event.pressed + KEY_Q: + self.state_turn_left = event.pressed + KEY_E: + self.state_turn_right = event.pressed diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/Movers/Players/wasd.gd.uid b/Examples/mvp-walk-with-collision/Entities/Characters/Movers/Players/wasd.gd.uid new file mode 100644 index 0000000..4795888 --- /dev/null +++ b/Examples/mvp-walk-with-collision/Entities/Characters/Movers/Players/wasd.gd.uid @@ -0,0 +1 @@ +uid://be8ook47nacm3 diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/Movers/pedal.gd b/Examples/mvp-walk-with-collision/Entities/Characters/Movers/mover.gd similarity index 97% rename from Examples/mvp-walk-with-collision/Entities/Characters/Movers/pedal.gd rename to Examples/mvp-walk-with-collision/Entities/Characters/Movers/mover.gd index c61d4d3..6bbcf97 100644 --- a/Examples/mvp-walk-with-collision/Entities/Characters/Movers/pedal.gd +++ b/Examples/mvp-walk-with-collision/Entities/Characters/Movers/mover.gd @@ -1,7 +1,10 @@ -extends Node +class_name Mover extends Node var speed = 1.0 +func _input(event): + return + func to_move_rotate(global_transform, delta: float): var mv = Vector3.ZERO var rot = 0.0 diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/Movers/pedal.gd.uid b/Examples/mvp-walk-with-collision/Entities/Characters/Movers/mover.gd.uid similarity index 100% rename from Examples/mvp-walk-with-collision/Entities/Characters/Movers/pedal.gd.uid rename to Examples/mvp-walk-with-collision/Entities/Characters/Movers/mover.gd.uid diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/Baby/baby.gd b/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/Baby/baby.gd index a7edd45..b6dde24 100644 --- a/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/Baby/baby.gd +++ b/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/Baby/baby.gd @@ -1,4 +1,5 @@ extends "res://Entities/Characters/Players/Kobolds/kobold.gd" func _ready(): + super() self.mover.speed = 1.5 diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/Baby/baby.tscn b/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/Baby/baby.tscn new file mode 100644 index 0000000..7b3c1f8 --- /dev/null +++ b/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/Baby/baby.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=5 format=3 uid="uid://dh8s2ahe8nmgn"] + +[ext_resource type="Script" uid="uid://djb32mbaia5hv" path="res://Entities/Characters/Players/Kobolds/Baby/baby.gd" id="1_2kj0s"] + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_2kj0s"] + +[sub_resource type="CapsuleMesh" id="CapsuleMesh_w1w5b"] + +[sub_resource type="CylinderMesh" id="CylinderMesh_2iju7"] + +[node name="CharacterBody3D" type="CharacterBody3D"] +script = ExtResource("1_2kj0s") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +transform = Transform3D(0.385, 0, 0, 0, 0.385, 0, 0, 0, 0.385, 0, 0.410002, 0) +shape = SubResource("CapsuleShape3D_2kj0s") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(0.385, 0, 0, 0, 0.385, 0, 0, 0, 0.385, 0, 0.410002, 0) +mesh = SubResource("CapsuleMesh_w1w5b") +skeleton = NodePath("") + +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.592745, 1.23893) + +[node name="MeshInstance3D2" type="MeshInstance3D" parent="."] +transform = Transform3D(0.101041, 0, 0, 0, -0.000156024, 0.110026, 0, -0.0278485, -0.000616427, 0.313608, 0.598366, 0) +mesh = SubResource("CylinderMesh_2iju7") +skeleton = NodePath("") + +[node name="MeshInstance3D3" type="MeshInstance3D" parent="."] +transform = Transform3D(0.101041, 0, 0, 0, -0.000156024, 0.110026, 0, -0.0278485, -0.000616427, -0.32095, 0.598366, 0) +mesh = SubResource("CylinderMesh_2iju7") +skeleton = NodePath("") diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/kobold.gd b/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/kobold.gd old mode 100755 new mode 100644 index 25b74a2..ae08c04 --- a/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/kobold.gd +++ b/Examples/mvp-walk-with-collision/Entities/Characters/Players/Kobolds/kobold.gd @@ -1 +1,4 @@ extends "res://Entities/Characters/Players/player.gd" + +func _ready(): + self.mover = preload("res://Entities/Characters/Movers/Players/wasd.gd").new() diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/Players/player.gd b/Examples/mvp-walk-with-collision/Entities/Characters/Players/player.gd index f776cde..b6b7595 100644 --- a/Examples/mvp-walk-with-collision/Entities/Characters/Players/player.gd +++ b/Examples/mvp-walk-with-collision/Entities/Characters/Players/player.gd @@ -1,17 +1,4 @@ extends "res://Entities/Characters/character.gd" func _input(event): - if event is InputEventKey: - match event.keycode: - KEY_W: - self.mover.state_move_forward = event.pressed - KEY_A: - self.mover.state_move_left = event.pressed - KEY_S: - self.mover.state_move_backward = event.pressed - KEY_D: - self.mover.state_move_right = event.pressed - KEY_Q: - self.mover.state_turn_left = event.pressed - KEY_E: - self.mover.state_turn_right = event.pressed + self.mover._input(event) diff --git a/Examples/mvp-walk-with-collision/Entities/Characters/character.gd b/Examples/mvp-walk-with-collision/Entities/Characters/character.gd index 9e9a37a..56e7d64 100644 --- a/Examples/mvp-walk-with-collision/Entities/Characters/character.gd +++ b/Examples/mvp-walk-with-collision/Entities/Characters/character.gd @@ -1,6 +1,6 @@ extends PhysicsBody3D -var mover := preload("res://Entities/Characters/Movers/pedal.gd").new() +var mover: Mover = preload("res://Entities/Characters/Movers/mover.gd").new() func _physics_process(delta: float): var duo = self.mover.to_move_rotate(self.global_transform, delta) @@ -9,5 +9,4 @@ func _physics_process(delta: float): func _physics_process_with(vel, rot): self.velocity = vel self.rotate_object_local(Vector3.UP, rot) - print("vel", vel) self.move_and_collide(self.velocity) diff --git a/Examples/mvp-walk-with-collision/root.tscn b/Examples/mvp-walk-with-collision/root.tscn index 23b874a..31b01c2 100644 --- a/Examples/mvp-walk-with-collision/root.tscn +++ b/Examples/mvp-walk-with-collision/root.tscn @@ -1,18 +1,12 @@ -[gd_scene load_steps=7 format=3 uid="uid://sq04wsxbebev"] +[gd_scene load_steps=4 format=3 uid="uid://sq04wsxbebev"] -[ext_resource type="Script" uid="uid://djb32mbaia5hv" path="res://Entities/Characters/Players/Kobolds/Baby/baby.gd" id="1_pq8q7"] +[ext_resource type="PackedScene" uid="uid://dh8s2ahe8nmgn" path="res://Entities/Characters/Players/Kobolds/Baby/baby.tscn" id="1_pq8q7"] [sub_resource type="PlaneMesh" id="PlaneMesh_vho56"] [sub_resource type="BoxShape3D" id="BoxShape3D_vho56"] size = Vector3(1, 0.0673828, 1) -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_pq8q7"] - -[sub_resource type="CapsuleMesh" id="CapsuleMesh_pyidc"] - -[sub_resource type="CylinderMesh" id="CylinderMesh_pq8q7"] - [node name="Node3D" type="Node3D"] [node name="MeshInstance3D" type="MeshInstance3D" parent="."] @@ -30,23 +24,5 @@ transform = Transform3D(-0.502768, 0.414074, -0.758793, 0.228711, 0.910243, 0.34 transform = Transform3D(0.609305, -0.410386, 0.678477, 0.791335, 0.369058, -0.487427, -0.0503645, 0.833894, 0.549621, 3.06633, 1.15689, 0.070383) light_energy = 0.5 -[node name="baby" type="CharacterBody3D" parent="."] -transform = Transform3D(0.385, 0, 0, 0, 0.385, 0, 0, 0, 0.385, 0, 0.410002, 0) -script = ExtResource("1_pq8q7") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="baby"] -shape = SubResource("CapsuleShape3D_pq8q7") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="baby"] -mesh = SubResource("CapsuleMesh_pyidc") - -[node name="Camera3D" type="Camera3D" parent="baby"] -transform = Transform3D(2.5974, 0, 0, 0, 2.5974, 0, 0, 0, 2.5974, 0, 0.474657, 3.218) - -[node name="MeshInstance3D2" type="MeshInstance3D" parent="baby"] -transform = Transform3D(0.262444, 0, 0, 0, -0.000405256, 0.285781, 0, -0.0723338, -0.00160111, 0.57384, 0.489256, 0) -mesh = SubResource("CylinderMesh_pq8q7") - -[node name="MeshInstance3D3" type="MeshInstance3D" parent="baby"] -transform = Transform3D(0.262444, 0, 0, 0, -0.000405256, 0.285781, 0, -0.0723338, -0.00160111, -0.585222, 0.489256, 0) -mesh = SubResource("CylinderMesh_pq8q7") +[node name="baby_tscn" parent="." instance=ExtResource("1_pq8q7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0585822, 0.0336914, 0.24129)