diff --git a/Assets/Model/MainMenuObjects/dreieck.glb b/Assets/Model/MainMenuObjects/dreieck.glb new file mode 100644 index 0000000..c25ea9d Binary files /dev/null and b/Assets/Model/MainMenuObjects/dreieck.glb differ diff --git a/Assets/Model/MainMenuObjects/geodreieck.glb.import b/Assets/Model/MainMenuObjects/dreieck.glb.import similarity index 63% rename from Assets/Model/MainMenuObjects/geodreieck.glb.import rename to Assets/Model/MainMenuObjects/dreieck.glb.import index 5ab0a8f..d917037 100644 --- a/Assets/Model/MainMenuObjects/geodreieck.glb.import +++ b/Assets/Model/MainMenuObjects/dreieck.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://byt7ioadks813" -path="res://.godot/imported/geodreieck.glb-e684d1d1e32583a976e36ba7a2f7eaf7.scn" +uid="uid://dg82ywjh8sc0k" +path="res://.godot/imported/dreieck.glb-f93304e2cc44e7de091fa08a73cb21a5.scn" [deps] -source_file="res://Assets/Model/MainMenuObjects/geodreieck.glb" -dest_files=["res://.godot/imported/geodreieck.glb-e684d1d1e32583a976e36ba7a2f7eaf7.scn"] +source_file="res://Assets/Model/MainMenuObjects/dreieck.glb" +dest_files=["res://.godot/imported/dreieck.glb-f93304e2cc44e7de091fa08a73cb21a5.scn"] [params] diff --git a/Assets/Model/MainMenuObjects/geodreieck.glb b/Assets/Model/MainMenuObjects/geodreieck.glb deleted file mode 100644 index 191ce34..0000000 Binary files a/Assets/Model/MainMenuObjects/geodreieck.glb and /dev/null differ diff --git a/Assets/Model/MainMenuObjects/papierrolle flach.glb b/Assets/Model/MainMenuObjects/papierrolle flach.glb deleted file mode 100644 index da651e5..0000000 Binary files a/Assets/Model/MainMenuObjects/papierrolle flach.glb and /dev/null differ diff --git a/Assets/Model/MainMenuObjects/papierrolle_flach.glb b/Assets/Model/MainMenuObjects/papierrolle_flach.glb new file mode 100644 index 0000000..139d06a Binary files /dev/null and b/Assets/Model/MainMenuObjects/papierrolle_flach.glb differ diff --git a/Assets/Model/MainMenuObjects/papierrolle flach.glb.import b/Assets/Model/MainMenuObjects/papierrolle_flach.glb.import similarity index 62% rename from Assets/Model/MainMenuObjects/papierrolle flach.glb.import rename to Assets/Model/MainMenuObjects/papierrolle_flach.glb.import index f995cdf..a4fd6dd 100644 --- a/Assets/Model/MainMenuObjects/papierrolle flach.glb.import +++ b/Assets/Model/MainMenuObjects/papierrolle_flach.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://dj6e887lur0mb" -path="res://.godot/imported/papierrolle flach.glb-1b5a54b498af32986eb33862518a95bb.scn" +uid="uid://cfs0mfmyps1si" +path="res://.godot/imported/papierrolle_flach.glb-abc974b889385d697b184e0c176b2837.scn" [deps] -source_file="res://Assets/Model/MainMenuObjects/papierrolle flach.glb" -dest_files=["res://.godot/imported/papierrolle flach.glb-1b5a54b498af32986eb33862518a95bb.scn"] +source_file="res://Assets/Model/MainMenuObjects/papierrolle_flach.glb" +dest_files=["res://.godot/imported/papierrolle_flach.glb-abc974b889385d697b184e0c176b2837.scn"] [params] diff --git a/Assets/Model/MainMenuObjects/papierrolle knick.glb b/Assets/Model/MainMenuObjects/papierrolle_knick.glb similarity index 98% rename from Assets/Model/MainMenuObjects/papierrolle knick.glb rename to Assets/Model/MainMenuObjects/papierrolle_knick.glb index ec65ae6..2cc448d 100644 Binary files a/Assets/Model/MainMenuObjects/papierrolle knick.glb and b/Assets/Model/MainMenuObjects/papierrolle_knick.glb differ diff --git a/Assets/Model/MainMenuObjects/papierrolle knick.glb.import b/Assets/Model/MainMenuObjects/papierrolle_knick.glb.import similarity index 62% rename from Assets/Model/MainMenuObjects/papierrolle knick.glb.import rename to Assets/Model/MainMenuObjects/papierrolle_knick.glb.import index bef1bdd..43430c8 100644 --- a/Assets/Model/MainMenuObjects/papierrolle knick.glb.import +++ b/Assets/Model/MainMenuObjects/papierrolle_knick.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://q8evwxqmmlry" -path="res://.godot/imported/papierrolle knick.glb-e48c0ce10d817869e0c7adc92d0cf360.scn" +uid="uid://b6ftkalbyl77o" +path="res://.godot/imported/papierrolle_knick.glb-4dc8bf27e3609370c87b94657cc7bf18.scn" [deps] -source_file="res://Assets/Model/MainMenuObjects/papierrolle knick.glb" -dest_files=["res://.godot/imported/papierrolle knick.glb-e48c0ce10d817869e0c7adc92d0cf360.scn"] +source_file="res://Assets/Model/MainMenuObjects/papierrolle_knick.glb" +dest_files=["res://.godot/imported/papierrolle_knick.glb-4dc8bf27e3609370c87b94657cc7bf18.scn"] [params] diff --git a/Assets/Model/MainMenuObjects/zahnrad gross.glb b/Assets/Model/MainMenuObjects/zahnrad_gross.glb similarity index 65% rename from Assets/Model/MainMenuObjects/zahnrad gross.glb rename to Assets/Model/MainMenuObjects/zahnrad_gross.glb index 21ab39a..ace2145 100644 Binary files a/Assets/Model/MainMenuObjects/zahnrad gross.glb and b/Assets/Model/MainMenuObjects/zahnrad_gross.glb differ diff --git a/Assets/Model/MainMenuObjects/zahnrad gross.glb.import b/Assets/Model/MainMenuObjects/zahnrad_gross.glb.import similarity index 63% rename from Assets/Model/MainMenuObjects/zahnrad gross.glb.import rename to Assets/Model/MainMenuObjects/zahnrad_gross.glb.import index e6d5aa8..ac4f1fb 100644 --- a/Assets/Model/MainMenuObjects/zahnrad gross.glb.import +++ b/Assets/Model/MainMenuObjects/zahnrad_gross.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://bb2s75f7j1r01" -path="res://.godot/imported/zahnrad gross.glb-8bdd5dd2300c9854d8b395847f5483a8.scn" +uid="uid://dl5er7ybhbjx4" +path="res://.godot/imported/zahnrad_gross.glb-b642dd9342f8b34114f917bdcc6c8e3b.scn" [deps] -source_file="res://Assets/Model/MainMenuObjects/zahnrad gross.glb" -dest_files=["res://.godot/imported/zahnrad gross.glb-8bdd5dd2300c9854d8b395847f5483a8.scn"] +source_file="res://Assets/Model/MainMenuObjects/zahnrad_gross.glb" +dest_files=["res://.godot/imported/zahnrad_gross.glb-b642dd9342f8b34114f917bdcc6c8e3b.scn"] [params] diff --git a/Assets/Model/MainMenuObjects/zahnrad klein.glb b/Assets/Model/MainMenuObjects/zahnrad_klein.glb similarity index 62% rename from Assets/Model/MainMenuObjects/zahnrad klein.glb rename to Assets/Model/MainMenuObjects/zahnrad_klein.glb index 7a63b75..b5de148 100644 Binary files a/Assets/Model/MainMenuObjects/zahnrad klein.glb and b/Assets/Model/MainMenuObjects/zahnrad_klein.glb differ diff --git a/Assets/Model/MainMenuObjects/zahnrad klein.glb.import b/Assets/Model/MainMenuObjects/zahnrad_klein.glb.import similarity index 63% rename from Assets/Model/MainMenuObjects/zahnrad klein.glb.import rename to Assets/Model/MainMenuObjects/zahnrad_klein.glb.import index d9a1374..b56d745 100644 --- a/Assets/Model/MainMenuObjects/zahnrad klein.glb.import +++ b/Assets/Model/MainMenuObjects/zahnrad_klein.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://cjai3eplxe605" -path="res://.godot/imported/zahnrad klein.glb-523736bf5e0ee4423619688858e2bc63.scn" +uid="uid://dsj0fslwga5xl" +path="res://.godot/imported/zahnrad_klein.glb-bb427a376c78487e4530545f0de837d7.scn" [deps] -source_file="res://Assets/Model/MainMenuObjects/zahnrad klein.glb" -dest_files=["res://.godot/imported/zahnrad klein.glb-523736bf5e0ee4423619688858e2bc63.scn"] +source_file="res://Assets/Model/MainMenuObjects/zahnrad_klein.glb" +dest_files=["res://.godot/imported/zahnrad_klein.glb-bb427a376c78487e4530545f0de837d7.scn"] [params] diff --git a/Assets/Model/MainMenuObjects/zahnrad_mittel.glb b/Assets/Model/MainMenuObjects/zahnrad_mittel.glb new file mode 100644 index 0000000..8605b65 Binary files /dev/null and b/Assets/Model/MainMenuObjects/zahnrad_mittel.glb differ diff --git a/Assets/Model/MainMenuObjects/zahnrad_mittel.glb.import b/Assets/Model/MainMenuObjects/zahnrad_mittel.glb.import new file mode 100644 index 0000000..2b21cf1 --- /dev/null +++ b/Assets/Model/MainMenuObjects/zahnrad_mittel.glb.import @@ -0,0 +1,30 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://crg01h82ww1m6" +path="res://.godot/imported/zahnrad_mittel.glb-1e9f6bf8e3c051ba7a90756256766a74.scn" + +[deps] + +source_file="res://Assets/Model/MainMenuObjects/zahnrad_mittel.glb" +dest_files=["res://.godot/imported/zahnrad_mittel.glb-1e9f6bf8e3c051ba7a90756256766a74.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={} diff --git a/Nodes/MainMenu3D.tscn b/Nodes/MainMenu3D.tscn new file mode 100644 index 0000000..544e1bb --- /dev/null +++ b/Nodes/MainMenu3D.tscn @@ -0,0 +1,58 @@ +[gd_scene load_steps=13 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"] +[ext_resource type="PackedScene" uid="uid://c1xtm0rjm034k" path="res://Assets/Model/MainMenuObjects/hammer.glb" id="3_hh122"] +[ext_resource type="PackedScene" uid="uid://1gblistqsgi0" path="res://Assets/Model/MainMenuObjects/naegel.glb" id="4_ntrhn"] +[ext_resource type="PackedScene" uid="uid://b1ubp6objx25w" path="res://Assets/Model/MainMenuObjects/stift.glb" id="5_thrx4"] +[ext_resource type="PackedScene" uid="uid://dg82ywjh8sc0k" path="res://Assets/Model/MainMenuObjects/dreieck.glb" id="6_nj0l7"] +[ext_resource type="PackedScene" uid="uid://cfs0mfmyps1si" path="res://Assets/Model/MainMenuObjects/papierrolle_flach.glb" id="7_32tfv"] +[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="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="PackedScene" uid="uid://d2k8qu46g6ono" path="res://Assets/Model/MainMenuObjects/blueprint deko.glb" id="12_67wtp"] + +[node name="MainMenu3D" type="Node3D"] + +[node name="tischplatte" parent="." instance=ExtResource("1_x1eq8")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15) + +[node name="blueprint untergrund" parent="." instance=ExtResource("2_l7bb1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15) + +[node name="hammer" parent="." instance=ExtResource("3_hh122")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15) + +[node name="naegel" parent="." instance=ExtResource("4_ntrhn")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15) + +[node name="stift" parent="." instance=ExtResource("5_thrx4")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15) + +[node name="tischplatte2" parent="." instance=ExtResource("1_x1eq8")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15) + +[node name="dreieck" parent="." instance=ExtResource("6_nj0l7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.09993, 0.453593, 1.26143) + +[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) + +[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) + +[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) + +[node name="zahnrad_mittel" parent="." instance=ExtResource("11_lokvi")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.02981, 0.829658, 2.1212) + +[node name="blueprint deko" parent="." instance=ExtResource("12_67wtp")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -15) + +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(-1, 8.74228e-08, 3.82137e-15, 0, -4.37114e-08, 1, 8.74228e-08, 1, 4.37114e-08, 0, 8, 0) diff --git a/Nodes/UI.tscn b/Nodes/UI.tscn index 150be7f..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"] 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"]