Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022

Assets/Textures/Font/Credit_Pop_Up.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://1c3bux01fswp"
+path.s3tc="res://.godot/imported/Credit_Pop_Up.png-68e364ca4006eede576745781ee9582d.s3tc.ctex"
+path.etc2="res://.godot/imported/Credit_Pop_Up.png-68e364ca4006eede576745781ee9582d.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Textures/Font/Credit_Pop_Up.png"
+dest_files=["res://.godot/imported/Credit_Pop_Up.png-68e364ca4006eede576745781ee9582d.s3tc.ctex", "res://.godot/imported/Credit_Pop_Up.png-68e364ca4006eede576745781ee9582d.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

Assets/Textures/Font/Settings_Pop_Up.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bw4rbaxr55fdu"
+path.s3tc="res://.godot/imported/Settings_Pop_Up.png-661d0e246bdebe8ab4aa09f397fb2e99.s3tc.ctex"
+path.etc2="res://.godot/imported/Settings_Pop_Up.png-661d0e246bdebe8ab4aa09f397fb2e99.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Textures/Font/Settings_Pop_Up.png"
+dest_files=["res://.godot/imported/Settings_Pop_Up.png-661d0e246bdebe8ab4aa09f397fb2e99.s3tc.ctex", "res://.godot/imported/Settings_Pop_Up.png-661d0e246bdebe8ab4aa09f397fb2e99.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

Nodes/MainMenu3D.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=22 format=3 uid="uid://c4njs3xp5s582"]
+[gd_scene load_steps=24 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"]
@@ -16,11 +16,13 @@
 [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="Texture2D" uid="uid://1c3bux01fswp" path="res://Assets/Textures/Font/Credit_Pop_Up.png" id="12_te2so"]
 [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"]
+[ext_resource type="Texture2D" uid="uid://bw4rbaxr55fdu" path="res://Assets/Textures/Font/Settings_Pop_Up.png" id="22_2ewcb"]
 
 [node name="MainMenu3D" type="Node3D"]
 
@@ -70,6 +72,10 @@ polygon = PackedVector2Array(-2.45033, 2.48997, 0.151118, 3.31404, 1.73134, -2.9
 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="credits" type="Sprite3D" parent="papierrolle_flach"]
+transform = Transform3D(-0.2, 3.01992e-08, 1.32005e-15, 0, -8.74228e-09, 0.2, 3.01992e-08, 0.2, 8.74228e-09, 0, 1.1, 4)
+texture = ExtResource("12_te2so")
+
 [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)
 
@@ -78,6 +84,7 @@ 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)
+current = true
 
 [node name="LightSetup" parent="." instance=ExtResource("13_smxpv")]
 
@@ -107,6 +114,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.90855, 0.23831, -0.686673)
 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="volume" type="Sprite3D" parent="zahnraeder"]
+transform = Transform3D(-0.4, 6.03983e-08, 2.64009e-15, 0, -1.74846e-08, 0.4, 6.03983e-08, 0.4, 1.74846e-08, 4, 1.1, 0)
+texture = ExtResource("22_2ewcb")
+
 [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")

project.godot

@@ -81,7 +81,7 @@ _global_script_class_icons={
 [application]
 
 config/name="Semester Game Jam 2022"
-run/main_scene="res://menu/main_menu.tscn"
+run/main_scene="res://Nodes/MainMenu3D.tscn"
 config/features=PackedStringArray("4.0", "Forward Plus")
 config/icon="res://icon.svg"
 <<<<<<<HEADrun/main_scene="res://menu/main_menu.tscn"

scripts/3DUI/papierrolle_flach.gd

@@ -2,6 +2,7 @@ extends Node3D
 
 func _ready():
 	self.get_node("tutorial").hide()
+	self.get_node("credits").hide()
 
 func _on_area_3d_input_event(camera, event, position, normal, shape_idx):
 	self.scale = Vector3(1.5,1.5,1.5)
@@ -10,10 +11,11 @@ func _on_area_3d_input_event(camera, event, position, normal, shape_idx):
 		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")
+			self.get_node("credits").show()
 	
 
 
 func _on_area_3d_mouse_exited():
 	self.scale = Vector3(1,1,1)
 	self.get_node("tutorial").hide()
+	self.get_node("credits").hide()

scripts/3DUI/zahnraeder.gd

@@ -2,6 +2,7 @@ extends Node3D
 
 func _ready():
 	self.get_node("settings").hide()
+	self.get_node("volume").hide()
 
 func _on_area_3d_input_event(camera, event, position, normal, shape_idx):
 	print("scale")
@@ -11,10 +12,11 @@ func _on_area_3d_input_event(camera, event, position, normal, shape_idx):
 		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")
+			self.get_node("volume").show()
 	
 
 
 func _on_area_3d_mouse_exited():
 	self.scale = Vector3(1,1,1)
 	self.get_node("settings").hide()
+	self.get_node("volume").hide()