diff --git a/Scenes/mainMenu.tscn b/Scenes/mainMenu.tscn index 92cc787..5f1c25e 100644 --- a/Scenes/mainMenu.tscn +++ b/Scenes/mainMenu.tscn @@ -165,3 +165,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.7201865, 1.142413, 0.14773 [node name="Plate3" parent="." unique_id=2004250522 instance=ExtResource("8_l1owj")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5818124, 1.1085004, -0.4634577) + +[node name="WorldContent" type="Node3D" parent="." unique_id=1660879286] + +[node name="Players" type="Node3D" parent="." unique_id=494935131] diff --git a/Scenes/multiPlayer.tscn b/Scenes/multiPlayer.tscn index 6e471a8..ae2826a 100644 --- a/Scenes/multiPlayer.tscn +++ b/Scenes/multiPlayer.tscn @@ -7,6 +7,9 @@ [ext_resource type="Script" uid="uid://fyd2rjramhbb" path="res://prefabs/kitchen_instantiator.gd" id="6_pw2j5"] [ext_resource type="PackedScene" uid="uid://damrxtlt7uswf" path="res://content/station_layouts/small_line.tscn" id="7_0sjqq"] [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="8_0sjqq"] +[ext_resource type="PackedScene" uid="uid://dm70ynyuw1a5u" path="res://prefabs/day_controller.tscn" id="9_5wx0o"] +[ext_resource type="PackedScene" uid="uid://bnwb7imcotkod" path="res://prefabs/build_mode_controller.tscn" id="10_464r1"] +[ext_resource type="PackedScene" uid="uid://dxe05wp60jg3l" path="res://scenes/queue_controller.tscn" id="11_de1dy"] [ext_resource type="Script" uid="uid://biu4qr3nr1eny" path="res://test/mp_test_driver.gd" id="99_mptst"] [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] @@ -87,3 +90,10 @@ transform = Transform3D(1, 0, -1.7484555e-07, 0, 1, 0, 1.7484555e-07, 0, 1, 0, 0 script = ExtResource("6_pw2j5") kitchen_scene = ExtResource("7_0sjqq") hob_scene = ExtResource("8_0sjqq") + +[node name="DayController" parent="." unique_id=1418639156 instance=ExtResource("9_5wx0o")] + +[node name="BuildModeController" parent="." unique_id=552013109 instance=ExtResource("10_464r1")] + +[node name="QueueController" parent="." unique_id=326512876 instance=ExtResource("11_de1dy")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 7.2000003) diff --git a/Scenes/queue_controller.tscn b/Scenes/queue_controller.tscn new file mode 100644 index 0000000..bde858f --- /dev/null +++ b/Scenes/queue_controller.tscn @@ -0,0 +1,18 @@ +[gd_scene format=3 uid="uid://dxe05wp60jg3l"] + +[ext_resource type="Script" uid="uid://dww2icfivdsai" path="res://scenes/queue_controller.gd" id="1_ieivv"] +[ext_resource type="PackedScene" uid="uid://bxbocxdaayvwx" path="res://UI/progress_bar.tscn" id="2_fn3y7"] + +[node name="QueueController" type="Node3D" unique_id=326512876 node_paths=PackedStringArray("progress_bar_3d", "label_3d")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 0) +script = ExtResource("1_ieivv") +progress_bar_3d = NodePath("ProgressBar3D") +label_3d = NodePath("Label3D") + +[node name="ProgressBar3D" parent="." unique_id=654673176 instance=ExtResource("2_fn3y7")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 2.4, 0) +exponential = true + +[node name="Label3D" type="Label3D" parent="." unique_id=994715754] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.147749, 0) +text = "X customers in queue" diff --git a/Scenes/test_small.tscn b/Scenes/test_small.tscn index 7bf17a7..75d7e5c 100644 --- a/Scenes/test_small.tscn +++ b/Scenes/test_small.tscn @@ -14,8 +14,7 @@ [ext_resource type="PackedScene" uid="uid://xtcei2uvd5li" path="res://UI/game_over_panel.tscn" id="13_hooyg"] [ext_resource type="PackedScene" uid="uid://ck5tuftqmyiue" path="res://stations/plate_dispenser.tscn" id="14_bjwcu"] [ext_resource type="Script" uid="uid://cwijoksyou1ey" path="res://prefabs/GameOvercontroler.gd" id="14_cqmpj"] -[ext_resource type="Script" uid="uid://dww2icfivdsai" path="res://scenes/queue_controller.gd" id="15_cqmpj"] -[ext_resource type="PackedScene" uid="uid://bxbocxdaayvwx" path="res://UI/progress_bar.tscn" id="15_hooyg"] +[ext_resource type="PackedScene" uid="uid://dxe05wp60jg3l" path="res://scenes/queue_controller.tscn" id="15_cqmpj"] [ext_resource type="PackedScene" uid="uid://dm70ynyuw1a5u" path="res://prefabs/day_controller.tscn" id="17_bjwcu"] [sub_resource type="Environment" id="Environment_bvwq1"] @@ -66,6 +65,24 @@ spawn_path = NodePath("../WorldContent") _spawnable_scenes = PackedStringArray("res://Player/net_player.tscn") spawn_path = NodePath("../Players") +[node name="GameOverPanel" parent="." unique_id=522901881 instance=ExtResource("12_n58f2")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 2.7718225, 2.8122003, 1.8000003) +scene = ExtResource("13_hooyg") +viewport_size = Vector2(900, 600) +transparent = 0 +filter = false +scene_properties_keys = PackedStringArray("game_over_panel.gd") + +[node name="controler" type="Node" parent="GameOverPanel" unique_id=1442195864] +script = ExtResource("14_cqmpj") + +[node name="BuildModeController" parent="." unique_id=552013109 instance=ExtResource("9_hooyg")] + +[node name="QueueController" parent="." unique_id=326512876 instance=ExtResource("15_cqmpj")] +transform = Transform3D(-1, 0, -1.509958e-07, 0, 1, 0, 1.509958e-07, 0, -1, -1.2, 0, 4.8) + +[node name="DayController" parent="." unique_id=1418639156 instance=ExtResource("17_bjwcu")] + [node name="Floor" type="StaticBody3D" parent="." unique_id=122279514] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.05, 0) @@ -99,8 +116,6 @@ shape = SubResource("BoxShape3D_24d3s") [node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("7_jnxsa")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0) -[node name="BuildModeController" parent="." unique_id=552013109 instance=ExtResource("9_hooyg")] - [node name="Table" parent="." unique_id=1863572470 instance=ExtResource("11_gaw43")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8, 0, 1.8) @@ -110,17 +125,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8, 0, 2.4) [node name="Table3" parent="." unique_id=113648557 instance=ExtResource("11_gaw43")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8, 0, 3) -[node name="GameOverPanel" parent="." unique_id=522901881 instance=ExtResource("12_n58f2")] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 2.7718225, 2.8122003, 1.8000003) -scene = ExtResource("13_hooyg") -viewport_size = Vector2(900, 600) -transparent = 0 -filter = false -scene_properties_keys = PackedStringArray("game_over_panel.gd") - -[node name="controler" type="Node" parent="GameOverPanel" unique_id=1442195864] -script = ExtResource("14_cqmpj") - [node name="RawBurgerDispenser" parent="." unique_id=383615587 instance=ExtResource("12_hooyg")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 0, 0) @@ -129,19 +133,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.2, 0, 0) [node name="PlateDispenser" parent="." unique_id=53391541 instance=ExtResource("14_bjwcu")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8000001, 0, 0.6) - -[node name="QueueController" type="Node3D" parent="." unique_id=1490726434 node_paths=PackedStringArray("progress_bar_3d", "label_3d")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -1.2, 0, 4.8) -script = ExtResource("15_cqmpj") -progress_bar_3d = NodePath("ProgressBar3D") -label_3d = NodePath("Label3D") - -[node name="ProgressBar3D" parent="QueueController" unique_id=654673176 instance=ExtResource("15_hooyg")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 2.4, 0) -exponential = true - -[node name="Label3D" type="Label3D" parent="QueueController" unique_id=1060766769] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.147749, 0) -text = "X customers in queue" - -[node name="DayController" parent="." unique_id=1418639156 instance=ExtResource("17_bjwcu")] diff --git a/Stations/station_movement.gd b/Stations/station_movement.gd index 6df2148..b81d99f 100644 --- a/Stations/station_movement.gd +++ b/Stations/station_movement.gd @@ -1,3 +1,4 @@ +class_name StationMovement extends Node @export var move_handle: XRToolsPickable @@ -16,6 +17,7 @@ const GHOST_COLOR_INVALID: Color = Color(1, 0, 0, 0.35) func set_move_handle_enabled(enabled: bool) -> void: + print("StationMovement set_move_handle_enabled: ", enabled) move_handle.visible = enabled move_handle.enabled = enabled if enabled: diff --git a/content/station_layouts/small_line.tscn b/content/station_layouts/small_line.tscn index c544560..94552d2 100644 --- a/content/station_layouts/small_line.tscn +++ b/content/station_layouts/small_line.tscn @@ -7,10 +7,9 @@ [node name="SmallLine" type="Node3D" unique_id=1844128818] [node name="Hob" parent="." unique_id=1687971542 instance=ExtResource("1_1wuvq")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.42000002, 0) [node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("2_3qwcq")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0.42000002, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0) [node name="Sink" parent="." unique_id=2055277359 instance=ExtResource("3_3qwcq")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 0.42000002, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 0, 0)