From 68b6d4d1dcc9324d9c0c37cec847af63523aee41 Mon Sep 17 00:00:00 2001 From: JonShard Date: Wed, 29 Jul 2026 13:59:33 +0200 Subject: [PATCH] Add spawning kitchen after hosting --- Containers/plate.tscn | 2 +- Items/Charcoal.tscn | 2 +- Items/PickupCube.tscn | 2 +- Items/burger.tscn | 2 +- Items/burger_buns.tscn | 2 +- Items/cooked_burger.tscn | 2 +- Items/hamburger.tscn | 2 +- Net/stations_spawner.gd | 16 +++++++++++++ Net/stations_spawner.gd.uid | 1 + Scenes/jon_scene.tscn | 6 ++--- Scenes/main_menu.tscn | 6 +++-- Scenes/multiPlayer.tscn | 30 +++++++++++++++---------- Stations/BurgerBunsDispenser.tscn | 4 ++++ Stations/Counter.tscn | 4 +++- Stations/Hob.tscn | 11 +++++---- Stations/plate_dispenser.tscn | 4 ++++ Stations/raw_burger_dispenser.tscn | 4 ++++ Stations/sink.tscn | 11 +++++---- content/kitchen_layouts/small_line.tscn | 6 ++--- test/multi_player_test.tscn | 2 +- 20 files changed, 82 insertions(+), 37 deletions(-) create mode 100644 Net/stations_spawner.gd create mode 100644 Net/stations_spawner.gd.uid diff --git a/Containers/plate.tscn b/Containers/plate.tscn index 9cf0ad4..ee02ade 100644 --- a/Containers/plate.tscn +++ b/Containers/plate.tscn @@ -8,7 +8,7 @@ [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="4_dhtvl"] [ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="5_vlcpl"] [ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="6_el51w"] -[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" 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_kek77"] height = 0.0635376 diff --git a/Items/Charcoal.tscn b/Items/Charcoal.tscn index a0b4898..834fab1 100644 --- a/Items/Charcoal.tscn +++ b/Items/Charcoal.tscn @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://prefabs/food_item.tscn" id="7_mde49"] [ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://prefabs/combinable_item.tscn" id="8_wmrff"] [ext_resource type="PackedScene" uid="uid://b5ukku8i0hilb" path="res://prefabs/despawning_item.tscn" id="10_6ypk4"] -[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" 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_gkni8"] height = 0.1 diff --git a/Items/PickupCube.tscn b/Items/PickupCube.tscn index 22fe7ec..5ca02c0 100644 --- a/Items/PickupCube.tscn +++ b/Items/PickupCube.tscn @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://prefabs/combinable_item.tscn" id="7_bdp75"] [ext_resource type="PackedScene" uid="uid://b5ukku8i0hilb" path="res://prefabs/despawning_item.tscn" id="10_uygc5"] [ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://prefabs/food_item.tscn" id="11_vjw41"] -[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" 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="BoxShape3D" id="BoxShape3D_m1xbq"] size = Vector3(0.1, 0.1, 0.1) diff --git a/Items/burger.tscn b/Items/burger.tscn index e3f12e9..e1b8ab4 100644 --- a/Items/burger.tscn +++ b/Items/burger.tscn @@ -9,7 +9,7 @@ [ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="7_wqxjj"] [ext_resource type="PackedScene" uid="uid://b5ukku8i0hilb" path="res://prefabs/despawning_item.tscn" id="10_l4hsd"] [ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://prefabs/food_item.tscn" id="10_yxtxs"] -[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" 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_fco8w"] height = 0.0338974 diff --git a/Items/burger_buns.tscn b/Items/burger_buns.tscn index ffae78e..60212b3 100644 --- a/Items/burger_buns.tscn +++ b/Items/burger_buns.tscn @@ -9,7 +9,7 @@ [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="PackedScene" uid="uid://b5ukku8i0hilb" path="res://prefabs/despawning_item.tscn" id="10_46e7r"] -[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" 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 diff --git a/Items/cooked_burger.tscn b/Items/cooked_burger.tscn index 1539ce7..5db253d 100644 --- a/Items/cooked_burger.tscn +++ b/Items/cooked_burger.tscn @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://b5ukku8i0hilb" path="res://prefabs/despawning_item.tscn" id="10_6p8pj"] [ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://prefabs/combinable_item.tscn" id="10_ut7mg"] [ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://prefabs/food_item.tscn" id="10_zz42p"] -[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" 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_fco8w"] height = 0.04777527 diff --git a/Items/hamburger.tscn b/Items/hamburger.tscn index ffbbeb3..9ce00a4 100644 --- a/Items/hamburger.tscn +++ b/Items/hamburger.tscn @@ -7,7 +7,7 @@ [ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="5_cu6ps"] [ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="6_jq7iw"] [ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://prefabs/food_item.tscn" id="7_fn8yh"] -[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" path="res://Net/net_pickable.gd" id="8_f6bya"] +[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" path="res://net/net_pickable.gd" id="8_f6bya"] [ext_resource type="PackedScene" uid="uid://b5ukku8i0hilb" path="res://prefabs/despawning_item.tscn" id="9_4uadj"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_fco8w"] diff --git a/Net/stations_spawner.gd b/Net/stations_spawner.gd new file mode 100644 index 0000000..75f9eae --- /dev/null +++ b/Net/stations_spawner.gd @@ -0,0 +1,16 @@ +extends MultiplayerSpawner + + +@export var kitchen_scene: PackedScene + + + +func _ready() -> void: + if not kitchen_scene: + push_error("StationSpawner missing kitchen_scene") + if NetworkManager.is_server(): + + # Later we will do procedural generation here. + # For now we just load a scene. + var kitchen = kitchen_scene.instantiate() + get_node(spawn_path).add_child(kitchen) diff --git a/Net/stations_spawner.gd.uid b/Net/stations_spawner.gd.uid new file mode 100644 index 0000000..2c43dec --- /dev/null +++ b/Net/stations_spawner.gd.uid @@ -0,0 +1 @@ +uid://dw3bfum87xs55 diff --git a/Scenes/jon_scene.tscn b/Scenes/jon_scene.tscn index 6085fa7..143b60b 100644 --- a/Scenes/jon_scene.tscn +++ b/Scenes/jon_scene.tscn @@ -45,6 +45,9 @@ script = ExtResource("1_6gspb") [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250] environment = SubResource("Environment_bvwq1") +[node name="XROrigin3D" parent="." unique_id=2055526621 groups=["local_xr_origin"] instance=ExtResource("6_b4aof")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9667189, 0) + [node name="GameOverPanel" parent="." unique_id=1234658657 instance=ExtResource("3_8n1fs")] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -2.0281777, 2.8122003, 0) scene = ExtResource("4_6gspb") @@ -56,9 +59,6 @@ scene_properties_keys = PackedStringArray("game_over_panel.gd") [node name="controler" type="Node" parent="GameOverPanel" unique_id=803158176] script = ExtResource("5_qmys3") -[node name="XROrigin3D" parent="." unique_id=2055526621 groups=["local_xr_origin"] instance=ExtResource("6_b4aof")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9667189, 0) - [node name="WorldContent" type="Node3D" parent="." unique_id=262398468] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=1376644384] diff --git a/Scenes/main_menu.tscn b/Scenes/main_menu.tscn index 0ad570d..2e12523 100644 --- a/Scenes/main_menu.tscn +++ b/Scenes/main_menu.tscn @@ -10,6 +10,8 @@ [sub_resource type="Environment" id="Environment_bvwq1"] background_mode = 2 sky = ExtResource("2_rtw2f") +ambient_light_color = Color(1, 1, 1, 1) +ambient_light_sky_contribution = 0.49 reflected_light_source = 2 ssr_enabled = true ssao_enabled = true @@ -17,11 +19,11 @@ ssil_enabled = true sdfgi_enabled = true [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] -size = Vector3(115, 0.1, 15) +size = Vector3(50, 0.1, 50) [sub_resource type="BoxMesh" id="BoxMesh_24d3s"] material = ExtResource("6_oa1go") -size = Vector3(15, 0.1, 15) +size = Vector3(50, 0.1, 50) [node name="Main" type="Node3D" unique_id=1312265607] script = ExtResource("1_rtw2f") diff --git a/Scenes/multiPlayer.tscn b/Scenes/multiPlayer.tscn index 5cf3e39..3be6c96 100644 --- a/Scenes/multiPlayer.tscn +++ b/Scenes/multiPlayer.tscn @@ -4,6 +4,19 @@ [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/xr_origin.tscn" id="1_pjkx2"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="2_pjkx2"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="3_4vwpp"] +[ext_resource type="Script" uid="uid://dw3bfum87xs55" path="res://net/stations_spawner.gd" id="5_36d77"] +[ext_resource type="PackedScene" uid="uid://cey1s10v2xufq" path="res://content/kitchen_layouts/small_line.tscn" id="6_uvo4r"] + +[sub_resource type="Environment" id="Environment_uvo4r"] +background_mode = 2 +sky = ExtResource("3_4vwpp") +ambient_light_color = Color(1, 1, 1, 1) +ambient_light_sky_contribution = 0.89 +reflected_light_source = 2 +ssr_enabled = true +ssao_enabled = true +ssil_enabled = true +sdfgi_enabled = true [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] size = Vector3(15, 0.1, 15) @@ -15,18 +28,12 @@ size = Vector3(15, 0.1, 15) [sub_resource type="BoxShape3D" id="BoxShape3D_arao0"] size = Vector3(15, 20, 0.1) -[sub_resource type="Environment" id="Environment_bvwq1"] -background_mode = 2 -sky = ExtResource("3_4vwpp") -reflected_light_source = 2 -ssr_enabled = true -ssao_enabled = true -ssil_enabled = true -sdfgi_enabled = true - [node name="Main" type="Node3D" unique_id=1312265607] script = ExtResource("1_4vwpp") +[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250] +environment = SubResource("Environment_uvo4r") + [node name="XROrigin3D" parent="." unique_id=2055526621 groups=["local_xr_origin"] instance=ExtResource("1_pjkx2")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.36171648, 0, 0.81835127) @@ -61,9 +68,6 @@ shape = SubResource("BoxShape3D_arao0") transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 7.502467, 9.197384, -0.018813023) shape = SubResource("BoxShape3D_arao0") -[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250] -environment = SubResource("Environment_bvwq1") - [node name="PlayersSpawner" type="MultiplayerSpawner" parent="." unique_id=106645565] _spawnable_scenes = PackedStringArray("res://Player/net_player.tscn") spawn_path = NodePath("../Players") @@ -79,5 +83,7 @@ spawn_path = NodePath("../Items") [node name="StationsSpawner" type="MultiplayerSpawner" parent="." unique_id=240083159] _spawnable_scenes = PackedStringArray("uid://c6rift56ql3f8", "uid://efaec6ymgabo", "uid://bbg7dwsbxxh1t", "uid://cnjwtnhwh0i8q", "uid://j7caslh27nor", "uid://ck5tuftqmyiue", "uid://cwnwo4i28upap", "uid://dvrk268s7gkxh", "uid://caf0xanmxbshy") spawn_path = NodePath("../Stations") +script = ExtResource("5_36d77") +kitchen_scene = ExtResource("6_uvo4r") [node name="Stations" type="Node3D" parent="." unique_id=1991170324] diff --git a/Stations/BurgerBunsDispenser.tscn b/Stations/BurgerBunsDispenser.tscn index bc21b36..ddd5e97 100644 --- a/Stations/BurgerBunsDispenser.tscn +++ b/Stations/BurgerBunsDispenser.tscn @@ -9,6 +9,7 @@ radius = 0.3 [sub_resource type="CylinderShape3D" id="CylinderShape3D_24d3s"] +height = 1.0 radius = 0.3 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vlqg6"] @@ -30,6 +31,7 @@ metadata/_custom_type_script = "uid://cquqe4f1m1sw6" shape = SubResource("SphereShape3D_xmbo2") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1470079357] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("CylinderShape3D_24d3s") [node name="SlideOffDome" parent="." unique_id=1427609426 instance=ExtResource("4_rf1b2")] @@ -37,7 +39,9 @@ shape = SubResource("CylinderShape3D_24d3s") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=1746426494] [node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=858311379] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) radius = 0.3 +height = 1.0 sides = 32 [node name="CSGCombiner3DBuns" type="CSGCombiner3D" parent="CSGCombiner3D" unique_id=1459017790] diff --git a/Stations/Counter.tscn b/Stations/Counter.tscn index 7728b9b..b22f578 100644 --- a/Stations/Counter.tscn +++ b/Stations/Counter.tscn @@ -21,10 +21,11 @@ albedo_color = Color(1.1759251, 0.741115, 0.5692133, 1) [node name="Counter" type="StaticBody3D" unique_id=1487893288 groups=["station"]] [node name="CollisionShape3DCuttingBoard" type="CollisionShape3D" parent="." unique_id=706340473] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.49513447, 0) 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) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0560187, 0) collision_layer = 65536 collision_mask = 65540 script = ExtResource("1_dlkho") @@ -39,6 +40,7 @@ shape = SubResource("BoxShape3D_1ntq7") [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="XRToolsSnapZone" unique_id=1786831079] [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=451757283] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.49513447, 0) use_collision = true [node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D" unique_id=305755330] diff --git a/Stations/Hob.tscn b/Stations/Hob.tscn index 87bd63a..a73920d 100644 --- a/Stations/Hob.tscn +++ b/Stations/Hob.tscn @@ -13,7 +13,7 @@ [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="11_4me6o"] [ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="12_tlp5u"] [ext_resource type="Animation" uid="uid://d1xnpyc08njjx" path="res://addons/godot-xr-tools/hands/animations/right/Grip 4.res" id="13_vttml"] -[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" path="res://Net/net_pickable.gd" id="14_glc7b"] +[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" path="res://net/net_pickable.gd" id="14_glc7b"] [sub_resource type="BoxShape3D" id="BoxShape3D_kdxnr"] size = Vector3(0.6, 1, 0.6) @@ -208,10 +208,11 @@ properties/2/replication_mode = 1 script = ExtResource("1_34vy5") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1283846023] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50658906, 0) shape = SubResource("BoxShape3D_kdxnr") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=538157739 groups=["station"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5270121, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0336012, 0) collision_layer = 65536 collision_mask = 65540 script = ExtResource("2_xy5oe") @@ -227,6 +228,7 @@ shape = SubResource("BoxShape3D_7uuqv") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.022546828, -0.5270121, 0.36528283) [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=70901698] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50658906, 0) [node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1111505172] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.00894776) @@ -311,18 +313,19 @@ size = Vector3(0.55, 0.096, 0.14) replication_config = SubResource("SceneReplicationConfig_np_hob") [node name="ProgressBar3D" parent="." unique_id=654673176 instance=ExtResource("5_m4alr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.74736404, -0.09216304) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2539531, -0.09216304) [node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1525460719] libraries/ = SubResource("AnimationLibrary_ac5f3") [node name="OmniLight3D" type="OmniLight3D" parent="." unique_id=1618457623] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5053487, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0119377, 0) light_color = Color(1, 0.13725491, 0, 1) light_energy = 0.0 omni_range = 0.5 [node name="Movement" type="Node3D" parent="." unique_id=1818087979] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50658906, 0) script = ExtResource("7_tjce5") [node name="MoveHandle" type="RigidBody3D" parent="Movement" unique_id=1675596942 groups=["platalbe_item"]] diff --git a/Stations/plate_dispenser.tscn b/Stations/plate_dispenser.tscn index a0b945b..84b2825 100644 --- a/Stations/plate_dispenser.tscn +++ b/Stations/plate_dispenser.tscn @@ -9,6 +9,7 @@ radius = 0.3 [sub_resource type="CylinderShape3D" id="CylinderShape3D_24d3s"] +height = 1.0 radius = 0.3 [node name="PlateDispenser" type="StaticBody3D" unique_id=710538846] @@ -27,6 +28,7 @@ metadata/_custom_type_script = "uid://cquqe4f1m1sw6" shape = SubResource("SphereShape3D_xmbo2") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=831688237] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("CylinderShape3D_24d3s") [node name="SlideOffDome" parent="." unique_id=1427609426 instance=ExtResource("4_tfo2i")] @@ -35,7 +37,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.061363697, 0) [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=696108271] [node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=1339763385] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) radius = 0.3 +height = 1.0 sides = 32 [node name="Plates" type="Node3D" parent="." unique_id=1364909922] diff --git a/Stations/raw_burger_dispenser.tscn b/Stations/raw_burger_dispenser.tscn index 30ff7d5..e5b9ba3 100644 --- a/Stations/raw_burger_dispenser.tscn +++ b/Stations/raw_burger_dispenser.tscn @@ -10,6 +10,7 @@ radius = 0.3 [sub_resource type="CylinderShape3D" id="CylinderShape3D_24d3s"] +height = 1.0 radius = 0.3 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_di04w"] @@ -33,12 +34,15 @@ shape = SubResource("SphereShape3D_xmbo2") [node name="SlideOffDome" parent="." unique_id=1427609426 instance=ExtResource("5_mep2a")] [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=378049928] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("CylinderShape3D_24d3s") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=1275577257] [node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=1973748218] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50180435, 0) radius = 0.3 +height = 1.0 sides = 32 [node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=590219609] diff --git a/Stations/sink.tscn b/Stations/sink.tscn index 9d123c6..014730a 100644 --- a/Stations/sink.tscn +++ b/Stations/sink.tscn @@ -185,11 +185,11 @@ height = 0.04 script = ExtResource("1_7hh4b") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=964735164] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.019470215, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.4605298, 0) 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.44614658, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.92614657, 0) collision_layer = 65536 collision_mask = 65540 script = ExtResource("2_3ocod") @@ -204,6 +204,7 @@ shape = SubResource("BoxShape3D_ai6d4") [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="XRToolsSnapZone" unique_id=1926328538] [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=311064646] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.48000002, 0) [node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1147823280] size = Vector3(0.6, 1, 0.6) @@ -238,9 +239,10 @@ size = Vector3(1, 1.2053223, 0.352417) replication_config = SubResource("SceneReplicationConfig_np_sink") [node name="ProgressBar3D" parent="." unique_id=654673176 instance=ExtResource("4_1pinr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8164611, -0.035980098) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2964611, -0.035980098) [node name="bubbles" type="CSGCombiner3D" parent="." unique_id=1624244242] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.48000002, 0) visible = false [node name="CSGSphere3D" type="CSGSphere3D" parent="bubbles" unique_id=1363004819] @@ -259,6 +261,7 @@ radius = 0.08 material = SubResource("StandardMaterial3D_0gbf8") [node name="water" type="CSGCombiner3D" parent="." unique_id=1050686091] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.48000002, 0) visible = false [node name="CSGBox3D" type="CSGBox3D" parent="water" unique_id=1224655006] @@ -273,7 +276,7 @@ libraries/ = SubResource("AnimationLibrary_u2x8c") stream = SubResource("AudioStreamWAV_ai6d4") [node name="GPUParticles3D" type="GPUParticles3D" parent="." unique_id=1688415718] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0002603531, 0.6479259, -0.03759767) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0002603531, 1.1279259, -0.03759767) visible = false process_material = SubResource("ParticleProcessMaterial_hrheb") draw_pass_1 = SubResource("SphereMesh_bvwq1") diff --git a/content/kitchen_layouts/small_line.tscn b/content/kitchen_layouts/small_line.tscn index 4bad21a..52c74fd 100644 --- a/content/kitchen_layouts/small_line.tscn +++ b/content/kitchen_layouts/small_line.tscn @@ -18,10 +18,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.2, 0, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 0, 0) [node name="RawBurgerDispenser" parent="." unique_id=235630131 instance=ExtResource("4_drmjc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.2, -0.48000002, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.2, 0, 0) [node name="BurgerBunsDispenser" parent="." unique_id=1720683779 instance=ExtResource("5_ad3hj")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, -0.48000002, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0) [node name="PlateDispenser" parent="." unique_id=710538846 instance=ExtResource("6_rsv28")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8000001, -0.48000002, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8, 0, 0) diff --git a/test/multi_player_test.tscn b/test/multi_player_test.tscn index cf015ad..df18088 100644 --- a/test/multi_player_test.tscn +++ b/test/multi_player_test.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bodj8op527o2c"] -[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://Net/DEPRICATED_multiplayer_world.gd" id="1_6uucx"] +[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://net/DEPRICATED_multiplayer_world.gd" id="1_6uucx"] [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/xr_origin.tscn" id="2_j7vd1"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_ssbaf"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="4_081u3"]