diff --git a/Nodes/MainMenu3D.tscn b/Nodes/MainMenu3D.tscn index 7e535cb..518bc86 100644 --- a/Nodes/MainMenu3D.tscn +++ b/Nodes/MainMenu3D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://c4njs3xp5s582"] +[gd_scene load_steps=18 format=3 uid="uid://c4njs3xp5s582"] [ext_resource type="PackedScene" uid="uid://bn42ap8pnv34r" path="res://Assets/Model/MainMenuObjects/tischplatte.glb" id="1_x1eq8"] [ext_resource type="PackedScene" uid="uid://fpl3qyhc3e6m" path="res://Assets/Model/MainMenuObjects/blueprint untergrund.glb" id="2_l7bb1"] @@ -10,8 +10,10 @@ [ext_resource type="Script" path="res://scripts/3DUI/dreieck.gd" id="7_jf0cx"] [ext_resource type="PackedScene" uid="uid://b6ftkalbyl77o" path="res://Assets/Model/MainMenuObjects/papierrolle_knick.glb" id="8_dcfhc"] [ext_resource type="PackedScene" uid="uid://dl5er7ybhbjx4" path="res://Assets/Model/MainMenuObjects/zahnrad_gross.glb" id="9_040k3"] +[ext_resource type="Script" path="res://scripts/3DUI/papierrolle_flach.gd" id="9_p50rx"] [ext_resource type="PackedScene" uid="uid://dsj0fslwga5xl" path="res://Assets/Model/MainMenuObjects/zahnrad_klein.glb" id="10_4uhdl"] [ext_resource type="PackedScene" uid="uid://crg01h82ww1m6" path="res://Assets/Model/MainMenuObjects/zahnrad_mittel.glb" id="11_lokvi"] +[ext_resource type="Script" path="res://scripts/3DUI/zahnrad_gross.gd" id="12_4r7f2"] [ext_resource type="PackedScene" uid="uid://d2k8qu46g6ono" path="res://Assets/Model/MainMenuObjects/blueprint deko.glb" id="12_67wtp"] [ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="13_smxpv"] [ext_resource type="PackedScene" uid="uid://dhe41jox6id7r" path="res://Assets/Model/MainMenuObjects/bild_deko.glb" id="14_gbsgf"] @@ -48,12 +50,26 @@ polygon = PackedVector2Array(0.351274, -1.7499, -1.21959, 0.121159, 0.67798, 1.7 [node name="papierrolle_flach" parent="." instance=ExtResource("7_32tfv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.597003, 0.758382, -5.10524) +script = ExtResource("9_p50rx") + +[node name="Area3D" type="Area3D" parent="papierrolle_flach"] + +[node name="CollisionPolygon3D" type="CollisionPolygon3D" parent="papierrolle_flach/Area3D"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0) +polygon = PackedVector2Array(-2.45033, 2.48997, 0.151118, 3.31404, 1.73134, -2.91213, -0.868115, -3.33871) [node name="papierrolle_knick" parent="." instance=ExtResource("8_dcfhc")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.597003, 0.758382, -5.10524) [node name="zahnrad_gross" parent="." instance=ExtResource("9_040k3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.05736, 0.693096, 2.90686) +script = ExtResource("12_4r7f2") + +[node name="Area3D" type="Area3D" parent="zahnrad_gross"] + +[node name="CollisionPolygon3D" type="CollisionPolygon3D" parent="zahnrad_gross/Area3D"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 1, 0) +polygon = PackedVector2Array(-2.08972, -0.0469587, -1.73058, 0.0074904, -1.61429, 0.645974, -1.94789, 0.907681, -1.53382, 1.44804, -1.25564, 1.2367, -0.685201, 1.5693, -0.763029, 1.96162, -0.126001, 2.07284, -0.046989, 1.72112, 0.542226, 1.59, 0.795306, 1.90754, 1.32931, 1.55868, 1.14761, 1.18218, 1.4431, 0.734762, 1.96323, 0.743827, 2.05819, 0.383583, 2.08658, 0.244645, 2.34483, 0.188311, 2.47015, 0.306479, 2.76657, 0.167788, 2.67084, -0.0487282, 2.78537, -0.29579, 3.05219, -0.33612, 3.07458, -0.67794, 2.86192, -0.728558, 2.80197, -1.10857, 2.93608, -1.24247, 2.74082, -1.52916, 2.54035, -1.44206, 2.25035, -1.63663, 2.29233, -1.86529, 1.92476, -1.93575, 1.90737, -1.69968, 1.59995, -1.65818, 1.44884, -1.82434, 1.17078, -1.61312, 1.24312, -1.36342, 1.072, -1.10657, 0.671417, -1.46851, 0.684042, -1.86693, 0.0619359, -2.02743, -0.119753, -2.40391, 0.0759897, -2.65333, 0.0984111, -2.99516, -0.147246, -3.33727, -0.492687, -3.48152, -0.878954, -3.35652, -1.13512, -2.95099, -1.042, -2.54753, -0.569996, -2.24451, -0.289488, -2.37457, -0.0158706, -1.63521, -0.64685, -1.54361, -0.891336, -1.84516, -1.40084, -1.48902, -1.24612, -1.20108, -1.56272, -0.639316, -1.94525, -0.660589) [node name="zahnrad_klein" parent="." instance=ExtResource("10_4uhdl")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.50923, 0.693096, -0.103418) @@ -73,3 +89,5 @@ transform = Transform3D(-1, 8.74228e-08, 3.82137e-15, 0, -4.37114e-08, 1, 8.7422 transform = Transform3D(-0.841511, 0, -0.54024, 0, 1, 0, 0.54024, 0, -0.841511, 8.97174, 0.481874, -0.545207) [connection signal="input_event" from="dreieck/Area3D" to="dreieck" method="_on_area_3d_input_event"] +[connection signal="input_event" from="papierrolle_flach/Area3D" to="papierrolle_flach" method="_on_area_3d_input_event"] +[connection signal="input_event" from="zahnrad_gross/Area3D" to="zahnrad_gross" method="_on_area_3d_input_event"] diff --git a/Nodes/UI.tscn b/Nodes/UI.tscn index 2a4ecc7..b9835a6 100644 --- a/Nodes/UI.tscn +++ b/Nodes/UI.tscn @@ -2,7 +2,7 @@ [ext_resource type="Texture2D" uid="uid://b8rsm7uapp583" path="res://undefined - Imgur (1).png" id="1_cb7ct"] [ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="2_udann"] -[ext_resource type="PackedScene" uid="uid://dgr3cta6n1tg3" path="res://menu/stats_player_1.tscn" id="3_yhsvf"] +[ext_resource type="PackedScene" path="res://menu/stats_player_1.tscn" id="3_yhsvf"] [ext_resource type="PackedScene" path="res://menu/stats_player_2.tscn" id="4_c4m18"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_fir3c"] @@ -23,7 +23,6 @@ size_flags_horizontal = 4 [node name="Panel" type="Panel" parent="."] custom_minimum_size = Vector2(15, 0) -layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -32,7 +31,6 @@ grow_horizontal = 2 grow_vertical = 2 [node name="VSlider" type="VSlider" parent="."] -layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -50,7 +48,6 @@ editable = false scrollable = false [node name="VSlider2" type="VSlider" parent="."] -layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -68,20 +65,18 @@ editable = false scrollable = false [node name="Control" type="Control" parent="."] -layout_mode = 1 +layout_mode = 3 anchors_preset = 0 offset_left = -579.0 offset_right = 575.0 offset_bottom = 649.0 [node name="Stats_Player1" parent="Control" instance=ExtResource("3_yhsvf")] -layout_mode = 1 offset_right = 345.0 offset_bottom = -288.0 scale = Vector2(0.6, 0.6) [node name="Stats_Player2" parent="Control" instance=ExtResource("4_c4m18")] -layout_mode = 1 offset_left = -187.0 offset_right = 125.0 scale = Vector2(0.6, 0.6) diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 2f345ff..88ecf88 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"] -[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] +[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"] [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"] [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] diff --git a/scripts/3DUI/dreieck.gd b/scripts/3DUI/dreieck.gd index 733a459..88a7ff2 100644 --- a/scripts/3DUI/dreieck.gd +++ b/scripts/3DUI/dreieck.gd @@ -4,4 +4,5 @@ func _on_area_3d_input_event(camera, event, position, normal, shape_idx): if event is InputEventMouseButton: if event.button_index == MOUSE_BUTTON_LEFT and event.pressed == true: print("Start Game") + get_tree().change_scene_to_file("res://Nodes/game.tscn") diff --git a/scripts/3DUI/papierrolle_flach.gd b/scripts/3DUI/papierrolle_flach.gd new file mode 100644 index 0000000..165fde0 --- /dev/null +++ b/scripts/3DUI/papierrolle_flach.gd @@ -0,0 +1,10 @@ +extends Node3D + + +func _on_area_3d_input_event(camera, event, position, normal, shape_idx): + if event is InputEventMouseButton: + if event.button_index == MOUSE_BUTTON_LEFT and event.pressed == true: + print("Credits/Spielbeschreibung") + #TODO: Richtige Szene Einfügen + get_tree().change_scene_to_file("res://Nodes/game.tscn") + diff --git a/scripts/3DUI/zahnrad_gross.gd b/scripts/3DUI/zahnrad_gross.gd new file mode 100644 index 0000000..b5f8744 --- /dev/null +++ b/scripts/3DUI/zahnrad_gross.gd @@ -0,0 +1,10 @@ +extends Node3D + + +func _on_area_3d_input_event(camera, event, position, normal, shape_idx): + if event is InputEventMouseButton: + if event.button_index == MOUSE_BUTTON_LEFT and event.pressed == true: + print("Settings") + #TODO: Settings: + get_tree().change_scene_to_file("res://Nodes/game.tscn") +