Merge branch 'main' of https://github.com/vaporvee/byte-of-terror

2024-01-17 11:47:55 +01:00
parent 7ad8a225c6 abf0a6ead1
commit c0f0048705
8 changed files with 101 additions and 72 deletions
--- a/models/interior.mtl
+++ b/models/interior.mtl
@@ -0,0 +1,2 @@
+# Blender 3.6.7 MTL File: 'interior.blend'
+# www.blender.org
--- a/models/interior.obj
+++ b/models/interior.obj
@@ -1,4 +1,4 @@
-# Blender 4.0.2
+# Blender 3.6.7
 # www.blender.org
 mtllib interior.mtl
 o Hallway
@@ -10,6 +10,14 @@ 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 -7.995381 -2.998268 8.994804
+v -7.995381 2.998268 8.994804
+v -7.995381 -2.998268 -8.994804
+v -7.995381 2.998268 -8.994804
+v 7.995381 -2.998268 8.994804
+v 7.995381 2.998268 8.994804
+v 7.995381 -2.998268 -8.994804
+v 7.995381 2.998268 -8.994804
 vn -1.0000 -0.0000 -0.0000
 vn -0.0000 -0.0000 -1.0000
 vn 1.0000 -0.0000 -0.0000
@@ -37,7 +45,13 @@ 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
+f 9/1/3 11/4/3 12/3/3 10/2/3
+f 11/4/4 15/6/4 16/5/4 12/3/4
+f 15/6/1 13/8/1 14/7/1 16/5/1
+f 13/8/2 9/10/2 10/9/2 14/7/2
+f 11/11/6 9/12/6 13/8/6 15/6/6
+f 16/5/5 14/7/5 10/14/5 12/13/5
+o Cube
 v -6.000000 -3.000000 7.000000
 v -6.000000 3.000000 7.000000
 v -6.000000 -3.000000 -7.000000
@@ -46,28 +60,27 @@ 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
+v -0.768807 -2.999966 7.000000
+v -0.768807 -0.189902 7.000000
+v 0.583663 -0.189902 7.000000
+v 0.583663 -2.999966 7.000000
+v -5.399996 -3.000000 6.300002
+v -5.400000 3.000000 6.300000
+v -5.400000 -3.000000 -6.300000
+v -5.400000 3.000000 -6.300000
+v 5.399996 -3.000000 6.300002
+v 5.400000 3.000000 6.300000
+v 5.400000 -3.000000 -6.300000
+v 5.400000 3.000000 -6.300000
+v -0.768807 -2.999966 6.300000
+v -0.768807 -0.189902 6.300000
+v 0.583663 -0.189902 6.300000
+v 0.583663 -2.999966 6.300000
 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 -0.0479 -0.9988
 vn -0.0000 -1.0000 -0.0000
 vt 0.375000 0.000000
 vt 0.625000 0.000000
@@ -77,23 +90,27 @@ 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.491257 0.883743
+vt 0.508743 0.883743
 vt 0.625000 1.000000
+vt 0.375000 1.000000
+vt 0.508743 0.866257
+vt 0.491257 0.866257
 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
+f 17/15/7 18/16/7 20/17/7 19/18/7
+f 19/18/8 20/17/8 24/19/8 23/20/8
+f 23/20/9 24/19/9 22/21/9 21/22/9
+f 25/23/10 26/24/10 18/25/10 17/26/10
+f 27/27/10 28/28/10 21/22/10 22/21/10
+f 28/28/10 25/23/10 17/26/10 21/22/10
+f 26/24/10 27/27/10 22/21/10 18/25/10
+f 29/15/9 31/18/9 32/17/9 30/16/9
+f 31/18/10 35/20/10 36/19/10 32/17/10
+f 35/20/7 33/22/7 34/21/7 36/19/7
+f 37/23/8 29/26/8 30/25/8 38/24/8
+f 39/27/8 34/21/8 33/22/8 40/28/8
+f 40/28/11 33/22/11 29/26/11 37/23/11
+f 38/24/8 30/25/8 34/21/8 39/27/8
+f 27/27/12 26/24/12 38/24/12 39/27/12
+f 26/24/9 25/23/9 37/23/9 38/24/9
+f 28/28/7 27/27/7 39/27/7 40/28/7
--- a/models/interior.obj.import
+++ b/models/interior.obj.import
@@ -1,22 +1,46 @@
 [remap]

