From f16e26c981bde9c1da034dc939d80a222577c5a8 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 21:38:00 +1300 Subject: [PATCH 01/16] gears: remove redundant gear_id() --- gears/ball.gd | 2 -- gears/gear.gd | 4 ---- 2 files changed, 6 deletions(-) diff --git a/gears/ball.gd b/gears/ball.gd index fc30219..67ecd55 100644 --- a/gears/ball.gd +++ b/gears/ball.gd @@ -2,8 +2,6 @@ class_name Ball extends "gear.gd" func gear_name(): return "Ball" -func gear_id(): - return 1 func continuous(): return false diff --git a/gears/gear.gd b/gears/gear.gd index af79744..c4b4a5a 100644 --- a/gears/gear.gd +++ b/gears/gear.gd @@ -13,15 +13,11 @@ var pickup_basis = idle_basis func gear_name(): return "Gear" -func gear_id(): - return 0 func model_file(): return "hammer.glb" func continuous(): return false -# this can be redefined to make a custom -# gear mesh, e.g. a SphereMesh func use(player): basis = use_basis $Timer.start() From 10dd8ce719d3fd446a4ec4c7dd42afd438cae0c6 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 22:28:28 +1300 Subject: [PATCH 02/16] player: add Gear.unequip() API --- gears/gear.gd | 6 ++++++ player/player.gd | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gears/gear.gd b/gears/gear.gd index c4b4a5a..588416a 100644 --- a/gears/gear.gd +++ b/gears/gear.gd @@ -23,9 +23,15 @@ func use(player): $Timer.start() on_use(player) +func unequip(player): + on_unequip(player) + func on_use(_player): pass +func on_unequip(_player): + pass + func on_ready(): pass diff --git a/player/player.gd b/player/player.gd index 48f08e0..905b397 100644 --- a/player/player.gd +++ b/player/player.gd @@ -65,6 +65,7 @@ func die(): # strip gears for gear in $Backpack.get_children(): gear.queue_free() + $Pivot/Container/Gear.unequip(self) $Pivot/Container/Gear.queue_free() $RespawnTimer.start() @@ -103,6 +104,7 @@ func use_backpack_slot(n): # place current gear in first free slot var slot = find_free_slot() if slot: + old.unequip(self) old.name = slot old.reparent($Backpack, false) get_node(gear_node).reparent($Pivot/Container, false) @@ -111,7 +113,8 @@ func use_backpack_slot(n): return # couldn't find a free slot, so replace # the new slot with the current gear - get_node(gear_node).reparent($Pivot/Container, false) + get_node(gear_node).reparent($Pivot/Container, false) + old.unequip(self) old.reparent($Backpack, false) old.name = n get_node("Pivot/Container/" + n).name = "Gear" @@ -135,6 +138,7 @@ func equip(gear: Gear): # place current gear in first free slot var slot = find_free_slot() if slot: + old.unequip(self) old.name = slot old.reparent($Backpack, false) new_gear = gear.duplicate() From 907508c4ebe689a9da3e219af46b331f2639dc3a Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 23:26:25 +1300 Subject: [PATCH 03/16] gear: make basis properties overridable by child classes --- gears/gear.gd | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gears/gear.gd b/gears/gear.gd index 588416a..80eeb2e 100644 --- a/gears/gear.gd +++ b/gears/gear.gd @@ -1,25 +1,27 @@ @icon("./gear.png") class_name Gear extends Node3D -var idle_basis = Basis( - Vector3(1, 0, 0), - Vector3(0, 1, 0), - Vector3(0, 0, 1)) -var use_basis = Basis( - Vector3(1, 0, 0), - Vector3(0, 0, -1), - Vector3(0, 1, 0)) -var pickup_basis = idle_basis - func gear_name(): return "Gear" func model_file(): return "hammer.glb" func continuous(): return false +func idle_basis(): + return Basis( + Vector3(1, 0, 0), + Vector3(0, 1, 0), + Vector3(0, 0, 1)) +func use_basis(): + return Basis( + Vector3(1, 0, 0), + Vector3(0, 0, -1), + Vector3(0, 1, 0)) +func pickup_basis(): + return idle_basis() func use(player): - basis = use_basis + basis = use_basis() $Timer.start() on_use(player) @@ -36,10 +38,10 @@ func on_ready(): pass func _on_timer_timeout(): - basis = idle_basis + basis = idle_basis() func _ready(): - basis = idle_basis + basis = idle_basis() if get_parent() is GearPickup: - basis = pickup_basis + basis = pickup_basis() on_ready() From f22364ce393420aa394c9c28aab4d97acd0b855f Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 23:35:32 +1300 Subject: [PATCH 04/16] player: start with Gear --- player/player.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/player/player.gd b/player/player.gd index 905b397..ae6067b 100644 --- a/player/player.gd +++ b/player/player.gd @@ -8,7 +8,7 @@ const gear_slots = ["1", "2", "3"] @onready var spawn = Vector3(position) -var starting_gear = preload("res://gears/ball.tscn") +var starting_gear = preload("res://gears/gear.tscn") var suspended = false var direction = Vector3.ZERO From 1e4aeddbb533d5c6b820225a727a97deb36af3ec Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 24 Jan 2026 12:41:10 +1300 Subject: [PATCH 05/16] player: add check before unequipping gear --- player/player.gd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/player/player.gd b/player/player.gd index ae6067b..312d369 100644 --- a/player/player.gd +++ b/player/player.gd @@ -65,8 +65,9 @@ func die(): # strip gears for gear in $Backpack.get_children(): gear.queue_free() - $Pivot/Container/Gear.unequip(self) - $Pivot/Container/Gear.queue_free() + if has_node("Pivot/Container/Gear"): + $Pivot/Container/Gear.unequip(self) + $Pivot/Container/Gear.queue_free() $RespawnTimer.start() message("Le gone") From 5b7ab7811ee0d0981aaf74fb9ca4bade34daac29 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 24 Jan 2026 12:43:28 +1300 Subject: [PATCH 06/16] player: add protected and suspended members `suspended' is now for suspending a player's movement input keys; `protected' is for preventing a player's death except for special cases such as when health goes below 1 or the player drops out of the world. To kill a player without checking `protected', use _die(). --- player/player.gd | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/player/player.gd b/player/player.gd index 312d369..6cf787c 100644 --- a/player/player.gd +++ b/player/player.gd @@ -10,6 +10,8 @@ const gear_slots = ["1", "2", "3"] var starting_gear = preload("res://gears/gear.tscn") +var dead = false +var protected = false var suspended = false var direction = Vector3.ZERO var target_velocity = Vector3.ZERO @@ -45,6 +47,8 @@ func message(string): # State functions func harm(hp): + if protected: + return assert(hp >= 0) _health -= hp make_hud() @@ -57,7 +61,8 @@ func heal(hp): func health(): return _health -func die(): +func _die(): + dead = true suspended = true visible = false $HUD.visible = false @@ -72,12 +77,17 @@ func die(): $RespawnTimer.start() message("Le gone") +func die(): + if protected: + return + _die() + func respawn(): position = Vector3(spawn) $CameraGimbal.reset() _health = 100 visible = true - suspended = false + dead = false # add starting gear var gear = starting_gear.instantiate() @@ -123,6 +133,8 @@ func use_backpack_slot(n): return func equip(gear: Gear): + if suspended: + return var gear_name = gear.gear_name() # do we have the gear equipped? if gear_name == $Pivot/Container/Gear.gear_name(): @@ -185,16 +197,17 @@ func do_movement(delta): var mx = 0 var mz = 0 - if Input.is_action_pressed("move_forward"): - mz -= 1 - if Input.is_action_pressed("move_back"): - mz += 1 - if Input.is_action_pressed("move_left"): - mx -= 1 - if Input.is_action_pressed("move_right"): - mx += 1 - if Input.is_action_pressed("jump") and is_on_floor(): - target_velocity.y = jump_power + if not suspended: + if Input.is_action_pressed("move_forward"): + mz -= 1 + if Input.is_action_pressed("move_back"): + mz += 1 + if Input.is_action_pressed("move_left"): + mx -= 1 + if Input.is_action_pressed("move_right"): + mx += 1 + if Input.is_action_pressed("jump") and is_on_floor(): + target_velocity.y = jump_power if !(mx == 0 and mz == 0): move_player(mx, mz) @@ -227,12 +240,12 @@ func _ready(): respawn() func _physics_process(delta): - if health() < 1 or position.y <= -1000: - die() - - if suspended: + if dead: return + if health() < 1 or position.y <= -1000: + _die() + # Backpack keys do_backpack_keys() # Movement From 7ba423e6c5be6b4caef533a1c7a3c7a36cef754d Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 24 Jan 2026 12:59:09 +1300 Subject: [PATCH 07/16] player: reparent Pivot/PlayerMesh to Pivot/Mesh/ --- player/player.tscn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/player/player.tscn b/player/player.tscn index 5c9b486..f0bf150 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -58,7 +58,9 @@ shape = SubResource("BoxShape3D_onrkg") [node name="Pivot" type="Node3D" parent="."] -[node name="PlayerMesh" type="MeshInstance3D" parent="Pivot"] +[node name="Mesh" type="Node3D" parent="Pivot"] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Pivot/Mesh"] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, -100, 0) mesh = SubResource("ArrayMesh_sweqy") skeleton = NodePath("") From bc88fed83094d49a108c510e6dc617f4b3b0c77c Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 24 Jan 2026 13:01:28 +1300 Subject: [PATCH 08/16] world: set Player position --- main.tscn | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tscn b/main.tscn index 03ed17d..4bdba12 100644 --- a/main.tscn +++ b/main.tscn @@ -42,6 +42,7 @@ glow_hdr_luminance_cap = 0.0 [node name="Main" type="Node3D"] [node name="Player" parent="." instance=ExtResource("1_ig7tw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) [node name="Baseplate" type="StaticBody3D" parent="."] From 20d1f62a7d470a4918a79c8c4a39810092ad0aa0 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sun, 25 Jan 2026 17:20:35 +1300 Subject: [PATCH 09/16] util: add class --- util/util.gd | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 util/util.gd diff --git a/util/util.gd b/util/util.gd new file mode 100644 index 0000000..1bd3c37 --- /dev/null +++ b/util/util.gd @@ -0,0 +1,4 @@ +class_name Util extends Node + +static func input_action_string(action): + return InputMap.action_get_events(action)[0].as_text() From e16f87cbfa5773dd56d67aee39b3e65a79eafe5f Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sun, 25 Jan 2026 21:11:02 +1300 Subject: [PATCH 10/16] geep: add new gear --- gears/geep.gd | 62 ++++++++++++++++++++++++++++++ gears/geep.tscn | 87 +++++++++++++++++++++++++++++++++++++++++++ gears/geep_body.tres | 4 ++ gears/geep_wheel.tres | 4 ++ 4 files changed, 157 insertions(+) create mode 100644 gears/geep.gd create mode 100644 gears/geep.tscn create mode 100644 gears/geep_body.tres create mode 100644 gears/geep_wheel.tres diff --git a/gears/geep.gd b/gears/geep.gd new file mode 100644 index 0000000..b08f60a --- /dev/null +++ b/gears/geep.gd @@ -0,0 +1,62 @@ +class_name Geep extends "gear.gd" + +func gear_name(): + return "Geep" +func continuous(): + return false +func use_basis(): + return idle_basis() + +# multiplier of player's speed +const speed = 2 +# how far the vehicle lifts the player off the ground +const lift = 2 + +var box = null +var driver = null +var active = false + +func init_driver(player): + driver = player + if not box: + box = Vector3(driver.get_node("CollisionShape3D").shape.size) + +func mount(): + active = true + position = Vector3(-driver.get_node("Pivot/Container").position) + position.y += 1 + driver.message( + "Press [%s] to exit the Geep" + % Util.input_action_string("gear_use")) + driver.get_node("CameraGimbal").position.y += lift + driver.get_node("Pivot/Mesh").position.y += lift + driver.get_node("CollisionShape3D").shape.size = $GearMesh/Vehicle/CollisionShape3D.shape.size + driver.protected = true + driver.suspended = true + +func unmount(): + active = false + position = Vector3.ZERO + driver.message("") + driver.get_node("CameraGimbal").position = Vector3.ZERO + driver.get_node("Pivot/Mesh").position = Vector3.ZERO + driver.get_node("CollisionShape3D").shape.size = box + driver.protected = false + driver.suspended = false + +func on_use(player): + init_driver(player) + if active: + unmount() + else: + mount() + +func on_unequip(player): + init_driver(player) + unmount() + +func _physics_process(_delta): + if not active: + return + + driver.move_player(0, -speed) diff --git a/gears/geep.tscn b/gears/geep.tscn new file mode 100644 index 0000000..481e2bb --- /dev/null +++ b/gears/geep.tscn @@ -0,0 +1,87 @@ +[gd_scene load_steps=10 format=3 uid="uid://d3k7b6o56ue5k"] + +[ext_resource type="Script" uid="uid://fljad0m3jlt0" path="res://gears/geep.gd" id="1_8skgp"] +[ext_resource type="Material" uid="uid://dpacu3e7vsks5" path="res://gears/geep_body.tres" id="2_rhiad"] +[ext_resource type="Material" uid="uid://bt5aat64e478k" path="res://gears/geep_wheel.tres" id="3_lrfuo"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_lrfuo"] +size = Vector3(3, 3, 6) + +[sub_resource type="BoxMesh" id="BoxMesh_rhiad"] +material = ExtResource("2_rhiad") +size = Vector3(3, 0.5, 6) + +[sub_resource type="BoxMesh" id="BoxMesh_kyikt"] +material = ExtResource("2_rhiad") +size = Vector3(0.5, 1.75, 6) + +[sub_resource type="BoxMesh" id="BoxMesh_wm067"] +material = ExtResource("2_rhiad") +size = Vector3(3, 2, 2.5) + +[sub_resource type="BoxMesh" id="BoxMesh_lrfuo"] +material = ExtResource("2_rhiad") +size = Vector3(3, 2, 0.5) + +[sub_resource type="CylinderMesh" id="CylinderMesh_lrfuo"] +material = ExtResource("3_lrfuo") +top_radius = 1.0 +bottom_radius = 1.0 +height = 0.25 + +[node name="Gear" type="Node3D"] +rotation_edit_mode = 2 +script = ExtResource("1_8skgp") + +[node name="Timer" type="Timer" parent="."] +one_shot = true + +[node name="GearMesh" type="Node3D" parent="."] + +[node name="Vehicle" type="StaticBody3D" parent="GearMesh"] +transform = Transform3D(1, 0, 0, 0, 1.0000001, 0, 0, 0, 1.0000001, 0, 0, 0) +collision_layer = 4 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) +shape = SubResource("BoxShape3D_lrfuo") + +[node name="BaseMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9997004, 0) +mesh = SubResource("BoxMesh_rhiad") + +[node name="LeftSideMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 0, 0, 0, 0.9999999, -1.25, 2.1247003, 0) +mesh = SubResource("BoxMesh_kyikt") +skeleton = NodePath("") + +[node name="RightSideMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 0, 0, 0, 0.9999999, 1.25, 2.1247003, 0) +mesh = SubResource("BoxMesh_kyikt") +skeleton = NodePath("") + +[node name="BonnetMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9997005, -1.75) +mesh = SubResource("BoxMesh_wm067") + +[node name="TailgateMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9997005, 2.75) +mesh = SubResource("BoxMesh_lrfuo") + +[node name="WheelFLMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, 1.65, 1, 2) +mesh = SubResource("CylinderMesh_lrfuo") + +[node name="WheelFRMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, -1.65, 1, 2) +mesh = SubResource("CylinderMesh_lrfuo") + +[node name="WheelBLMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, 1.65, 1, -2) +mesh = SubResource("CylinderMesh_lrfuo") + +[node name="WheelBRMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, -1.65, 1, -2) +mesh = SubResource("CylinderMesh_lrfuo") + +[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] diff --git a/gears/geep_body.tres b/gears/geep_body.tres new file mode 100644 index 0000000..4401665 --- /dev/null +++ b/gears/geep_body.tres @@ -0,0 +1,4 @@ +[gd_resource type="StandardMaterial3D" load_steps=0 format=3 uid="uid://dpacu3e7vsks5"] + +[resource] +albedo_color = Color(0.99607843, 0.99607843, 0.99607843, 1) diff --git a/gears/geep_wheel.tres b/gears/geep_wheel.tres new file mode 100644 index 0000000..fa76463 --- /dev/null +++ b/gears/geep_wheel.tres @@ -0,0 +1,4 @@ +[gd_resource type="StandardMaterial3D" load_steps=0 format=3 uid="uid://bt5aat64e478k"] + +[resource] +albedo_color = Color(0.1254902, 0.1254902, 0.1254902, 1) From b11655a8fe35ef8e91224aaf462125dc08628546 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 27 Jan 2026 11:18:28 +1300 Subject: [PATCH 11/16] world: add ball and geep pickups --- main.tscn | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/main.tscn b/main.tscn index 4bdba12..7748f3f 100644 --- a/main.tscn +++ b/main.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=16 format=3 uid="uid://eiaw4xbs3suk"] +[gd_scene load_steps=17 format=3 uid="uid://eiaw4xbs3suk"] [ext_resource type="PackedScene" uid="uid://qb8cbljxgnub" path="res://world/killbrick.tscn" id="1_h2yge"] [ext_resource type="PackedScene" uid="uid://cfceg80unq0pe" path="res://player/player.tscn" id="1_ig7tw"] [ext_resource type="PackedScene" uid="uid://bcmrj6qkemrll" path="res://world/radiohead_cube.tscn" id="2_0xm2m"] -[ext_resource type="Texture2D" uid="uid://wdjmyv260he1" path="res://world/textures/grass.jpg" id="2_272bh"] +[ext_resource type="Texture2D" uid="uid://dnt0vfav03ris" path="res://world/textures/grass.jpg" id="2_272bh"] [ext_resource type="PackedScene" uid="uid://of6tq8gpjxtu" path="res://gears/gear_pickup.tscn" id="3_lquwl"] -[ext_resource type="PackedScene" uid="uid://bafl8q0r61xrg" path="res://gears/gear.tscn" id="4_7mycd"] -[ext_resource type="Texture2D" uid="uid://2ku62tk8r74x" path="res://world/textures/sky.hdr" id="8_5vw27"] +[ext_resource type="PackedScene" uid="uid://c117buhmmkvkt" path="res://gears/ball.tscn" id="6_5vw27"] +[ext_resource type="PackedScene" uid="uid://d3k7b6o56ue5k" path="res://gears/geep.tscn" id="7_kek77"] +[ext_resource type="Texture2D" uid="uid://bl4yvm44o6gcf" path="res://world/textures/sky.hdr" id="8_5vw27"] [sub_resource type="BoxShape3D" id="BoxShape3D_7dm0k"] size = Vector3(1000, 2, 1000) @@ -68,11 +69,16 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 7, 0) [node name="Killbrick" parent="." instance=ExtResource("1_h2yge")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -40, 1.5, -40) -[node name="GearPickup" parent="." instance=ExtResource("3_lquwl")] +[node name="BallPickup" parent="." instance=ExtResource("3_lquwl")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 2, -21) -[node name="Gear" parent="GearPickup" instance=ExtResource("4_7mycd")] -transform = Transform3D(1, 0, 0, 0, -0.012967386, 0.9999159, 0, -0.9999159, -0.012967386, 0, 0.5, 0) +[node name="Gear" parent="BallPickup" instance=ExtResource("6_5vw27")] + +[node name="GeepPickup" parent="." instance=ExtResource("3_lquwl")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 1.75, -30) + +[node name="Gear" parent="GeepPickup" instance=ExtResource("7_kek77")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.75, 0) [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_7mycd") From 79fa8135719ac932d61af2806bcc3b897ad32dc3 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 27 Jan 2026 11:25:48 +1300 Subject: [PATCH 12/16] camera: rename script to camera.gd --- player/{camera_gimbal.gd => camera.gd} | 0 player/player.tscn | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename player/{camera_gimbal.gd => camera.gd} (100%) diff --git a/player/camera_gimbal.gd b/player/camera.gd similarity index 100% rename from player/camera_gimbal.gd rename to player/camera.gd diff --git a/player/player.tscn b/player/player.tscn index f0bf150..5ab62db 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=4 uid="uid://cfceg80unq0pe"] -[ext_resource type="Script" uid="uid://bfflnag3p4gen" path="res://player/player.gd" id="1_onrkg"] -[ext_resource type="Script" uid="uid://oi6sint7jkc6" path="res://player/camera_gimbal.gd" id="2_onrkg"] +[ext_resource type="Script" uid="uid://djeyfi7vm2vw0" path="res://player/player.gd" id="1_onrkg"] +[ext_resource type="Script" uid="uid://oi6sint7jkc6" path="res://player/camera.gd" id="2_onrkg"] [ext_resource type="Texture2D" uid="uid://cfb0gbwm57hm4" path="res://models/player_0.png" id="3_hqtel"] [sub_resource type="BoxShape3D" id="BoxShape3D_onrkg"] From d00cee752e9ae90c4837aa65fca0ec93080e4e6d Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 27 Jan 2026 11:39:22 +1300 Subject: [PATCH 13/16] camera: lint --- player/camera.gd | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/player/camera.gd b/player/camera.gd index 14cad50..f98b431 100644 --- a/player/camera.gd +++ b/player/camera.gd @@ -2,74 +2,68 @@ class_name CameraGimbal extends Node3D @export var rotation_speed = (PI / 180) * 120 @export var shift_lock = false +@export var default_zoom = 8 -var locked_mouse_positon = Vector2(0,0) var mouse_locked = false -var mouse_x_velocity = 0 -var mouse_y_velocity = 0 +var mouse_velocity = Vector2.ZERO +var locked_mouse_position = Vector2.ZERO +var current_zoom = default_zoom var zoom_min = 4 var zoom_max = 80 var zoom_speed = 20 -var current_zoom = 8 func reset(): basis = Basis() $InnerGimbal.basis = Basis() + current_zoom = default_zoom func rotate_camera_y(y, delta): rotate_object_local(Vector3.UP, y * rotation_speed * delta) func rotate_camera_x(x, delta): $InnerGimbal.rotate_object_local( Vector3.RIGHT, x * rotation_speed * delta) - $InnerGimbal.rotation.x = clamp($InnerGimbal.rotation.x,-0.8,0.7) - + $InnerGimbal.rotation.x = clamp($InnerGimbal.rotation.x, -0.8, 0.7) + func _input(event): if event is InputEventMouseMotion: - mouse_x_velocity = event.relative.x - mouse_y_velocity = event.relative.y + mouse_velocity = event.relative elif event.is_action_pressed("zoom_out"): current_zoom += 1 elif event.is_action_pressed("zoom_in"): current_zoom -= 1 + current_zoom = clamp(current_zoom, zoom_min, zoom_max) + func _process(delta): - # rotate outer gimbal around y axis var y = 0 var x = 0 if Input.is_action_just_pressed("shift_lock"): - if shift_lock == true: - shift_lock = false - else: - shift_lock = true - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT) or shift_lock == true: + shift_lock = not shift_lock + if Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT) or shift_lock == true: if mouse_locked == false: mouse_locked = true - locked_mouse_positon = get_viewport().get_mouse_position() + locked_mouse_position = get_viewport().get_mouse_position() Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - if mouse_x_velocity > 5 or mouse_x_velocity < -5: - y -= clamp(mouse_x_velocity / 12.5, -10, 10) - if mouse_y_velocity > 5 or mouse_y_velocity < -5: - x -= clamp(mouse_y_velocity / 12.5, -10, 10) + if mouse_velocity.x > 5 or mouse_velocity.x < -5: + y -= clamp(mouse_velocity.x / 12.5, -10, 10) + if mouse_velocity.y > 5 or mouse_velocity.y < -5: + x -= clamp(mouse_velocity.y / 12.5, -10, 10) else: Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) + mouse_velocity = Vector2.ZERO mouse_locked = false - mouse_x_velocity = 0 - mouse_y_velocity = 0 rotate_camera_y(y, delta) rotate_camera_x(x, delta) - # reset gimbals if Input.is_action_pressed("cam_reset"): reset() - current_zoom = clamp(current_zoom, zoom_min, zoom_max) - var pos = Vector3($InnerGimbal/Camera3D.position) - pos.y = lerp(pos.y, float(current_zoom), zoom_speed*delta) - pos.z = lerp(pos.z, float(current_zoom), zoom_speed*delta) - + pos.y = lerp(pos.y, float(current_zoom), zoom_speed * delta) + pos.z = lerp(pos.z, float(current_zoom), zoom_speed * delta) + $InnerGimbal/Camera3D.position = pos From ee44810636d67818ad3d11018b5f3f5a90b72b86 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 27 Jan 2026 11:39:27 +1300 Subject: [PATCH 14/16] project.godot: remove camera rotation events --- project.godot | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/project.godot b/project.godot index 17ffc86..bd1cd79 100644 --- a/project.godot +++ b/project.godot @@ -42,26 +42,6 @@ jump={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) ] } -cam_left={ -"deadzone": 0.2, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) -] -} -cam_right={ -"deadzone": 0.2, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) -] -} -cam_up={ -"deadzone": 0.2, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) -] -} -cam_down={ -"deadzone": 0.2, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) -] -} cam_reset={ "deadzone": 0.2, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":79,"physical_keycode":0,"key_label":0,"unicode":111,"location":0,"echo":false,"script":null) From 35a17c04b616f37290ceac6735792ead8ee9847b Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 27 Jan 2026 12:15:46 +1300 Subject: [PATCH 15/16] camera: add cam_ prefix to zoom_ events --- player/camera.gd | 4 ++-- project.godot | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/player/camera.gd b/player/camera.gd index f98b431..c558b54 100644 --- a/player/camera.gd +++ b/player/camera.gd @@ -28,9 +28,9 @@ func rotate_camera_x(x, delta): func _input(event): if event is InputEventMouseMotion: mouse_velocity = event.relative - elif event.is_action_pressed("zoom_out"): + elif event.is_action_pressed("cam_zoom_out"): current_zoom += 1 - elif event.is_action_pressed("zoom_in"): + elif event.is_action_pressed("cam_zoom_in"): current_zoom -= 1 current_zoom = clamp(current_zoom, zoom_min, zoom_max) diff --git a/project.godot b/project.godot index bd1cd79..a9ffdec 100644 --- a/project.godot +++ b/project.godot @@ -72,12 +72,12 @@ shift_lock={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } -zoom_in={ +cam_zoom_in={ "deadzone": 0.2, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } -zoom_out={ +cam_zoom_out={ "deadzone": 0.2, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null) ] From 54967e570b24f8cc8ceedbdf754ade9834d2b531 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 27 Jan 2026 12:18:03 +1300 Subject: [PATCH 16/16] camera: remove shift lock --- player/camera.gd | 76 ++++++++++++++++++++++++++++++------------------ project.godot | 5 ---- 2 files changed, 47 insertions(+), 34 deletions(-) diff --git a/player/camera.gd b/player/camera.gd index c558b54..07afbeb 100644 --- a/player/camera.gd +++ b/player/camera.gd @@ -1,26 +1,52 @@ class_name CameraGimbal extends Node3D @export var rotation_speed = (PI / 180) * 120 -@export var shift_lock = false @export var default_zoom = 8 -var mouse_locked = false +# is mouse captured by game permanently? +# (i.e. not just holding right click) +var locked = false var mouse_velocity = Vector2.ZERO -var locked_mouse_position = Vector2.ZERO var current_zoom = default_zoom var zoom_min = 4 var zoom_max = 80 var zoom_speed = 20 +func _lock(): + Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) + +func _unlock(): + Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) + mouse_velocity = Vector2.ZERO + +func lock(): + _lock() + locked = true + +# optional API function for nodes that want +# to unlock the mouse for a period of time +func unlock(): + _unlock() + locked = false + func reset(): basis = Basis() $InnerGimbal.basis = Basis() current_zoom = default_zoom -func rotate_camera_y(y, delta): +# y is before x because the outer gimbal is +# in charge of rotating the y axis +func rotate_camera(delta): + var y = 0 + var x = 0 + + if mouse_velocity.x > 5 or mouse_velocity.x < -5: + y -= clamp(mouse_velocity.x / 12.5, -10, 10) + if mouse_velocity.y > 5 or mouse_velocity.y < -5: + x -= clamp(mouse_velocity.y / 12.5, -10, 10) + rotate_object_local(Vector3.UP, y * rotation_speed * delta) -func rotate_camera_x(x, delta): $InnerGimbal.rotate_object_local( Vector3.RIGHT, x * rotation_speed * delta) $InnerGimbal.rotation.x = clamp($InnerGimbal.rotation.x, -0.8, 0.7) @@ -36,34 +62,26 @@ func _input(event): current_zoom = clamp(current_zoom, zoom_min, zoom_max) func _process(delta): - var y = 0 - var x = 0 - - if Input.is_action_just_pressed("shift_lock"): - shift_lock = not shift_lock - if Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT) or shift_lock == true: - if mouse_locked == false: - mouse_locked = true - locked_mouse_position = get_viewport().get_mouse_position() - Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - - if mouse_velocity.x > 5 or mouse_velocity.x < -5: - y -= clamp(mouse_velocity.x / 12.5, -10, 10) - if mouse_velocity.y > 5 or mouse_velocity.y < -5: - x -= clamp(mouse_velocity.y / 12.5, -10, 10) + # rotate camera + if locked: + rotate_camera(delta) else: - Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) - mouse_velocity = Vector2.ZERO - mouse_locked = false - - rotate_camera_y(y, delta) - rotate_camera_x(x, delta) - - if Input.is_action_pressed("cam_reset"): - reset() + if Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT): + _lock() + rotate_camera(delta) + else: + _unlock() + # zoom in/out var pos = Vector3($InnerGimbal/Camera3D.position) pos.y = lerp(pos.y, float(current_zoom), zoom_speed * delta) pos.z = lerp(pos.z, float(current_zoom), zoom_speed * delta) $InnerGimbal/Camera3D.position = pos + + # reset camera + if Input.is_action_pressed("cam_reset"): + reset() + +func _ready(): + lock() diff --git a/project.godot b/project.godot index a9ffdec..63966a8 100644 --- a/project.godot +++ b/project.godot @@ -67,11 +67,6 @@ backpack_3={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":51,"physical_keycode":0,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null) ] } -shift_lock={ -"deadzone": 0.2, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) -] -} cam_zoom_in={ "deadzone": 0.2, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"double_click":false,"script":null)