From 71580ad183922115c5c49d06eca3023e4cc51b3e Mon Sep 17 00:00:00 2001 From: JonShard Date: Mon, 27 Jul 2026 17:07:18 +0200 Subject: [PATCH] Fix Snap_zones not range grabbing --- Items/BurgerBuns.tscn | 5 +- Prefabs/combinable_item.tscn | 6 +- Scenes/JonScene.tscn | 198 +++-------------------------------- Stations/Counter.tscn | 12 ++- Stations/Hob.tscn | 12 +-- Stations/dirt_station.tscn | 2 +- Stations/sink.tscn | 14 +-- Stations/table.gd | 2 - Stations/table.tscn | 10 +- UI/progress_bar_3d.gd | 1 - kanban_tasks_data.kanban | 26 ++++- 11 files changed, 72 insertions(+), 216 deletions(-) diff --git a/Items/BurgerBuns.tscn b/Items/BurgerBuns.tscn index e479e36..f42f0d0 100644 --- a/Items/BurgerBuns.tscn +++ b/Items/BurgerBuns.tscn @@ -8,7 +8,7 @@ [ext_resource type="Animation" uid="uid://bediglpx0rj7i" path="res://addons/godot-xr-tools/hands/animations/left/Grip 5.res" id="6_ftab3"] [ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://Prefabs/combinable_item.tscn" id="7_wb51u"] [ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://Prefabs/food_item.tscn" id="8_t9y3x"] -[ext_resource type="Script" path="res://Net/net_pickable.gd" id="20_netpk"] +[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" path="res://Net/net_pickable.gd" id="20_netpk"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_vlqg6"] height = 0.10708985 @@ -85,7 +85,6 @@ type = 2 [node name="CombinableItem" parent="." index="5" unique_id=996936271 instance=ExtResource("7_wb51u")] -[node name="NetPickable" type="MultiplayerSynchronizer" parent="."] -root_path = NodePath("..") +[node name="NetPickable" type="MultiplayerSynchronizer" parent="." index="6" unique_id=2086885420] replication_config = SubResource("SceneReplicationConfig_np_buns") script = ExtResource("20_netpk") diff --git a/Prefabs/combinable_item.tscn b/Prefabs/combinable_item.tscn index 2bc8948..2d44d93 100644 --- a/Prefabs/combinable_item.tscn +++ b/Prefabs/combinable_item.tscn @@ -2,8 +2,8 @@ [ext_resource type="Script" uid="uid://dounic663dn5q" path="res://Prefabs/combinable_item.gd" id="1_q21ti"] -[sub_resource type="BoxShape3D" id="BoxShape3D_combine"] -size = Vector3(0.16, 0.16, 0.16) +[sub_resource type="SphereShape3D" id="SphereShape3D_o1b3t"] +radius = 0.2 [node name="CombinableItem" type="Node3D" unique_id=996936271] script = ExtResource("1_q21ti") @@ -11,4 +11,4 @@ script = ExtResource("1_q21ti") [node name="Area3d" type="Area3D" parent="." unique_id=1514178016] [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3d" unique_id=706892516] -shape = SubResource("BoxShape3D_combine") +shape = SubResource("SphereShape3D_o1b3t") diff --git a/Scenes/JonScene.tscn b/Scenes/JonScene.tscn index 7ef4bb1..0848a4e 100644 --- a/Scenes/JonScene.tscn +++ b/Scenes/JonScene.tscn @@ -76,204 +76,40 @@ shape = SubResource("BoxShape3D_24d3s") transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9.934778, 4.297072, -0.018813023) shape = SubResource("BoxShape3D_24d3s") -[node name="Table" parent="." unique_id=1863572470 instance=ExtResource("16_di04w")] -transform = Transform3D(-1, 0, 8.742277e-08, 0, 1, 0, -8.742277e-08, 0, -1, 4.371851, 0.9030438, 2.043332) +[node name="Stations" type="Node3D" parent="." unique_id=1739573685] -[node name="Hob" parent="." unique_id=1687971542 instance=ExtResource("4_ctden")] +[node name="Table" parent="Stations" unique_id=1863572470 instance=ExtResource("16_di04w")] +transform = Transform3D(-1, 0, 8.742277e-08, 0, 1, 0, -8.742277e-08, 0, -1, 3.4151285, 0.9030433, 0.57212543) + +[node name="Hob" parent="Stations" unique_id=1687971542 instance=ExtResource("4_ctden")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5104445, 0.50655985, -1.5450908) -[node name="Sink" parent="." unique_id=2055277359 instance=ExtResource("13_o1b3t")] +[node name="Sink" parent="Stations" unique_id=2055277359 instance=ExtResource("13_o1b3t")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5311285, 0.51461196, -1.5552641) -[node name="DirtStation" parent="." unique_id=160842153 instance=ExtResource("14_irf4n")] +[node name="DirtStation" parent="Stations" unique_id=160842153 instance=ExtResource("14_irf4n")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.3035586, 0.50655985, -1.3060378) -[node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("15_di04w")] +[node name="Counter" parent="Stations" unique_id=1487893288 instance=ExtResource("15_di04w")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.49541074, 0.5115016, -1.5497825) -[node name="Counter2" parent="." unique_id=368890752 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, -0.50697076) +[node name="Counter2" parent="Stations" unique_id=1518703529 instance=ExtResource("15_di04w")] +transform = Transform3D(1.3113416e-07, 0, 1, 0, 1, 0, -1, 0, 1.3113416e-07, -1.5505586, 0.5115016, -0.51693225) -[node name="Counter3" parent="." unique_id=1498817646 instance=ExtResource("15_di04w")] +[node name="Counter3" parent="Stations" unique_id=1498817646 instance=ExtResource("15_di04w")] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 0.49258912) -[node name="Counter4" parent="Counter3" unique_id=1748373996 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.0022283, 0, 1.1920929e-07) +[node name="Counter4" parent="Stations" unique_id=1748373996 instance=ExtResource("15_di04w")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, -1.5096391) -[node name="BurgerBunsDispenser" parent="." unique_id=1720683779 instance=ExtResource("9_sq0s2")] +[node name="BurgerBunsDispenser" parent="Stations" unique_id=1720683779 instance=ExtResource("9_sq0s2")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5069376, 0.008738995, 1.4692857) -[node name="RawBurgerDispenser" parent="." unique_id=235630131 instance=ExtResource("11_ctden")] +[node name="RawBurgerDispenser" parent="Stations" unique_id=235630131 instance=ExtResource("11_ctden")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.46601868, 0.008738995, 1.514677) -[node name="CubeSideDispenser2" parent="." unique_id=200950572 instance=ExtResource("12_57ppd")] +[node name="CubeSideDispenser2" parent="Stations" unique_id=200950572 instance=ExtResource("12_57ppd")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.48943835, 0.008738995, 1.5010021) -[node name="PlateDispenser" parent="." unique_id=710538846 instance=ExtResource("13_irf4n")] +[node name="PlateDispenser" parent="Stations" unique_id=710538846 instance=ExtResource("13_irf4n")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5185561, 0.008738995, 1.5010021) - -[node name="120pScale" type="Node3D" parent="." unique_id=391874704] -transform = Transform3D(1.2, 0, 0, 0, 1, 0, 0, 0, 1.2, 0, 0, -9.780844) - -[node name="Hob" parent="120pScale" unique_id=662730978 instance=ExtResource("4_ctden")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5104445, 0.50655985, 2.7905889) - -[node name="Sink" parent="120pScale" unique_id=1712283042 instance=ExtResource("13_o1b3t")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5311285, 0.51461196, 2.7804155) - -[node name="DirtStation" parent="120pScale" unique_id=2020221472 instance=ExtResource("14_irf4n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.3035586, 0.50655985, 3.0296416) - -[node name="Counter" parent="120pScale" unique_id=777536364 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.49541074, 0.5115016, 2.785897) - -[node name="Counter2" parent="120pScale" unique_id=176818776 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 3.8287086) - -[node name="Counter3" parent="120pScale" unique_id=1015688641 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 4.8282685) - -[node name="Counter4" parent="120pScale/Counter3" unique_id=173290755 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.0022283, 0, 1.1920929e-07) - -[node name="BurgerBunsDispenser" parent="120pScale" unique_id=417029530 instance=ExtResource("9_sq0s2")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5069376, 0.008738995, 5.804965) - -[node name="RawBurgerDispenser" parent="120pScale" unique_id=755472941 instance=ExtResource("11_ctden")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.46601868, 0.008738995, 5.8503566) - -[node name="CubeSideDispenser2" parent="120pScale" unique_id=1477835376 instance=ExtResource("12_57ppd")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.48943835, 0.008738995, 5.8366814) - -[node name="PlateDispenser" parent="120pScale" unique_id=1708099903 instance=ExtResource("13_irf4n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.4638411, 0.008738995, 5.8702817) - -[node name="Label3D" type="Label3D" parent="120pScale" unique_id=604601061] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -2.2435148, 2.335534, 4.6659527) -text = "120% -" -font_size = 46 - -[node name="80pScale" type="Node3D" parent="." unique_id=2061791473] -transform = Transform3D(0.8, 0, 0, 0, 1, 0, 0, 0, 0.8, 0, 0, 0.28955865) - -[node name="Hob" parent="80pScale" unique_id=1891403697 instance=ExtResource("4_ctden")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5104445, 0.50655985, 2.7905889) - -[node name="Sink" parent="80pScale" unique_id=333923291 instance=ExtResource("13_o1b3t")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5311285, 0.51461196, 2.7804155) - -[node name="DirtStation" parent="80pScale" unique_id=1288624896 instance=ExtResource("14_irf4n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.3035586, 0.50655985, 3.0296416) - -[node name="Counter" parent="80pScale" unique_id=1461535152 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.49541074, 0.5115016, 2.785897) - -[node name="Counter2" parent="80pScale" unique_id=1842130256 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 3.8287086) - -[node name="Counter3" parent="80pScale" unique_id=100608898 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 4.8282685) - -[node name="Counter4" parent="80pScale/Counter3" unique_id=205099411 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.0022283, 0, 1.1920929e-07) - -[node name="BurgerBunsDispenser" parent="80pScale" unique_id=1496193985 instance=ExtResource("9_sq0s2")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5069376, 0.008738995, 5.804965) - -[node name="RawBurgerDispenser" parent="80pScale" unique_id=612011076 instance=ExtResource("11_ctden")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.46601868, 0.008738995, 5.8503566) - -[node name="CubeSideDispenser2" parent="80pScale" unique_id=384901968 instance=ExtResource("12_57ppd")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.48943835, 0.008738995, 5.8366814) - -[node name="PlateDispenser" parent="80pScale" unique_id=1230329184 instance=ExtResource("13_irf4n")] -transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 1.518556, 0.008738995, 5.7869906) - -[node name="Label3D" type="Label3D" parent="80pScale" unique_id=941448791] -transform = Transform3D(-4.3711374e-08, 0, 0.99999964, 0, 1, 0, -0.99999964, 0, -4.3711374e-08, -2.1597714, 2.335534, 4.6659484) -text = "80% -" -font_size = 46 - -[node name="60pScale" type="Node3D" parent="." unique_id=1767900653] -transform = Transform3D(0.6, 0, 0, 0, 1, 0, 0, 0, 0.6, 0, 0, 3.9962738) - -[node name="Hob" parent="60pScale" unique_id=1110757850 instance=ExtResource("4_ctden")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5104445, 0.50655985, 2.7905889) - -[node name="Sink" parent="60pScale" unique_id=1692043650 instance=ExtResource("13_o1b3t")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5311285, 0.51461196, 2.7804155) - -[node name="DirtStation" parent="60pScale" unique_id=1095305719 instance=ExtResource("14_irf4n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.3035586, 0.50655985, 3.0296416) - -[node name="Counter" parent="60pScale" unique_id=482904015 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.49541074, 0.5115016, 2.785897) - -[node name="Counter2" parent="60pScale" unique_id=1339102916 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 3.8287086) - -[node name="Counter3" parent="60pScale" unique_id=112241594 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 4.8282685) - -[node name="Counter4" parent="60pScale/Counter3" unique_id=1565091496 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.0022283, 0, 1.1920929e-07) - -[node name="BurgerBunsDispenser" parent="60pScale" unique_id=533207183 instance=ExtResource("9_sq0s2")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5069376, 0.008738995, 5.804965) - -[node name="RawBurgerDispenser" parent="60pScale" unique_id=1003755733 instance=ExtResource("11_ctden")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.46601868, 0.008738995, 5.8503566) - -[node name="CubeSideDispenser2" parent="60pScale" unique_id=1167014983 instance=ExtResource("12_57ppd")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.48943835, 0.008738995, 5.8366814) - -[node name="PlateDispenser" parent="60pScale" unique_id=577890056 instance=ExtResource("13_irf4n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.4638411, 0.008738995, 5.8702817) - -[node name="Label3D" type="Label3D" parent="60pScale" unique_id=108085819] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.8827287, 2.335534, 4.665953) -text = "60%" -font_size = 46 - -[node name="50pScale" type="Node3D" parent="." unique_id=834529278] -transform = Transform3D(-0.5, 0, 7.54979e-08, 0, 1, 0, -7.54979e-08, 0, -0.5, 4.8798494, 0, 8.821305) - -[node name="Hob" parent="50pScale" unique_id=193607269 instance=ExtResource("4_ctden")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5104445, 0.50655985, 2.7905889) - -[node name="Sink" parent="50pScale" unique_id=1409032259 instance=ExtResource("13_o1b3t")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5311285, 0.51461196, 2.7804155) - -[node name="DirtStation" parent="50pScale" unique_id=1640346888 instance=ExtResource("14_irf4n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.3035586, 0.50655985, 3.0296416) - -[node name="Counter" parent="50pScale" unique_id=217653424 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.49541074, 0.5115016, 2.785897) - -[node name="Counter2" parent="50pScale" unique_id=33532645 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 3.8287086) - -[node name="Counter3" parent="50pScale" unique_id=195687577 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.5477214, 0.5115016, 4.8282685) - -[node name="Counter4" parent="50pScale/Counter3" unique_id=544361476 instance=ExtResource("15_di04w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.0022283, 0, 1.1920929e-07) - -[node name="BurgerBunsDispenser" parent="50pScale" unique_id=1491805771 instance=ExtResource("9_sq0s2")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5069376, 0.008738995, 5.804965) - -[node name="RawBurgerDispenser" parent="50pScale" unique_id=912918674 instance=ExtResource("11_ctden")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.46601868, 0.008738995, 5.8503566) - -[node name="CubeSideDispenser2" parent="50pScale" unique_id=1841444767 instance=ExtResource("12_57ppd")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.48943835, 0.008738995, 5.8366814) - -[node name="PlateDispenser" parent="50pScale" unique_id=1730806405 instance=ExtResource("13_irf4n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.4638411, 0.008738995, 5.8702817) - -[node name="Label3D" type="Label3D" parent="50pScale" unique_id=1266832827] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.2148323, 2.335534, 4.665949) -text = "50%" -font_size = 46 diff --git a/Stations/Counter.tscn b/Stations/Counter.tscn index 33714a0..0820948 100644 --- a/Stations/Counter.tscn +++ b/Stations/Counter.tscn @@ -1,12 +1,13 @@ [gd_scene format=3 uid="uid://efaec6ymgabo"] [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="1_dlkho"] +[ext_resource type="AudioStream" uid="uid://claw3d2wnyr6a" path="res://Sounds/220212__gameaudio__ping-bing.wav" id="2_0aadn"] [sub_resource type="BoxShape3D" id="BoxShape3D_24d3s"] size = Vector3(1, 1, 1.0517578) -[sub_resource type="SphereShape3D" id="SphereShape3D_dlkho"] -radius = 0.3 +[sub_resource type="BoxShape3D" id="BoxShape3D_1ntq7"] +size = Vector3(0.6, 0.12802735, 0.6) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_24d3s"] albedo_color = Color(0.49, 0.3854667, 0.29400003, 1) @@ -23,14 +24,15 @@ shape = SubResource("BoxShape3D_24d3s") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1647380272 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5608841, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("1_dlkho") +stash_sound = ExtResource("2_0aadn") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" [node name="CollisionShape3D2" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=969340130] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_dlkho") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.002, 0) +shape = SubResource("BoxShape3D_1ntq7") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=451757283] use_collision = true diff --git a/Stations/Hob.tscn b/Stations/Hob.tscn index d695c03..e455552 100644 --- a/Stations/Hob.tscn +++ b/Stations/Hob.tscn @@ -3,12 +3,11 @@ [ext_resource type="Script" uid="uid://bsn8vhv5adxdo" path="res://Stations/hob.gd" id="1_7jc4g"] [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="2_er1dp"] [ext_resource type="PackedScene" uid="uid://bxbocxdaayvwx" path="res://UI/progress_bar.tscn" id="3_7uuqv"] -[ext_resource type="Script" uid="uid://bv7oracwmgre8" path="res://UI/progress_bar_3d.gd" id="3_zz9kp"] [sub_resource type="BoxShape3D" id="BoxShape3D_kdxnr"] -[sub_resource type="SphereShape3D" id="SphereShape3D_vlqg6"] -radius = 0.3 +[sub_resource type="BoxShape3D" id="BoxShape3D_7uuqv"] +size = Vector3(0.6, 0.12802735, 0.6) [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_np_hob"] properties/0/path = NodePath(".:time_cooked") @@ -27,14 +26,14 @@ shape = SubResource("BoxShape3D_kdxnr") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=538157739] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5270121, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("2_er1dp") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" [node name="CollisionShape3D2" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=370920392] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_vlqg6") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.000975132, 0) +shape = SubResource("BoxShape3D_7uuqv") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=70901698] @@ -119,4 +118,3 @@ replication_config = SubResource("SceneReplicationConfig_np_hob") [node name="ProgressBar3D" parent="." unique_id=654673176 instance=ExtResource("3_7uuqv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.74736404, -0.09216304) -script = ExtResource("3_zz9kp") diff --git a/Stations/dirt_station.tscn b/Stations/dirt_station.tscn index 6587c79..97301df 100644 --- a/Stations/dirt_station.tscn +++ b/Stations/dirt_station.tscn @@ -33,7 +33,7 @@ text = "Dirt" [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=333161027 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5270121, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("2_v0ytd") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" diff --git a/Stations/sink.tscn b/Stations/sink.tscn index da99357..d85752c 100644 --- a/Stations/sink.tscn +++ b/Stations/sink.tscn @@ -4,10 +4,10 @@ [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="2_3ocod"] [ext_resource type="PackedScene" uid="uid://bxbocxdaayvwx" path="res://UI/progress_bar.tscn" id="4_1pinr"] -[sub_resource type="BoxShape3D" id="BoxShape3D_24d3s"] +[sub_resource type="BoxShape3D" id="BoxShape3D_l02yb"] -[sub_resource type="SphereShape3D" id="SphereShape3D_dlkho"] -radius = 0.3 +[sub_resource type="BoxShape3D" id="BoxShape3D_ai6d4"] +size = Vector3(0.6, 0.12802735, 0.6) [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_np_sink"] properties/0/path = NodePath(".:progress") @@ -18,19 +18,19 @@ properties/0/replication_mode = 1 script = ExtResource("1_7hh4b") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=964735164] -shape = SubResource("BoxShape3D_24d3s") +shape = SubResource("BoxShape3D_l02yb") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1762550988 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5163779, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("2_3ocod") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" [node name="CollisionShape3D2" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=860566355] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_dlkho") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.000975132, 0) +shape = SubResource("BoxShape3D_ai6d4") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=311064646] diff --git a/Stations/table.gd b/Stations/table.gd index 0577809..5d7d4aa 100644 --- a/Stations/table.gd +++ b/Stations/table.gd @@ -172,11 +172,9 @@ func _refresh_display() -> void: progress_bar.set_bar_visible(false) label_3d_time.text = "%.1f" % _state_time - print("_state_duration = ", _state_duration) progress_bar.set_progress(clampf(float(_state_time) / _state_duration, 0.0, 1.0)) - func _set_state(value: TableState) -> void: _state = value _refresh_display() diff --git a/Stations/table.tscn b/Stations/table.tscn index c76a42a..8ad9cce 100644 --- a/Stations/table.tscn +++ b/Stations/table.tscn @@ -7,7 +7,7 @@ [sub_resource type="BoxShape3D" id="BoxShape3D_24d3s"] [sub_resource type="SphereShape3D" id="SphereShape3D_dlkho"] -radius = 0.3 +radius = 0.6 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_24d3s"] albedo_color = Color(0.31, 0.21576, 0.1333, 1) @@ -32,7 +32,7 @@ shape = SubResource("BoxShape3D_24d3s") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1947858647 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.31874347, 0.5270121, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("1_8j1nt") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" @@ -44,7 +44,7 @@ shape = SubResource("SphereShape3D_dlkho") [node name="XRToolsSnapZone2" type="Area3D" parent="." unique_id=694448387 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.34755045, 0.5270121, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("1_8j1nt") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" @@ -56,7 +56,7 @@ shape = SubResource("SphereShape3D_dlkho") [node name="XRToolsSnapZone3" type="Area3D" parent="." unique_id=1734026785 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.012355864, 0.5270121, 0.33038777) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("1_8j1nt") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" @@ -68,7 +68,7 @@ shape = SubResource("SphereShape3D_dlkho") [node name="XRToolsSnapZone4" type="Area3D" parent="." unique_id=1358457948 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.022546828, 0.5270121, -0.36528283) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("1_8j1nt") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" diff --git a/UI/progress_bar_3d.gd b/UI/progress_bar_3d.gd index 6ed0966..93d99c8 100644 --- a/UI/progress_bar_3d.gd +++ b/UI/progress_bar_3d.gd @@ -14,7 +14,6 @@ func _ready() -> void: $Sprite3D.billboard = BaseMaterial3D.BillboardMode.BILLBOARD_FIXED_Y func set_progress(value: float) -> void: - print("ProgressBar set_progress: ", value) progress_bar.value = clamp(value, 0.0, 1.0) * 100 diff --git a/kanban_tasks_data.kanban b/kanban_tasks_data.kanban index 1e0e235..a3b3aed 100644 --- a/kanban_tasks_data.kanban +++ b/kanban_tasks_data.kanban @@ -17,7 +17,10 @@ "784d5cd3-333a-40a9-b35f-3d0c73f00761", "21bc19f1-ee3c-4bbb-ab9a-07ec6123a823", "d93a31cd-d475-4c5a-87fc-983174b2594f", - "9d7ecbc4-db2a-4d09-9f40-ceed3cf98c00" + "9d7ecbc4-db2a-4d09-9f40-ceed3cf98c00", + "0dd511cd-592c-4334-afd8-c511bd36b7d0", + "7883d015-f065-4b18-a2ab-e2a0daa9dc81", + "caf459e5-bb88-47dd-bf15-254a3d70c30f" ] }, { @@ -250,6 +253,27 @@ "description": "", "category": "bf4ec62e-526e-4027-876f-0b22bd17f79a", "steps": [] + }, + { + "uuid": "0dd511cd-592c-4334-afd8-c511bd36b7d0", + "title": "Plates should snap onto Meals in a station", + "description": "Trowing a plate onto a hamburger on a hob should result in a plated hamburger", + "category": "bf4ec62e-526e-4027-876f-0b22bd17f79a", + "steps": [] + }, + { + "uuid": "7883d015-f065-4b18-a2ab-e2a0daa9dc81", + "title": "Snap_zones should abosrb any item in range", + "description": "", + "category": "bf4ec62e-526e-4027-876f-0b22bd17f79a", + "steps": [] + }, + { + "uuid": "caf459e5-bb88-47dd-bf15-254a3d70c30f", + "title": "Station Snap_zones should cover the whole station", + "description": "", + "category": "bf4ec62e-526e-4027-876f-0b22bd17f79a", + "steps": [] } ], "layout": {