-importer="wavefront_obj"
+importer="scene"
 importer_version=1
-type="Mesh"
+type="PackedScene"
 uid="uid://ddwkhfly2xyyt"
-path="res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.mesh"
+path="res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.scn"

 [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"]
+dest_files=["res://.godot/imported/interior.obj-e9c75aed421e938d72aee2931136abf2.scn"]

 [params]

-generate_tangents=true
-scale_mesh=Vector3(1, 1, 1)
-offset_mesh=Vector3(0, 0, 0)
-optimize_mesh=true
-force_disable_mesh_compression=false
+nodes/root_type=""
+nodes/root_name=""
+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
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={
+"nodes": {
+"PATH:Cube": {
+"decomposition/advanced": true,
+"generate/physics": true,
+"physics/shape_type": 2
+},
+"PATH:Hallway": {
+"generate/physics": true,
+"physics/shape_type": 2
+}
+}
+}
+gltf/naming_version=1
+gltf/embedded_image_handling=1
--- a/scenes/interactables/task_terminal.tscn
+++ b/scenes/interactables/task_terminal.tscn
@@ -31,7 +31,7 @@ resource_local_to_scene = true
 material = SubResource("StandardMaterial3D_7alnb")
 size = Vector2(1, 1)

-[node name="StaticBody3D" type="StaticBody3D"]
+[node name="TaskTerminal" type="StaticBody3D"]

 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 shape = SubResource("BoxShape3D_sh78v")
@@ -48,6 +48,7 @@ transform = Transform3D(-4.37114e-08, 0.891007, 0.453991, 0, 0.453991, -0.891007
 mesh = SubResource("PlaneMesh_hekp8")

 [node name="SubViewport" type="SubViewport" parent="ScreenMesh"]
+size_2d_override = Vector2i(512, 512)
 render_target_update_mode = 4

 [node name="DebugScreen" parent="ScreenMesh/SubViewport" instance=ExtResource("1_q1qkj")]
--- a/scenes/levels/debug.tscn
+++ b/scenes/levels/debug.tscn
@@ -1,33 +1,16 @@
-[gd_scene load_steps=7 format=3 uid="uid://ckad8stc13n83"]
+[gd_scene load_steps=4 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"]
+[ext_resource type="PackedScene" uid="uid://ddwkhfly2xyyt" path="res://models/interior.obj" id="1_lphcl"]
 [ext_resource type="PackedScene" uid="uid://b8bvidqu7tmfs" path="res://scenes/interactables/task_terminal.tscn" id="3_30m3x"]

-[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(16, 0.01, 18)
-
 [node name="Debug" type="Node3D"]

-[node name="Ground" type="StaticBody3D" parent="."]
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="Ground"]
+[node name="interior" parent="." instance=ExtResource("1_lphcl")]
 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")

 [node name="Player" parent="." instance=ExtResource("1_2585i")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 5.23956)

 [node name="StaticBody3D" parent="." instance=ExtResource("3_30m3x")]
-transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.5, 0, 0)
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.5, 0.027395, 0)
--- a/scenes/player.tscn
+++ b/scenes/player.tscn
@@ -4,6 +4,7 @@
 [ext_resource type="Texture2D" uid="uid://2xwafdhiha6x" path="res://assets/textures/world/flashlight_effect.png" id="1_rxdpg"]

 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_2qx4s"]
+height = 1.9

 [node name="Player" type="CharacterBody3D"]
 script = ExtResource("1_8d33x")
@@ -12,7 +13,8 @@ script = ExtResource("1_8d33x")
 shape = SubResource("CapsuleShape3D_2qx4s")

 [node name="Camera3D" type="Camera3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.7, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0)
+current = true

 [node name="SpotLight3D" type="SpotLight3D" parent="Camera3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, -0.25, 0)
--- a/unimported-models/interior.blend
+++ b/unimported-models/interior.blend
--- a/unimported-models/interior.blend1
+++ b/unimported-models/interior.blend1