From 81f3a26e9cfd0bc4fafeeda633312b7cdd2768dc Mon Sep 17 00:00:00 2001 From: Arthur Date: Sun, 11 Dec 2022 11:01:03 +0100 Subject: [PATCH] Added Labels --- Assets/Textures/Font/credits.png.import | 14 +++++++------ Assets/Textures/Font/settings.png.import | 14 +++++++------ Nodes/MainMenu3D.tscn | 14 +++++++++++-- Nodes/UI.tscn | 2 +- Nodes/game.tscn | 2 +- menu/main_menu.tscn | 25 ++++++++++++++++-------- scripts/3DUI/papierrolle_flach.gd | 4 ++++ scripts/3DUI/zahnraeder.gd | 4 ++++ 8 files changed, 55 insertions(+), 24 deletions(-) diff --git a/Assets/Textures/Font/credits.png.import b/Assets/Textures/Font/credits.png.import index c98b8b8..6ad856c 100644 --- a/Assets/Textures/Font/credits.png.import +++ b/Assets/Textures/Font/credits.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://dy85j2wm08enl" -path="res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.ctex" +path.s3tc="res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.s3tc.ctex" +path.etc2="res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Textures/Font/credits.png" -dest_files=["res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.ctex"] +dest_files=["res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.s3tc.ctex", "res://.godot/imported/credits.png-d454fd065c3f2bece11e8c3c42b74600.etc2.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +33,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/Assets/Textures/Font/settings.png.import b/Assets/Textures/Font/settings.png.import index bdded77..4b49933 100644 --- a/Assets/Textures/Font/settings.png.import +++ b/Assets/Textures/Font/settings.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://60i5abp5yobu" -path="res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.ctex" +path.s3tc="res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.s3tc.ctex" +path.etc2="res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Textures/Font/settings.png" -dest_files=["res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.ctex"] +dest_files=["res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.s3tc.ctex", "res://.godot/imported/settings.png-ffdfa0e9eb45d6db4034b3743f39e1f0.etc2.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +33,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/Nodes/MainMenu3D.tscn b/Nodes/MainMenu3D.tscn index 6c42626..d9b6e31 100644 --- a/Nodes/MainMenu3D.tscn +++ b/Nodes/MainMenu3D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 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"] @@ -13,12 +13,14 @@ [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://bb32ohgxsjd4h" path="res://Assets/Textures/Font/Opera_senza_titolo.png" id="18_fvvjm"] +[ext_resource type="Texture2D" uid="uid://60i5abp5yobu" path="res://Assets/Textures/Font/settings.png" id="19_go7mp"] [node name="MainMenu3D" type="Node3D"] @@ -51,7 +53,7 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 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.45421, 0, 0) +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")] @@ -64,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) @@ -97,6 +103,10 @@ 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(-0.7, 1.05697e-07, 4.62017e-15, 0, -3.0598e-08, 0.7, 1.05697e-07, 0.7, 3.0598e-08, 2.19996, 1, 4.10689) texture = ExtResource("18_fvvjm") diff --git a/Nodes/UI.tscn b/Nodes/UI.tscn index 939d35e..1160efa 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"] diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 138c80d..9875d22 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/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/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()