diff --git a/models/interior.obj b/models/interior.obj new file mode 100644 index 0000000..56636f6 --- /dev/null +++ b/models/interior.obj @@ -0,0 +1,99 @@ +# Blender 4.0.2 +# www.blender.org +mtllib interior.mtl +o Hallway +v -8.000000 -3.000000 9.000000 +v -8.000000 3.000000 9.000000 +v -8.000000 -3.000000 -9.000000 +v -8.000000 3.000000 -9.000000 +v 8.000000 -3.000000 9.000000 +v 8.000000 3.000000 9.000000 +v 8.000000 -3.000000 -9.000000 +v 8.000000 3.000000 -9.000000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.625000 1.000000 +vt 0.375000 1.000000 +vt 0.125000 0.500000 +vt 0.125000 0.750000 +vt 0.875000 0.500000 +vt 0.875000 0.750000 +s 0 +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/4/2 4/3/2 8/5/2 7/6/2 +f 7/6/3 8/5/3 6/7/3 5/8/3 +f 5/8/4 6/7/4 2/9/4 1/10/4 +f 3/11/5 7/6/5 5/8/5 1/12/5 +f 8/5/6 4/13/6 2/14/6 6/7/6 +o MainRoom +v -6.000000 -3.000000 7.000000 +v -6.000000 3.000000 7.000000 +v -6.000000 -3.000000 -7.000000 +v -6.000000 3.000000 -7.000000 +v 6.000000 -3.000000 7.000000 +v 6.000000 3.000000 7.000000 +v 6.000000 -3.000000 -7.000000 +v 6.000000 3.000000 -7.000000 +v -0.507817 -2.994619 7.000000 +v -0.507817 -0.801423 7.000000 +v 0.507817 -0.801423 7.000000 +v 0.507817 -2.994619 7.000000 +v -5.575739 -3.000000 6.505022 +v -5.575736 3.000000 6.505025 +v -5.575736 -3.000000 -6.505025 +v -5.575736 3.000000 -6.505025 +v 5.575739 -3.000000 6.505022 +v 5.575736 3.000000 6.505025 +v 5.575736 -3.000000 -6.505025 +v 5.575736 3.000000 -6.505025 +v -0.507817 -2.994619 6.522663 +v -0.507817 -0.801423 6.300000 +v 0.507817 -0.801423 6.300000 +v 0.507817 -2.994619 6.522663 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 0.9565 -0.2918 +vn -0.0000 0.0018 -1.0000 +vn -0.0000 -1.0000 -0.0000 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.489420 0.864420 +vt 0.489421 0.885579 +vt 0.375000 1.000000 +vt 0.510580 0.885579 +vt 0.510579 0.864420 +vt 0.625000 1.000000 +s 0 +f 9/15/7 10/16/7 12/17/7 11/18/7 +f 11/18/8 12/17/8 16/19/8 15/20/8 +f 15/20/9 16/19/9 14/21/9 13/22/9 +f 20/23/10 17/24/10 9/25/10 13/22/10 +f 17/24/10 18/26/10 19/27/10 20/23/10 13/22/10 14/21/10 10/28/10 9/25/10 +f 21/15/9 23/18/9 24/17/9 22/16/9 +f 23/18/10 27/20/10 28/19/10 24/17/10 +f 27/20/7 25/22/7 26/21/7 28/19/7 +f 32/23/11 25/22/11 21/25/11 29/24/11 +f 29/24/12 21/25/12 22/28/12 26/21/12 25/22/12 32/23/12 31/27/12 30/26/12 +f 19/27/13 18/26/13 30/26/13 31/27/13 +f 18/26/9 17/24/9 29/24/9 30/26/9 +f 20/23/7 19/27/7 31/27/7 32/23/7 diff --git a/models/interior.obj.import b/models/interior.obj.import new file mode 100644 index 0000000..549b1ea --- /dev/null +++ b/models/interior.obj.import @@ -0,0 +1,22 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://ddwkhfly2xyyt" +path="res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.mesh" + +[deps] + +files=["res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.mesh"] + +source_file="res://models/interior.obj" +dest_files=["res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.mesh", "res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.mesh"] + +[params] + +generate_tangents=true +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +optimize_mesh=true +force_disable_mesh_compression=false diff --git a/scenes/levels/debug.tscn b/scenes/levels/debug.tscn index 7ae516e..bd9e451 100644 --- a/scenes/levels/debug.tscn +++ b/scenes/levels/debug.tscn @@ -1,9 +1,13 @@ -[gd_scene load_steps=5 format=3 uid="uid://ckad8stc13n83"] +[gd_scene load_steps=7 format=3 uid="uid://ckad8stc13n83"] [ext_resource type="PackedScene" uid="uid://gg5ph541e4p3" path="res://scenes/player.tscn" id="1_2585i"] +[ext_resource type="ArrayMesh" uid="uid://ddwkhfly2xyyt" path="res://models/interior.obj" id="1_lphcl"] -[sub_resource type="PlaneMesh" id="PlaneMesh_t51pb"] -size = Vector2(10, 10) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_voc6l"] +cull_mode = 2 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ibyjr"] +cull_mode = 2 [sub_resource type="BoxShape3D" id="BoxShape3D_067df"] size = Vector3(10, 0.01, 10) @@ -15,8 +19,10 @@ size = Vector3(10, 0.01, 10) [node name="Ground" type="StaticBody3D" parent="."] [node name="MeshInstance3D" type="MeshInstance3D" parent="Ground"] -mesh = SubResource("PlaneMesh_t51pb") -skeleton = NodePath("../..") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0) +mesh = ExtResource("1_lphcl") +surface_material_override/0 = SubResource("StandardMaterial3D_voc6l") +surface_material_override/1 = SubResource("StandardMaterial3D_ibyjr") [node name="CollisionShape3D" type="CollisionShape3D" parent="Ground"] shape = SubResource("BoxShape3D_067df") diff --git a/scenes/menus/main_menu.tscn b/scenes/menus/main_menu.tscn index 193f4b6..1048534 100644 --- a/scenes/menus/main_menu.tscn +++ b/scenes/menus/main_menu.tscn @@ -44,7 +44,7 @@ label_settings = SubResource("LabelSettings_yh38l") [node name="Subtitle" type="Label" parent="LogoContainer"] layout_mode = 2 size_flags_horizontal = 4 -text = "ein Spiel von Yannik Ain und Merle ? für das" +text = "ein Spiel von Yannik Ain und Merle Jacob für das" [node name="TextureRect" type="TextureRect" parent="LogoContainer"] custom_minimum_size = Vector2(180, 70) diff --git a/unimported-models/.gdignore b/unimported-models/.gdignore new file mode 100644 index 0000000..e69de29 diff --git a/unimported-models/interior.blend b/unimported-models/interior.blend new file mode 100644 index 0000000..92888f9 Binary files /dev/null and b/unimported-models/interior.blend differ diff --git a/unimported-models/interior.blend1 b/unimported-models/interior.blend1 new file mode 100644 index 0000000..5a185fa Binary files /dev/null and b/unimported-models/interior.blend1 differ