diff --git a/Assets/Model/MainMenuObjects/zahnrad_klein.gd b/Assets/Model/MainMenuObjects/zahnrad_klein.gd new file mode 100644 index 0000000..dbbe4d0 --- /dev/null +++ b/Assets/Model/MainMenuObjects/zahnrad_klein.gd @@ -0,0 +1,13 @@ +extends Node3D + + + + + + + +var speed := 2.0 + +func _process(delta): + rotate(Vector3(0,1,0),delta * speed) + print(rotation.y) diff --git a/Assets/Textures/Font/Opera_senza_titolo-3.png b/Assets/Textures/Font/Opera_senza_titolo-3.png new file mode 100644 index 0000000..7cbe248 Binary files /dev/null and b/Assets/Textures/Font/Opera_senza_titolo-3.png differ diff --git a/Assets/Textures/Font/Opera_senza_titolo-3.png.import b/Assets/Textures/Font/Opera_senza_titolo-3.png.import new file mode 100644 index 0000000..62f2671 --- /dev/null +++ b/Assets/Textures/Font/Opera_senza_titolo-3.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bvs2d1ed47gpg" +path.s3tc="res://.godot/imported/Opera_senza_titolo-3.png-830dd687a73746be85ee47be727a141c.s3tc.ctex" +path.etc2="res://.godot/imported/Opera_senza_titolo-3.png-830dd687a73746be85ee47be727a141c.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Font/Opera_senza_titolo-3.png" +dest_files=["res://.godot/imported/Opera_senza_titolo-3.png-830dd687a73746be85ee47be727a141c.s3tc.ctex", "res://.godot/imported/Opera_senza_titolo-3.png-830dd687a73746be85ee47be727a141c.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/Assets/Textures/Font/Opera_senza_titolo.png b/Assets/Textures/Font/Opera_senza_titolo.png new file mode 100644 index 0000000..bc0193b Binary files /dev/null and b/Assets/Textures/Font/Opera_senza_titolo.png differ diff --git a/Assets/Textures/Font/Opera_senza_titolo.png.import b/Assets/Textures/Font/Opera_senza_titolo.png.import new file mode 100644 index 0000000..b824ed4 --- /dev/null +++ b/Assets/Textures/Font/Opera_senza_titolo.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bb32ohgxsjd4h" +path.s3tc="res://.godot/imported/Opera_senza_titolo.png-e38769f74f6ec3b3af52ad447b5f0b95.s3tc.ctex" +path.etc2="res://.godot/imported/Opera_senza_titolo.png-e38769f74f6ec3b3af52ad447b5f0b95.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Font/Opera_senza_titolo.png" +dest_files=["res://.godot/imported/Opera_senza_titolo.png-e38769f74f6ec3b3af52ad447b5f0b95.s3tc.ctex", "res://.godot/imported/Opera_senza_titolo.png-e38769f74f6ec3b3af52ad447b5f0b95.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/Assets/Textures/Font/credits.png b/Assets/Textures/Font/credits.png new file mode 100644 index 0000000..9f0ac16 Binary files /dev/null and b/Assets/Textures/Font/credits.png differ diff --git a/Assets/Textures/Font/credits.png.import b/Assets/Textures/Font/credits.png.import new file mode 100644 index 0000000..6ad856c --- /dev/null +++ b/Assets/Textures/Font/credits.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dy85j2wm08enl" +path.s3tc="res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.s3tc.ctex" +path.etc2="res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Font/credits.png" +dest_files=["res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.s3tc.ctex", "res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/Assets/Textures/Font/rail_menu.glb b/Assets/Textures/Font/rail_menu.glb new file mode 100644 index 0000000..d5e339b Binary files /dev/null and b/Assets/Textures/Font/rail_menu.glb differ diff --git a/Assets/Textures/Font/rail_menu.glb.import b/Assets/Textures/Font/rail_menu.glb.import new file mode 100644 index 0000000..5e80006 --- /dev/null +++ b/Assets/Textures/Font/rail_menu.glb.import @@ -0,0 +1,30 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://d1xca1jqq0nyv" +path="res://.godot/imported/rail_menu.glb-9387fdc190d15b559664a02e20b7a36f.scn" + +[deps] + +source_file="res://Assets/Textures/Font/rail_menu.glb" +dest_files=["res://.godot/imported/rail_menu.glb-9387fdc190d15b559664a02e20b7a36f.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/Assets/Textures/Font/settings.png b/Assets/Textures/Font/settings.png new file mode 100644 index 0000000..c2402dc Binary files /dev/null and b/Assets/Textures/Font/settings.png differ diff --git a/Assets/Textures/Font/settings.png.import b/Assets/Textures/Font/settings.png.import new file mode 100644 index 0000000..4b49933 --- /dev/null +++ b/Assets/Textures/Font/settings.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://60i5abp5yobu" +path.s3tc="res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.s3tc.ctex" +path.etc2="res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Font/settings.png" +dest_files=["res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.s3tc.ctex", "res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/Assets/Textures/Font/titolo.png b/Assets/Textures/Font/titolo.png new file mode 100644 index 0000000..2dd26bc Binary files /dev/null and b/Assets/Textures/Font/titolo.png differ diff --git a/Assets/Textures/Font/titolo.png.import b/Assets/Textures/Font/titolo.png.import new file mode 100644 index 0000000..208701f --- /dev/null +++ b/Assets/Textures/Font/titolo.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://1gpuhu61xah1" +path.s3tc="res://.godot/imported/titolo.png-827539b76537f287f793637005cd7279.s3tc.ctex" +path.etc2="res://.godot/imported/titolo.png-827539b76537f287f793637005cd7279.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Font/titolo.png" +dest_files=["res://.godot/imported/titolo.png-827539b76537f287f793637005cd7279.s3tc.ctex", "res://.godot/imported/titolo.png-827539b76537f287f793637005cd7279.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/Assets/Textures/Sand/M_Sand.tres b/Assets/Textures/Sand/M_Sand.tres new file mode 100644 index 0000000..650d1c8 --- /dev/null +++ b/Assets/Textures/Sand/M_Sand.tres @@ -0,0 +1,9 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://b27870gqxnuai"] + +[ext_resource type="Texture2D" uid="uid://c2ptxav0ud0kg" path="res://Assets/Textures/Sand/Sand_Diffuse.png" id="1_vwott"] +[ext_resource type="Texture2D" uid="uid://fmqytawg0uli" path="res://Assets/Textures/Sand/Sand_Normal.png" id="2_clsr1"] + +[resource] +albedo_texture = ExtResource("1_vwott") +normal_enabled = true +normal_texture = ExtResource("2_clsr1") diff --git a/Assets/Textures/Sand/Sand_Diffuse.png b/Assets/Textures/Sand/Sand_Diffuse.png new file mode 100644 index 0000000..3d39528 Binary files /dev/null and b/Assets/Textures/Sand/Sand_Diffuse.png differ diff --git a/Assets/Textures/Sand/Sand_Diffuse.png.import b/Assets/Textures/Sand/Sand_Diffuse.png.import new file mode 100644 index 0000000..0e48977 --- /dev/null +++ b/Assets/Textures/Sand/Sand_Diffuse.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c2ptxav0ud0kg" +path.s3tc="res://.godot/imported/Sand_Diffuse.png-fdd04e698dd70afdba9d8f6a5393d016.s3tc.ctex" +path.etc2="res://.godot/imported/Sand_Diffuse.png-fdd04e698dd70afdba9d8f6a5393d016.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Sand/Sand_Diffuse.png" +dest_files=["res://.godot/imported/Sand_Diffuse.png-fdd04e698dd70afdba9d8f6a5393d016.s3tc.ctex", "res://.godot/imported/Sand_Diffuse.png-fdd04e698dd70afdba9d8f6a5393d016.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/Assets/Textures/Sand/Sand_Normal.png b/Assets/Textures/Sand/Sand_Normal.png new file mode 100644 index 0000000..e8c719a Binary files /dev/null and b/Assets/Textures/Sand/Sand_Normal.png differ diff --git a/Assets/Textures/Sand/Sand_Normal.png.import b/Assets/Textures/Sand/Sand_Normal.png.import new file mode 100644 index 0000000..c167e1a --- /dev/null +++ b/Assets/Textures/Sand/Sand_Normal.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://fmqytawg0uli" +path.s3tc="res://.godot/imported/Sand_Normal.png-e45c8125450c4cdc9833015bb7753711.s3tc.ctex" +path.etc2="res://.godot/imported/Sand_Normal.png-e45c8125450c4cdc9833015bb7753711.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Sand/Sand_Normal.png" +dest_files=["res://.godot/imported/Sand_Normal.png-e45c8125450c4cdc9833015bb7753711.s3tc.ctex", "res://.godot/imported/Sand_Normal.png-e45c8125450c4cdc9833015bb7753711.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://Assets/Textures/Sand/Sand_Normal.png" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/Nodes/MainMenu3D.tscn b/Nodes/MainMenu3D.tscn index 91898ef..483c555 100644 --- a/Nodes/MainMenu3D.tscn +++ b/Nodes/MainMenu3D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://c4njs3xp5s582"] +[gd_scene load_steps=22 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"] @@ -9,14 +9,18 @@ [ext_resource type="PackedScene" uid="uid://cfs0mfmyps1si" path="res://Assets/Model/MainMenuObjects/papierrolle_flach.glb" id="7_32tfv"] [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="Texture2D" uid="uid://bvs2d1ed47gpg" path="res://Assets/Textures/Font/Opera_senza_titolo-3.png" id="8_scw7v"] [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="Texture2D" uid="uid://dy85j2wm08enl" path="res://Assets/Textures/Font/credits.png" id="11_07r0e"] [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"] [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"] [ext_resource type="Script" path="res://scripts/3DUI/zahnraeder.gd" id="14_o12ah"] +[ext_resource type="Texture2D" uid="uid://60i5abp5yobu" path="res://Assets/Textures/Font/settings.png" id="19_go7mp"] +[ext_resource type="Texture2D" uid="uid://1gpuhu61xah1" path="res://Assets/Textures/Font/titolo.png" id="21_qybk8"] [node name="MainMenu3D" type="Node3D"] @@ -48,6 +52,10 @@ script = ExtResource("7_jf0cx") transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0) polygon = PackedVector2Array(0.351274, -1.7499, -1.21959, 0.121159, 0.67798, 1.71333) +[node name="play" type="Sprite3D" parent="dreieck"] +transform = Transform3D(-0.5, 7.54979e-08, 3.30012e-15, 0, -2.18557e-08, 0.5, 7.54979e-08, 0.5, 2.18557e-08, -3.14193, 0, 0) +texture = ExtResource("8_scw7v") + [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") @@ -58,6 +66,10 @@ script = ExtResource("9_p50rx") 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="tutorial" type="Sprite3D" parent="papierrolle_flach"] +transform = Transform3D(-0.4, 6.03983e-08, 2.64009e-15, 0, -1.74846e-08, 0.4, 6.03983e-08, 0.4, 1.74846e-08, 0, 0, 3.93247) +texture = ExtResource("11_07r0e") + [node name="papierrolle_knick" parent="." instance=ExtResource("8_dcfhc")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.37086, 0.984295, -5.84062) @@ -91,6 +103,14 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.438931, 0, -2.77826) [node name="zahnrad_mittel" parent="zahnraeder" instance=ExtResource("11_lokvi")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.90855, 0.23831, -0.686673) +[node name="settings" type="Sprite3D" parent="zahnraeder"] +transform = Transform3D(-0.5, 7.54979e-08, 3.30012e-15, 0, -2.18557e-08, 0.5, 7.54979e-08, 0.5, 2.18557e-08, 5.89407, 0, -0.414213) +texture = ExtResource("19_go7mp") + +[node name="Sprite3D" type="Sprite3D" parent="."] +transform = Transform3D(-1, 1.50996e-07, 6.60024e-15, 0, -4.37114e-08, 1, 1.50996e-07, 1, 4.37114e-08, 2.2, 0.44, 4.107) +texture = ExtResource("21_qybk8") + [connection signal="input_event" from="dreieck/Area3D" to="dreieck" method="_on_area_3d_input_event"] [connection signal="mouse_exited" from="dreieck/Area3D" to="dreieck" method="_on_area_3d_mouse_exited"] [connection signal="input_event" from="papierrolle_flach/Area3D" to="papierrolle_flach" method="_on_area_3d_input_event"] diff --git a/Nodes/UI.tscn b/Nodes/UI.tscn index 939d35e..db1cb05 100644 --- a/Nodes/UI.tscn +++ b/Nodes/UI.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://Nodes/UI.gd" id="1_dxr24"] [ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="2_udann"] [ext_resource type="Texture2D" uid="uid://cxfybbp5idjwg" path="res://o_idle1.png" id="3_segqn"] -[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"] [ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_uiyin"] @@ -31,7 +31,6 @@ script = ExtResource("1_dxr24") [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 @@ -40,7 +39,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 @@ -58,7 +56,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 @@ -77,7 +74,7 @@ scrollable = false [node name="GameOver" type="Control" parent="."] visible = false -layout_mode = 1 +layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -85,7 +82,6 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Label" type="Label" parent="GameOver"] -layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -102,7 +98,6 @@ label_settings = SubResource("LabelSettings_ot0gm") horizontal_alignment = 1 [node name="VBoxContainer" type="VBoxContainer" parent="GameOver"] -layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -118,15 +113,12 @@ size_flags_horizontal = 4 size_flags_vertical = 4 [node name="Button" type="Button" parent="GameOver/VBoxContainer"] -layout_mode = 2 text = "RESTART" [node name="Button2" type="Button" parent="GameOver/VBoxContainer"] -layout_mode = 2 text = "BACK TO MAIN MENU" [node name="BoxContainer" type="BoxContainer" parent="GameOver"] -layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -141,24 +133,21 @@ grow_vertical = 2 [node name="HBoxContainer" type="HBoxContainer" parent="GameOver/BoxContainer"] custom_minimum_size = Vector2(900, 500) -layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 [node name="TextureRect" type="TextureRect" parent="GameOver/BoxContainer/HBoxContainer"] custom_minimum_size = Vector2(500, 0) -layout_mode = 2 texture = ExtResource("3_segqn") ignore_texture_size = true [node name="TextureRect2" type="TextureRect" parent="GameOver/BoxContainer/HBoxContainer"] custom_minimum_size = Vector2(500, 0) -layout_mode = 2 texture = ExtResource("4_uiyin") ignore_texture_size = true [node name="Control" type="Control" parent="."] -layout_mode = 1 +layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -166,7 +155,6 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Stats_Player1" parent="Control" instance=ExtResource("3_yhsvf")] -layout_mode = 1 anchors_preset = 0 anchor_bottom = 0.0 offset_right = 0.0 @@ -174,7 +162,6 @@ grow_vertical = 1 scale = Vector2(0.6, 0.6) [node name="Stats_Player2" parent="Control" instance=ExtResource("4_c4m18")] -layout_mode = 1 scale = Vector2(0.6, 0.6) [connection signal="pressed" from="GameOver/VBoxContainer/Button" to="." method="_on_button_pressed"] diff --git a/menu/main_menu.tscn b/menu/main_menu.tscn index 700d7e4..243fa17 100644 --- a/menu/main_menu.tscn +++ b/menu/main_menu.tscn @@ -13,7 +13,6 @@ grow_vertical = 2 script = ExtResource("1_hyw8p") [node name="ColorRect" type="ColorRect" parent="."] -layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -22,7 +21,6 @@ grow_vertical = 2 color = Color(0.513726, 0.403922, 0.27451, 1) [node name="VBoxContainer" type="VBoxContainer" parent="."] -layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -36,30 +34,41 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Start" type="Button" parent="VBoxContainer"] -layout_mode = 2 +offset_right = 87.0 +offset_bottom = 31.0 text = "Start " [node name="Tutorial" type="Button" parent="VBoxContainer"] -layout_mode = 2 +offset_top = 35.0 +offset_right = 87.0 +offset_bottom = 66.0 text = "Tutorial " [node name="Settings" type="Button" parent="VBoxContainer"] -layout_mode = 2 +offset_top = 70.0 +offset_right = 87.0 +offset_bottom = 101.0 text = "Volume:" [node name="VolSlider" type="HSlider" parent="VBoxContainer"] -layout_mode = 2 +offset_top = 105.0 +offset_right = 87.0 +offset_bottom = 121.0 min_value = -30.0 max_value = 0.0 [node name="Quit" type="Button" parent="VBoxContainer"] -layout_mode = 2 +offset_top = 125.0 +offset_right = 87.0 +offset_bottom = 156.0 text = "Quit" [node name="FullScreen" type="Button" parent="VBoxContainer"] -layout_mode = 2 +offset_top = 160.0 +offset_right = 87.0 +offset_bottom = 191.0 text = "Fullscreen" [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] diff --git a/project.godot b/project.godot index 29ab7c6..6e9e2ef 100644 --- a/project.godot +++ b/project.godot @@ -100,51 +100,56 @@ test={ p1_left={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) ] } p1_right={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) ] } p1_up={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null) ] } p1_down={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) ] } p1_interact={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } p2_left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":0,"axis_value":-1.0,"script":null) ] } p2_right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":0,"axis_value":1.0,"script":null) ] } p2_up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":1,"axis_value":-1.0,"script":null) ] } p2_down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":1,"axis_value":1.0,"script":null) ] } p2_interact={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":46,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } p1_extra={ diff --git a/scripts/3DUI/SubViewport.gd b/scripts/3DUI/SubViewport.gd new file mode 100644 index 0000000..977efb5 --- /dev/null +++ b/scripts/3DUI/SubViewport.gd @@ -0,0 +1,12 @@ +extends SubViewport + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + size = $Label3D.rect_size + pass diff --git a/scripts/3DUI/dreieck.gd b/scripts/3DUI/dreieck.gd index b04c7bd..89b3d69 100644 --- a/scripts/3DUI/dreieck.gd +++ b/scripts/3DUI/dreieck.gd @@ -1,7 +1,11 @@ extends Node3D +func _ready(): + self.get_node("play").hide() + func _on_area_3d_input_event(camera, event, position, normal, shape_idx): self.scale = Vector3(1.5,1.5,1.5) + self.get_node("play").show() if event is InputEventMouseButton: if event.button_index == MOUSE_BUTTON_LEFT and event.pressed == true: print("Start Game") @@ -10,4 +14,5 @@ func _on_area_3d_input_event(camera, event, position, normal, shape_idx): func _on_area_3d_mouse_exited(): + self.get_node("play").hide() self.scale = Vector3(1,1,1) diff --git a/scripts/3DUI/papierrolle_flach.gd b/scripts/3DUI/papierrolle_flach.gd index f001e7a..f33244d 100644 --- a/scripts/3DUI/papierrolle_flach.gd +++ b/scripts/3DUI/papierrolle_flach.gd @@ -1,8 +1,11 @@ extends Node3D +func _ready(): + self.get_node("tutorial").hide() func _on_area_3d_input_event(camera, event, position, normal, shape_idx): self.scale = Vector3(1.5,1.5,1.5) + self.get_node("tutorial").show() if event is InputEventMouseButton: if event.button_index == MOUSE_BUTTON_LEFT and event.pressed == true: print("Credits/Spielbeschreibung") @@ -13,3 +16,4 @@ func _on_area_3d_input_event(camera, event, position, normal, shape_idx): func _on_area_3d_mouse_exited(): self.scale = Vector3(1,1,1) + self.get_node("tutorial").hide() diff --git a/scripts/3DUI/zahnraeder.gd b/scripts/3DUI/zahnraeder.gd index ef8ef14..c2df4a8 100644 --- a/scripts/3DUI/zahnraeder.gd +++ b/scripts/3DUI/zahnraeder.gd @@ -1,8 +1,11 @@ extends Node3D +func _ready(): + self.get_node("settings").hide() func _on_area_3d_input_event(camera, event, position, normal, shape_idx): print("scale") + self.get_node("settings").show() self.scale = Vector3(1.2,1.2,1.2) if event is InputEventMouseButton: if event.button_index == MOUSE_BUTTON_LEFT and event.pressed == true: @@ -14,3 +17,4 @@ func _on_area_3d_input_event(camera, event, position, normal, shape_idx): func _on_area_3d_mouse_exited(): self.scale = Vector3(1,1,1) + self.get_node("settings").hide() diff --git a/turning_zahnrad.tscn b/turning_zahnrad.tscn new file mode 100644 index 0000000..394663e --- /dev/null +++ b/turning_zahnrad.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=3 format=3 uid="uid://cvcfn3l2wj8gb"] + +[ext_resource type="PackedScene" uid="uid://dsj0fslwga5xl" path="res://Assets/Model/MainMenuObjects/zahnrad_klein.glb" id="1_rs3ag"] +[ext_resource type="Script" path="res://Assets/Model/MainMenuObjects/zahnrad_klein.gd" id="2_ade0m"] + +[node name="Node3D" type="Node3D"] + +[node name="zahnrad_klein" parent="." instance=ExtResource("1_rs3ag")] +script = ExtResource("2_ade0m")