diff --git a/assets/models/interior3.mtl b/assets/models/interior3.mtl new file mode 100644 index 0000000..d855cbb --- /dev/null +++ b/assets/models/interior3.mtl @@ -0,0 +1,12 @@ +# Blender 3.6.8 MTL File: 'interior3.blend' +# www.blender.org + +newmtl Material +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 diff --git a/assets/models/interior3.obj b/assets/models/interior3.obj new file mode 100644 index 0000000..427b6ce --- /dev/null +++ b/assets/models/interior3.obj @@ -0,0 +1,40 @@ +# Blender 3.6.8 +# www.blender.org +mtllib interior3.mtl +o Cube +v 12.000000 24.000000 -12.000000 +v 12.000000 0.000000 -12.000000 +v 12.000000 24.000000 12.000000 +v 12.000000 0.000000 12.000000 +v -12.000000 24.000000 -12.000000 +v -12.000000 0.000000 -12.000000 +v -12.000000 24.000000 12.000000 +v -12.000000 0.000000 12.000000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vt 0.625000 0.500000 +vt 0.625000 0.750000 +vt 0.875000 0.750000 +vt 0.875000 0.500000 +vt 0.375000 0.750000 +vt 0.375000 1.000000 +vt 0.625000 1.000000 +vt 0.375000 0.000000 +vt 0.375000 0.250000 +vt 0.625000 0.250000 +vt 0.625000 0.000000 +vt 0.125000 0.500000 +vt 0.125000 0.750000 +vt 0.375000 0.500000 +s 0 +usemtl Material +f 1/1/1 3/2/1 7/3/1 5/4/1 +f 4/5/2 8/6/2 7/7/2 3/2/2 +f 8/8/3 6/9/3 5/10/3 7/11/3 +f 6/12/4 8/13/4 4/5/4 2/14/4 +f 2/14/5 4/5/5 3/2/5 1/1/5 +f 6/9/6 2/14/6 1/1/6 5/10/6 diff --git a/assets/models/interior3.obj.import b/assets/models/interior3.obj.import new file mode 100644 index 0000000..3171afe --- /dev/null +++ b/assets/models/interior3.obj.import @@ -0,0 +1,41 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://uj3gy5jen0gn" +path="res://.godot/imported/interior3.obj-6b63d9099b48472bd709cbb8b43ae729.scn" + +[deps] + +source_file="res://assets/models/interior3.obj" +dest_files=["res://.godot/imported/interior3.obj-6b63d9099b48472bd709cbb8b43ae729.scn"] + +[params] + +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": { +"generate/physics": true, +"physics/shape_type": 2 +} +} +} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/assets/models/rug.mtl b/assets/models/rug.mtl new file mode 100644 index 0000000..af8ee54 --- /dev/null +++ b/assets/models/rug.mtl @@ -0,0 +1,12 @@ +# Blender 3.6.8 MTL File: 'rug.blend' +# www.blender.org + +newmtl Material +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 diff --git a/assets/models/rug.obj b/assets/models/rug.obj new file mode 100644 index 0000000..2830fd4 --- /dev/null +++ b/assets/models/rug.obj @@ -0,0 +1,290 @@ +# Blender 3.6.8 +# www.blender.org +mtllib rug.mtl +o Cube +v 3.684018 0.014393 -2.487881 +v 3.684018 0.062197 -2.440078 +v 3.731822 0.014393 -2.440078 +v 3.684018 0.048196 -2.473880 +v 3.711618 0.041993 -2.467677 +v 3.717820 0.048196 -2.440078 +v 3.717820 0.014393 -2.473880 +v 3.684018 -0.062197 -2.440078 +v 3.684018 -0.014393 -2.487881 +v 3.731822 -0.014393 -2.440078 +v 3.684018 -0.048196 -2.473880 +v 3.711618 -0.041993 -2.467677 +v 3.717820 -0.014393 -2.473880 +v 3.717820 -0.048196 -2.440078 +v 3.731822 0.014393 2.440078 +v 3.684018 0.062197 2.440078 +v 3.684018 0.014393 2.487881 +v 3.717820 0.048196 2.440078 +v 3.711618 0.041993 2.467677 +v 3.684018 0.048196 2.473880 +v 3.717820 0.014393 2.473880 +v 3.731822 -0.014393 2.440078 +v 3.684018 -0.014393 2.487881 +v 3.684018 -0.062197 2.440078 +v 3.717820 -0.014393 2.473880 +v 3.711618 -0.041993 2.467677 +v 3.684018 -0.048196 2.473880 +v 3.717820 -0.048196 2.440078 +v -3.684018 0.014393 -2.487881 +v -3.731822 0.014393 -2.440078 +v -3.684018 0.062197 -2.440078 +v -3.717820 0.014393 -2.473880 +v -3.711618 0.041993 -2.467677 +v -3.717820 0.048196 -2.440078 +v -3.684018 0.048196 -2.473880 +v -3.731822 -0.014393 -2.440078 +v -3.684018 -0.014393 -2.487881 +v -3.684018 -0.062197 -2.440078 +v -3.717820 -0.014393 -2.473880 +v -3.711618 -0.041993 -2.467677 +v -3.684018 -0.048196 -2.473880 +v -3.717820 -0.048196 -2.440078 +v -3.731822 0.014393 2.440078 +v -3.684018 0.014393 2.487881 +v -3.684018 0.062197 2.440078 +v -3.717820 0.014393 2.473880 +v -3.711618 0.041993 2.467677 +v -3.684018 0.048196 2.473880 +v -3.717820 0.048196 2.440078 +v -3.684018 -0.062197 2.440078 +v -3.684018 -0.014393 2.487881 +v -3.731822 -0.014393 2.440078 +v -3.684018 -0.048196 2.473880 +v -3.711618 -0.041993 2.467677 +v -3.717820 -0.014393 2.473880 +v -3.717820 -0.048196 2.440078 +vn -0.1794 -0.9673 -0.1794 +vn 0.1794 -0.9673 -0.1794 +vn 0.1794 -0.9673 0.1794 +vn -0.1794 -0.9673 0.1794 +vn -0.9673 -0.1794 0.1794 +vn -0.9673 0.1794 0.1794 +vn -0.9673 0.1794 -0.1794 +vn -0.9673 -0.1794 -0.1794 +vn 0.1794 -0.1794 0.9673 +vn 0.1794 0.1794 0.9673 +vn -0.1794 0.1794 0.9673 +vn -0.1794 -0.1794 0.9673 +vn 0.1794 0.9673 -0.1794 +vn -0.1794 0.9673 -0.1794 +vn -0.1794 0.9673 0.1794 +vn 0.1794 0.9673 0.1794 +vn 0.9673 -0.1794 -0.1794 +vn 0.9673 0.1794 -0.1794 +vn 0.9673 0.1794 0.1794 +vn 0.9673 -0.1794 0.1794 +vn 0.1794 0.1794 -0.9673 +vn 0.1585 0.3600 -0.9194 +vn 0.3251 0.3251 -0.8881 +vn 0.3600 0.1585 -0.9194 +vn 0.3600 0.9194 -0.1585 +vn 0.3251 0.8881 -0.3251 +vn 0.1585 0.9194 -0.3600 +vn 0.9194 0.1585 -0.3600 +vn 0.8881 0.3251 -0.3251 +vn 0.9194 0.3600 -0.1585 +vn 0.1585 -0.9194 -0.3600 +vn 0.3251 -0.8881 -0.3251 +vn 0.3600 -0.9194 -0.1585 +vn 0.1794 -0.1794 -0.9673 +vn 0.3600 -0.1585 -0.9194 +vn 0.3251 -0.3251 -0.8881 +vn 0.1585 -0.3600 -0.9194 +vn 0.9194 -0.3600 -0.1585 +vn 0.8881 -0.3251 -0.3251 +vn 0.9194 -0.1585 -0.3600 +vn 0.9194 0.3600 0.1585 +vn 0.8881 0.3251 0.3251 +vn 0.9194 0.1585 0.3600 +vn 0.1585 0.9194 0.3600 +vn 0.3251 0.8881 0.3251 +vn 0.3600 0.9194 0.1585 +vn 0.3600 0.1585 0.9194 +vn 0.3251 0.3251 0.8881 +vn 0.1585 0.3600 0.9194 +vn 0.9194 -0.1585 0.3600 +vn 0.8881 -0.3251 0.3251 +vn 0.9194 -0.3600 0.1585 +vn 0.1585 -0.3600 0.9194 +vn 0.3251 -0.3251 0.8881 +vn 0.3600 -0.1585 0.9194 +vn 0.3600 -0.9194 0.1585 +vn 0.3251 -0.8881 0.3251 +vn 0.1585 -0.9194 0.3600 +vn -0.1794 0.1794 -0.9673 +vn -0.3600 0.1585 -0.9194 +vn -0.3251 0.3251 -0.8881 +vn -0.1585 0.3600 -0.9194 +vn -0.9194 0.3600 -0.1585 +vn -0.8881 0.3251 -0.3251 +vn -0.9194 0.1585 -0.3600 +vn -0.1585 0.9194 -0.3600 +vn -0.3251 0.8881 -0.3251 +vn -0.3600 0.9194 -0.1585 +vn -0.9194 -0.1585 -0.3600 +vn -0.8881 -0.3251 -0.3251 +vn -0.9194 -0.3600 -0.1585 +vn -0.1794 -0.1794 -0.9673 +vn -0.1585 -0.3600 -0.9194 +vn -0.3251 -0.3251 -0.8881 +vn -0.3600 -0.1585 -0.9194 +vn -0.3600 -0.9194 -0.1585 +vn -0.3251 -0.8881 -0.3251 +vn -0.1585 -0.9194 -0.3600 +vn -0.9194 0.1585 0.3600 +vn -0.8881 0.3251 0.3251 +vn -0.9194 0.3600 0.1585 +vn -0.1585 0.3600 0.9194 +vn -0.3251 0.3251 0.8881 +vn -0.3600 0.1585 0.9194 +vn -0.3600 0.9194 0.1585 +vn -0.3251 0.8881 0.3251 +vn -0.1585 0.9194 0.3600 +vn -0.1585 -0.9194 0.3600 +vn -0.3251 -0.8881 0.3251 +vn -0.3600 -0.9194 0.1585 +vn -0.3600 -0.1585 0.9194 +vn -0.3251 -0.3251 0.8881 +vn -0.1585 -0.3600 0.9194 +vn -0.9194 -0.3600 0.1585 +vn -0.8881 -0.3251 0.3251 +vn -0.9194 -0.1585 0.3600 +vt 0.126601 0.502402 +vt 0.373399 0.502402 +vt 0.373399 0.747598 +vt 0.126601 0.747598 +vt 0.471073 0.002402 +vt 0.528927 0.002402 +vt 0.528927 0.247598 +vt 0.471073 0.247598 +vt 0.471073 0.751601 +vt 0.528927 0.751601 +vt 0.528927 0.998399 +vt 0.471073 0.998399 +vt 0.626601 0.502402 +vt 0.873399 0.502402 +vt 0.873399 0.747598 +vt 0.626601 0.747598 +vt 0.471073 0.502402 +vt 0.528927 0.502402 +vt 0.528927 0.747598 +vt 0.471073 0.747598 +vt 0.528927 0.498399 +vt 0.625000 0.498399 +vt 0.611465 0.500113 +vt 0.528927 0.500000 +vt 0.625000 0.502402 +vt 0.626601 0.500000 +vt 0.373399 0.500000 +vt 0.388310 0.500338 +vt 0.375000 0.502402 +vt 0.471073 0.498399 +vt 0.471073 0.500000 +vt 0.375000 0.498399 +vt 0.625000 0.747598 +vt 0.611691 0.749662 +vt 0.528927 0.750000 +vt 0.626601 0.750000 +vt 0.625000 0.751601 +vt 0.471073 0.750000 +vt 0.388535 0.749887 +vt 0.375000 0.747598 +vt 0.375000 0.751601 +vt 0.373399 0.750000 +vt 0.528927 0.251601 +vt 0.528927 0.250000 +vt 0.584395 0.250000 +vt 0.625000 0.251601 +vt 0.625000 0.247598 +vt 0.625000 0.248985 +vt 0.873399 0.500000 +vt 0.874323 0.500000 +vt 0.875000 0.502402 +vt 0.471073 0.250000 +vt 0.415605 0.250000 +vt 0.375000 0.247598 +vt 0.471073 0.251601 +vt 0.375000 0.251601 +vt 0.375000 0.250677 +vt 0.125000 0.502402 +vt 0.125000 0.501015 +vt 0.126601 0.500000 +vt 0.528927 0.000000 +vt 0.584395 0.000000 +vt 0.625000 0.002402 +vt 0.625000 0.998399 +vt 0.625000 0.999323 +vt 0.528927 1.000000 +vt 0.875000 0.747598 +vt 0.875000 0.748985 +vt 0.873399 0.750000 +vt 0.126601 0.750000 +vt 0.125677 0.750000 +vt 0.125000 0.747598 +vt 0.471073 1.000000 +vt 0.415605 1.000000 +vt 0.375000 0.998399 +vt 0.375000 0.002402 +vt 0.375000 0.001015 +vt 0.471073 0.000000 +s 1 +usemtl Material +f 38/1/1 8/2/2 24/3/3 50/4/4 +f 52/5/5 43/6/6 30/7/7 36/8/8 +f 23/9/9 17/10/10 44/11/11 51/12/12 +f 2/13/13 31/14/14 45/15/15 16/16/16 +f 10/17/17 3/18/18 15/19/19 22/20/20 +f 1/21/21 4/22/22 5/23/23 7/24/24 +f 2/13/13 6/25/25 5/23/26 4/26/27 +f 3/18/18 7/24/28 5/23/29 6/25/30 +f 8/2/2 11/27/31 12/28/32 14/29/33 +f 9/30/34 13/31/35 12/28/36 11/32/37 +f 10/17/17 14/29/38 12/28/39 13/31/40 +f 15/19/19 18/33/41 19/34/42 21/35/43 +f 16/16/16 20/36/44 19/34/45 18/33/46 +f 17/10/10 21/35/47 19/34/48 20/37/49 +f 22/20/20 25/38/50 26/39/51 28/40/52 +f 23/9/9 27/41/53 26/39/54 25/38/55 +f 24/3/3 28/40/56 26/39/57 27/42/58 +f 29/43/59 32/44/60 33/45/61 35/46/62 +f 30/7/7 34/47/63 33/48/64 32/44/65 +f 31/14/14 35/49/66 33/50/67 34/51/68 +f 36/8/8 39/52/69 40/53/70 42/54/71 +f 37/55/72 41/56/73 40/57/74 39/52/75 +f 38/1/1 42/58/76 40/59/77 41/60/78 +f 43/6/6 46/61/79 47/62/80 49/63/81 +f 44/11/11 48/64/82 47/65/83 46/66/84 +f 45/15/15 49/67/85 47/68/86 48/69/87 +f 50/4/4 53/70/88 54/71/89 56/72/90 +f 51/12/12 55/73/91 54/74/92 53/75/93 +f 52/5/5 56/76/94 54/77/95 55/78/96 +f 38/1/1 50/4/4 56/72/90 42/58/76 +f 42/54/71 56/76/94 52/5/5 36/8/8 +f 8/2/2 38/1/1 41/60/78 11/27/31 +f 11/32/37 41/56/73 37/55/72 9/30/34 +f 3/18/18 10/17/17 13/31/40 7/24/28 +f 7/24/24 13/31/35 9/30/34 1/21/21 +f 51/12/12 44/11/11 46/66/84 55/73/91 +f 55/78/96 46/61/79 43/6/6 52/5/5 +f 17/10/10 23/9/9 25/38/55 21/35/47 +f 21/35/43 25/38/50 22/20/20 15/19/19 +f 29/43/59 37/55/72 39/52/75 32/44/60 +f 32/44/65 39/52/69 36/8/8 30/7/7 +f 16/16/16 45/15/15 48/69/87 20/36/44 +f 20/37/49 48/64/82 44/11/11 17/10/10 +f 2/13/13 16/16/16 18/33/46 6/25/25 +f 6/25/30 18/33/41 15/19/19 3/18/18 +f 50/4/4 24/3/3 27/42/58 53/70/88 +f 53/75/93 27/41/53 23/9/9 51/12/12 +f 45/15/15 31/14/14 34/51/68 49/67/85 +f 49/63/81 34/47/63 30/7/7 43/6/6 +f 31/14/14 2/13/13 4/26/27 35/49/66 +f 35/46/62 4/22/22 1/21/21 29/43/59 +f 24/3/3 8/2/2 14/29/33 28/40/56 +f 28/40/52 14/29/38 10/17/17 22/20/20 +f 37/55/72 29/43/59 1/21/21 9/30/34 diff --git a/assets/models/rug.obj.import b/assets/models/rug.obj.import new file mode 100644 index 0000000..404a28d --- /dev/null +++ b/assets/models/rug.obj.import @@ -0,0 +1,22 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://cw26yenlafqt6" +path="res://.godot/imported/rug.obj-bf6de8576b77c05fb3a39062156d7729.mesh" + +[deps] + +files=["res://.godot/imported/rug.obj-bf6de8576b77c05fb3a39062156d7729.mesh"] + +source_file="res://assets/models/rug.obj" +dest_files=["res://.godot/imported/rug.obj-bf6de8576b77c05fb3a39062156d7729.mesh", "res://.godot/imported/rug.obj-bf6de8576b77c05fb3a39062156d7729.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/assets/textures/material/fabric/fabric.material b/assets/textures/material/fabric/fabric.material new file mode 100644 index 0000000..2aa8048 Binary files /dev/null and b/assets/textures/material/fabric/fabric.material differ diff --git a/assets/textures/material/fabric/fabric_ambientocclusion.png b/assets/textures/material/fabric/fabric_ambientocclusion.png new file mode 100644 index 0000000..f185d5b Binary files /dev/null and b/assets/textures/material/fabric/fabric_ambientocclusion.png differ diff --git a/assets/textures/material/fabric/fabric_ambientocclusion.png.import b/assets/textures/material/fabric/fabric_ambientocclusion.png.import new file mode 100644 index 0000000..139faff --- /dev/null +++ b/assets/textures/material/fabric/fabric_ambientocclusion.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bh8vujkbqo8kb" +path.s3tc="res://.godot/imported/fabric_ambientocclusion.png-ccf7caac7d0ddbf83f699850fccbfd86.s3tc.ctex" +path.etc2="res://.godot/imported/fabric_ambientocclusion.png-ccf7caac7d0ddbf83f699850fccbfd86.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/fabric/fabric_ambientocclusion.png" +dest_files=["res://.godot/imported/fabric_ambientocclusion.png-ccf7caac7d0ddbf83f699850fccbfd86.s3tc.ctex", "res://.godot/imported/fabric_ambientocclusion.png-ccf7caac7d0ddbf83f699850fccbfd86.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +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/material/fabric/fabric_color.png b/assets/textures/material/fabric/fabric_color.png new file mode 100644 index 0000000..a663ea0 Binary files /dev/null and b/assets/textures/material/fabric/fabric_color.png differ diff --git a/assets/textures/material/fabric/fabric_color.png.import b/assets/textures/material/fabric/fabric_color.png.import new file mode 100644 index 0000000..80f9981 --- /dev/null +++ b/assets/textures/material/fabric/fabric_color.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8x6e61xdcq4k" +path.s3tc="res://.godot/imported/fabric_color.png-67d36e2c92881533407ee4f5e0a83d13.s3tc.ctex" +path.etc2="res://.godot/imported/fabric_color.png-67d36e2c92881533407ee4f5e0a83d13.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/fabric/fabric_color.png" +dest_files=["res://.godot/imported/fabric_color.png-67d36e2c92881533407ee4f5e0a83d13.s3tc.ctex", "res://.godot/imported/fabric_color.png-67d36e2c92881533407ee4f5e0a83d13.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +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/material/fabric/fabric_normalgl.png b/assets/textures/material/fabric/fabric_normalgl.png new file mode 100644 index 0000000..e157d5b Binary files /dev/null and b/assets/textures/material/fabric/fabric_normalgl.png differ diff --git a/assets/textures/material/fabric/fabric_normalgl.png.import b/assets/textures/material/fabric/fabric_normalgl.png.import new file mode 100644 index 0000000..75d8a8b --- /dev/null +++ b/assets/textures/material/fabric/fabric_normalgl.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cidp2pbgjb4fg" +path.s3tc="res://.godot/imported/fabric_normalgl.png-110f9a03e97787fa318b481f9312d535.s3tc.ctex" +path.etc2="res://.godot/imported/fabric_normalgl.png-110f9a03e97787fa318b481f9312d535.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/fabric/fabric_normalgl.png" +dest_files=["res://.godot/imported/fabric_normalgl.png-110f9a03e97787fa318b481f9312d535.s3tc.ctex", "res://.godot/imported/fabric_normalgl.png-110f9a03e97787fa318b481f9312d535.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/textures/material/fabric/fabric_normalgl.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/assets/textures/material/fabric/fabric_roughness.png b/assets/textures/material/fabric/fabric_roughness.png new file mode 100644 index 0000000..828e70a Binary files /dev/null and b/assets/textures/material/fabric/fabric_roughness.png differ diff --git a/assets/textures/material/fabric/fabric_roughness.png.import b/assets/textures/material/fabric/fabric_roughness.png.import new file mode 100644 index 0000000..f597a82 --- /dev/null +++ b/assets/textures/material/fabric/fabric_roughness.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dxnyut7qlap6f" +path.s3tc="res://.godot/imported/fabric_roughness.png-7f6133bbe1c128c5c4d9385fd185e903.s3tc.ctex" +path.etc2="res://.godot/imported/fabric_roughness.png-7f6133bbe1c128c5c4d9385fd185e903.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/fabric/fabric_roughness.png" +dest_files=["res://.godot/imported/fabric_roughness.png-7f6133bbe1c128c5c4d9385fd185e903.s3tc.ctex", "res://.godot/imported/fabric_roughness.png-7f6133bbe1c128c5c4d9385fd185e903.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +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/material/light_planks/light_planks_ambientocclusion.png b/assets/textures/material/light_planks/light_planks_ambientocclusion.png new file mode 100644 index 0000000..e6f81f5 Binary files /dev/null and b/assets/textures/material/light_planks/light_planks_ambientocclusion.png differ diff --git a/assets/textures/material/light_planks/light_planks_ambientocclusion.png.import b/assets/textures/material/light_planks/light_planks_ambientocclusion.png.import new file mode 100644 index 0000000..71cdb86 --- /dev/null +++ b/assets/textures/material/light_planks/light_planks_ambientocclusion.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bo5iehmqthkeu" +path.s3tc="res://.godot/imported/light_planks_ambientocclusion.png-d69cc77ae85c431ce62ef0b650259a7d.s3tc.ctex" +path.etc2="res://.godot/imported/light_planks_ambientocclusion.png-d69cc77ae85c431ce62ef0b650259a7d.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/light_planks/light_planks_ambientocclusion.png" +dest_files=["res://.godot/imported/light_planks_ambientocclusion.png-d69cc77ae85c431ce62ef0b650259a7d.s3tc.ctex", "res://.godot/imported/light_planks_ambientocclusion.png-d69cc77ae85c431ce62ef0b650259a7d.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +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/material/light_planks/light_planks_color.png b/assets/textures/material/light_planks/light_planks_color.png new file mode 100644 index 0000000..1c47c96 Binary files /dev/null and b/assets/textures/material/light_planks/light_planks_color.png differ diff --git a/assets/textures/material/light_planks/light_planks_color.png.import b/assets/textures/material/light_planks/light_planks_color.png.import new file mode 100644 index 0000000..6701ada --- /dev/null +++ b/assets/textures/material/light_planks/light_planks_color.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2vf1arfpjpls" +path.s3tc="res://.godot/imported/light_planks_color.png-70cedee4304c50418c70db5d22487c76.s3tc.ctex" +path.etc2="res://.godot/imported/light_planks_color.png-70cedee4304c50418c70db5d22487c76.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/light_planks/light_planks_color.png" +dest_files=["res://.godot/imported/light_planks_color.png-70cedee4304c50418c70db5d22487c76.s3tc.ctex", "res://.godot/imported/light_planks_color.png-70cedee4304c50418c70db5d22487c76.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +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/material/light_planks/light_planks_metalness.png b/assets/textures/material/light_planks/light_planks_metalness.png new file mode 100644 index 0000000..66303c9 Binary files /dev/null and b/assets/textures/material/light_planks/light_planks_metalness.png differ diff --git a/assets/textures/material/light_planks/light_planks_metalness.png.import b/assets/textures/material/light_planks/light_planks_metalness.png.import new file mode 100644 index 0000000..617af51 --- /dev/null +++ b/assets/textures/material/light_planks/light_planks_metalness.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cyklcrww6x6ll" +path.s3tc="res://.godot/imported/light_planks_metalness.png-cc8c8f8858b64cea5a0be9daa297d079.s3tc.ctex" +path.etc2="res://.godot/imported/light_planks_metalness.png-cc8c8f8858b64cea5a0be9daa297d079.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/light_planks/light_planks_metalness.png" +dest_files=["res://.godot/imported/light_planks_metalness.png-cc8c8f8858b64cea5a0be9daa297d079.s3tc.ctex", "res://.godot/imported/light_planks_metalness.png-cc8c8f8858b64cea5a0be9daa297d079.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +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/material/light_planks/light_planks_normalgl.png b/assets/textures/material/light_planks/light_planks_normalgl.png new file mode 100644 index 0000000..ea9a123 Binary files /dev/null and b/assets/textures/material/light_planks/light_planks_normalgl.png differ diff --git a/assets/textures/material/light_planks/light_planks_normalgl.png.import b/assets/textures/material/light_planks/light_planks_normalgl.png.import new file mode 100644 index 0000000..69d22af --- /dev/null +++ b/assets/textures/material/light_planks/light_planks_normalgl.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://puhr4gxfrfep" +path.s3tc="res://.godot/imported/light_planks_normalgl.png-0546f24707196a08b0028db9580a039a.s3tc.ctex" +path.etc2="res://.godot/imported/light_planks_normalgl.png-0546f24707196a08b0028db9580a039a.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/light_planks/light_planks_normalgl.png" +dest_files=["res://.godot/imported/light_planks_normalgl.png-0546f24707196a08b0028db9580a039a.s3tc.ctex", "res://.godot/imported/light_planks_normalgl.png-0546f24707196a08b0028db9580a039a.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/textures/material/light_planks/light_planks_normalgl.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/assets/textures/material/light_planks/light_planks_roughness.png b/assets/textures/material/light_planks/light_planks_roughness.png new file mode 100644 index 0000000..76636fd Binary files /dev/null and b/assets/textures/material/light_planks/light_planks_roughness.png differ diff --git a/assets/textures/material/light_planks/light_planks_roughness.png.import b/assets/textures/material/light_planks/light_planks_roughness.png.import new file mode 100644 index 0000000..ccc8271 --- /dev/null +++ b/assets/textures/material/light_planks/light_planks_roughness.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://btaq3y61uc4pm" +path.s3tc="res://.godot/imported/light_planks_roughness.png-ed8dcce1a40607620915268f92009acf.s3tc.ctex" +path.etc2="res://.godot/imported/light_planks_roughness.png-ed8dcce1a40607620915268f92009acf.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/material/light_planks/light_planks_roughness.png" +dest_files=["res://.godot/imported/light_planks_roughness.png-ed8dcce1a40607620915268f92009acf.s3tc.ctex", "res://.godot/imported/light_planks_roughness.png-ed8dcce1a40607620915268f92009acf.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +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/export_presets.cfg b/export_presets.cfg index 6bc6447..5cb3ef9 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -63,44 +63,6 @@ Remove-Item -Recurse -Force '{temp_dir}'" [preset.1] -name="Web" -platform="Web" -runnable=true -dedicated_server=false -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="C:/Users/yanni/Desktop/exports lol/webexport/project-thought-experiment.html" -encryption_include_filters="" -encryption_exclude_filters="" -encrypt_pck=false -encrypt_directory=false - -[preset.1.options] - -custom_template/debug="" -custom_template/release="" -variant/extensions_support=false -vram_texture_compression/for_desktop=true -vram_texture_compression/for_mobile=true -html/export_icon=true -html/custom_html_shell="" -html/head_include="" -html/canvas_resize_policy=2 -html/focus_canvas_on_start=true -html/experimental_virtual_keyboard=false -progressive_web_app/enabled=false -progressive_web_app/offline_page="" -progressive_web_app/display=1 -progressive_web_app/orientation=0 -progressive_web_app/icon_144x144="" -progressive_web_app/icon_180x180="" -progressive_web_app/icon_512x512="" -progressive_web_app/background_color=Color(0, 0, 0, 1) - -[preset.2] - name="Linux/X11" platform="Linux/X11" runnable=true @@ -115,7 +77,7 @@ encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -[preset.2.options] +[preset.1.options] custom_template/debug="" custom_template/release="" diff --git a/project.godot b/project.godot index 8234680..a6d1934 100644 --- a/project.godot +++ b/project.godot @@ -123,6 +123,10 @@ fullscreen={ ] } +[physics] + +3d/physics_engine="GodotPhysics3D" + [rendering] textures/vram_compression/import_etc2_astc=true diff --git a/resources/environment.tres b/resources/environment.tres index 21d2ddc..09a9d41 100644 --- a/resources/environment.tres +++ b/resources/environment.tres @@ -2,10 +2,9 @@ [resource] background_mode = 2 -background_color = Color(1, 0.956863, 0.74902, 1) +background_color = Color(1, 0.784314, 0.705882, 1) ambient_light_source = 2 -ambient_light_color = Color(1, 0.956863, 0.74902, 1) -tonemap_mode = 2 +ambient_light_color = Color(1, 0.843137, 0.741176, 1) +tonemap_mode = 1 ssao_enabled = true glow_enabled = true -glow_intensity = 1.0 diff --git a/resources/light_bulb_off.tres b/resources/light_bulb_off.tres new file mode 100644 index 0000000..513257b --- /dev/null +++ b/resources/light_bulb_off.tres @@ -0,0 +1,3 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://j8xw15qjw4uh"] + +[resource] diff --git a/scenes/gravity_gun.tscn b/scenes/gravity_gun.tscn index f2d1ef5..741ce3e 100644 --- a/scenes/gravity_gun.tscn +++ b/scenes/gravity_gun.tscn @@ -258,6 +258,7 @@ script = ExtResource("8_8bfw8") audio_library = Array[ExtResource("10_yctqg")]([SubResource("Resource_h6pb1"), SubResource("Resource_5l2w7"), SubResource("Resource_wyis3")]) [node name="HUD" type="HBoxContainer" parent="."] +visible = false custom_minimum_size = Vector2(584, 0) anchors_preset = 3 anchor_left = 1.0 diff --git a/scenes/gui/menus/main_menu.tscn b/scenes/gui/menus/main_menu.tscn index b85d5f8..56cd3ba 100644 --- a/scenes/gui/menus/main_menu.tscn +++ b/scenes/gui/menus/main_menu.tscn @@ -56,44 +56,6 @@ render_target_update_mode = 4 [node name="LVL1" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_pnids")] -[node name="interior" parent="SubViewportContainer/SubViewport/LVL1" index="1"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) - -[node name="Ground1" parent="SubViewportContainer/SubViewport/LVL1/interior" index="0"] -surface_material_override/0 = null - -[node name="StaticBody3D" parent="SubViewportContainer/SubViewport/LVL1/interior/Ground1" index="0"] -collision_layer = 1 -collision_mask = 1 - -[node name="Walls2" parent="SubViewportContainer/SubViewport/LVL1/interior" index="1"] -surface_material_override/0 = null - -[node name="StaticBody3D" parent="SubViewportContainer/SubViewport/LVL1/interior/Walls2" index="0"] -collision_layer = 1 -collision_mask = 1 - -[node name="Ground2" parent="SubViewportContainer/SubViewport/LVL1/interior" index="2"] -surface_material_override/0 = null - -[node name="StaticBody3D" parent="SubViewportContainer/SubViewport/LVL1/interior/Ground2" index="0"] -collision_layer = 1 -collision_mask = 1 - -[node name="Walls1" parent="SubViewportContainer/SubViewport/LVL1/interior" index="3"] -surface_material_override/0 = null - -[node name="StaticBody3D" parent="SubViewportContainer/SubViewport/LVL1/interior/Walls1" index="0"] -collision_layer = 1 -collision_mask = 1 - -[node name="Ceiling" parent="SubViewportContainer/SubViewport/LVL1/interior" index="4"] -surface_material_override/0 = null - -[node name="StaticBody3D" parent="SubViewportContainer/SubViewport/LVL1/interior/Ceiling" index="0"] -collision_layer = 1 -collision_mask = 1 - [node name="Player" parent="SubViewportContainer/SubViewport/LVL1" index="2"] visible = false diff --git a/scenes/level_finish_area.tscn b/scenes/level_finish_area.tscn index 04f3b11..161bc14 100644 --- a/scenes/level_finish_area.tscn +++ b/scenes/level_finish_area.tscn @@ -26,10 +26,4 @@ shape = SubResource("BoxShape3D_urlb8") mesh = SubResource("QuadMesh_hjut0") surface_material_override/0 = SubResource("StandardMaterial3D_iaevn") -[node name="Label3D" type="Label3D" parent="."] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, -0.524372) -billboard = 2 -text = "Nächstes Level" -font_size = 48 - [connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/scenes/levels/lvl_1.tscn b/scenes/levels/lvl_1.tscn index 51a76ba..095683c 100644 --- a/scenes/levels/lvl_1.tscn +++ b/scenes/levels/lvl_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=3 uid="uid://ckad8stc13n83"] +[gd_scene load_steps=36 format=3 uid="uid://ckad8stc13n83"] [ext_resource type="PackedScene" uid="uid://ddwkhfly2xyyt" path="res://assets/models/interior.obj" id="1_xs30l"] [ext_resource type="Material" uid="uid://1w6e5sx6poff" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare.material" id="2_evxh1"] @@ -23,6 +23,8 @@ [ext_resource type="AudioStream" uid="uid://ddpvabd43s3p4" path="res://assets/audio/voicelines/anouncer_intro_04.ogg" id="21_n11nj"] [ext_resource type="Material" uid="uid://canvgrlphqagw" path="res://assets/materials/light_metal.material" id="22_ixwoq"] [ext_resource type="PackedScene" uid="uid://ckv2ssarxiv8w" path="res://scenes/objects/physics_objects/froggy.tscn" id="23_uexwc"] +[ext_resource type="Material" uid="uid://wi5k6axixuwr" path="res://assets/materials/metal.material" id="24_brfd8"] +[ext_resource type="PackedScene" uid="uid://jpjth6qixuym" path="res://scenes/objects/physics_objects/lamp.tscn" id="24_xtv3u"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_thqbu"] @@ -63,6 +65,12 @@ script = ExtResource("18_jxpoe") audio = ExtResource("16_ova7a") text = "Wir nehmen auch Investoren für die reale Version dieses Tools an." +[sub_resource type="CylinderMesh" id="CylinderMesh_6ge4e"] +material = ExtResource("24_brfd8") +top_radius = 0.02 +bottom_radius = 0.02 +height = 0.5 + [node name="LVL1" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1) @@ -166,6 +174,13 @@ surface_material_override/1 = ExtResource("22_ixwoq") transform = Transform3D(0.162376, -0.965347, 0.2043, -0.0444635, 0.199679, 0.978852, -0.985727, -0.168026, -0.0104995, 7.00408, 0.191834, 0.998893) freeze = true +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.99713, 5.83179, 0) +mesh = SubResource("CylinderMesh_6ge4e") + +[node name="CeilingLamp" parent="." instance=ExtResource("24_xtv3u")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 5, 0) + [connection signal="lock" from="CompletionCounter" to="Door" method="close"] [connection signal="unlock" from="CompletionCounter" to="Door" method="open"] diff --git a/scenes/levels/lvl_2.tscn b/scenes/levels/lvl_2.tscn index 1999de9..9f88786 100644 --- a/scenes/levels/lvl_2.tscn +++ b/scenes/levels/lvl_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=3 uid="uid://c17x7kmjmqdk3"] +[gd_scene load_steps=27 format=3 uid="uid://c17x7kmjmqdk3"] [ext_resource type="PackedScene" uid="uid://cbb37i3xvtp50" path="res://assets/models/interior2.obj" id="3_wurqx"] [ext_resource type="Texture2D" uid="uid://dsn5u1ymp1eki" path="res://assets/textures/material/concrete/concrete_color.png" id="4_1qe3t"] @@ -18,6 +18,9 @@ [ext_resource type="PackedScene" uid="uid://n2fxmsp27rfs" path="res://scenes/objects/furniture/wall_holder.tscn" id="16_f60rn"] [ext_resource type="PackedScene" uid="uid://b7evqwig6js8j" path="res://scenes/objects/physics_objects/office_chair.tscn" id="17_y5de5"] [ext_resource type="PackedScene" uid="uid://ckv2ssarxiv8w" path="res://scenes/objects/physics_objects/froggy.tscn" id="18_stcip"] +[ext_resource type="PackedScene" uid="uid://y7mgnooudpqv" path="res://scenes/objects/physics_objects/vent.tscn" id="19_x46pd"] +[ext_resource type="ArrayMesh" uid="uid://cw26yenlafqt6" path="res://assets/models/rug.obj" id="20_4l88e"] +[ext_resource type="Material" uid="uid://cnsdod4e12qx0" path="res://assets/textures/material/fabric/fabric.material" id="21_4nrng"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6f4qa"] albedo_texture = ExtResource("4_1qe3t") @@ -38,6 +41,13 @@ albedo_texture = SubResource("ViewportTexture_6in6u") uv1_scale = Vector3(3, 3, 3) uv1_offset = Vector3(-0.08, -0.47, 0) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1sdvl"] +shading_mode = 0 +albedo_color = Color(0, 0, 0, 1) + +[sub_resource type="QuadMesh" id="QuadMesh_ylyva"] +material = SubResource("StandardMaterial3D_1sdvl") + [node name="LVL2" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1) @@ -81,7 +91,7 @@ collision_mask = 7 transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 16.2308, 1, -20.898) [node name="Cube2" parent="." instance=ExtResource("11_58enu")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.6158, 1.04074, -21.5152) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 16.0201, 1.04074, -21.1975) [node name="ComputerScreen" parent="." instance=ExtResource("12_djkgb")] transform = Transform3D(-0.176775, -0.0764619, 0.981277, -0.0818855, 0.994664, 0.0627536, -0.980839, -0.0692591, -0.182093, 16.3998, 1.58359, -21.4736) @@ -90,7 +100,7 @@ transform = Transform3D(-0.176775, -0.0764619, 0.981277, -0.0818855, 0.994664, 0 transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 16.2308, 1, -16.1503) [node name="Cube3" parent="." instance=ExtResource("11_58enu")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.8526, 1.06541, -16.7374) +transform = Transform3D(-1, 0, -8.9407e-08, 0, 1, 0, 8.9407e-08, 0, -1, 15.8526, 1.06541, -16.7374) [node name="ComputerScreen2" parent="." instance=ExtResource("12_djkgb")] transform = Transform3D(-0.305014, 0, 0.952348, 0, 1, 0, -0.952348, 0, -0.305014, 16.3998, 1.5475, -16.7259) @@ -111,7 +121,7 @@ transform = Transform3D(0.104667, 0, 0.994507, 0, 1, 0, -0.994507, 0, 0.104667, transform = Transform3D(0.771057, 0, -0.213239, 0, 0.8, 0, 0.213239, 0, 0.771057, 16.0198, 1, -11.7658) [node name="Cube5" parent="." instance=ExtResource("11_58enu")] -transform = Transform3D(0.963821, 0, -0.266549, 0, 1, 0, 0.266549, 0, 0.963821, 15.803, 1.06591, -12.4705) +transform = Transform3D(-0.986589, 0, 0.163223, 0, 1, 0, -0.163223, 0, -0.986589, 15.803, 1.06591, -12.4705) [node name="ComputerScreen4" parent="." instance=ExtResource("12_djkgb")] transform = Transform3D(0.119617, 0, 0.99282, 0, 1, 0, -0.99282, 0, 0.119617, 16.3315, 1.5475, -12.241) @@ -119,6 +129,15 @@ transform = Transform3D(0.119617, 0, 0.99282, 0, 1, 0, -0.99282, 0, 0.119617, 16 [node name="Cube6" parent="." instance=ExtResource("14_8trno")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.2262, 1.17853, -15.8474) +[node name="Cube13" parent="." instance=ExtResource("14_8trno")] +transform = Transform3D(0.925996, 0, -0.377534, 0, 1, 0, 0.377534, 0, 0.925996, 16.0562, 1.17853, -15.7304) + +[node name="Cube14" parent="." instance=ExtResource("14_8trno")] +transform = Transform3D(0.925996, 0, -0.377534, 0, 1, 0, 0.377534, 0, 0.925996, 16.3649, 1.17853, -15.6549) + +[node name="Cube15" parent="." instance=ExtResource("14_8trno")] +transform = Transform3D(0.925996, 0, -0.377534, 0, 1, 0, 0.377534, 0, 0.925996, 16.117, 1.17853, -15.4098) + [node name="Area3D" parent="." instance=ExtResource("15_0vmxp")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.431601, 1.81218, 19.1515) @@ -163,6 +182,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.041, 1, -12.067) [node name="Froggy" parent="." instance=ExtResource("18_stcip")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 0.676921, -15) +[node name="Vent" parent="." instance=ExtResource("19_x46pd")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.7899, 2.27504, -14.05) + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(-3.0598e-08, 0, -1, 0, 0.6, 0, 0.7, 0, -4.37114e-08, 16.7784, 2.26605, -14.0525) +mesh = SubResource("QuadMesh_ylyva") + +[node name="Rug" type="MeshInstance3D" parent="."] +transform = Transform3D(0.14162, 0, 0.703433, 0, 0.717547, 0, -0.703433, 0, 0.14162, 11.2356, 0, -14.7105) +mesh = ExtResource("20_4l88e") +skeleton = NodePath("../interior2/Ground") +surface_material_override/0 = ExtResource("21_4nrng") + [editable path="interior2"] [editable path="ComputerScreen2"] [editable path="Area3D"] diff --git a/scenes/levels/lvl_3.tscn b/scenes/levels/lvl_3.tscn index aedd94e..496c7e5 100644 --- a/scenes/levels/lvl_3.tscn +++ b/scenes/levels/lvl_3.tscn @@ -1,16 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://b4ofkr6mkwh6b"] +[gd_scene load_steps=5 format=3 uid="uid://b4ofkr6mkwh6b"] -[ext_resource type="PackedScene" uid="uid://ddwkhfly2xyyt" path="res://assets/models/interior.obj" id="1_o2dcb"] -[ext_resource type="Material" uid="uid://1w6e5sx6poff" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare.material" id="2_35w8n"] -[ext_resource type="Material" uid="uid://du8w0x0kmgjui" path="res://assets/textures/material/bricks/bricks.tres" id="3_ots23"] -[ext_resource type="Material" uid="uid://bg5hb1744y4ik" path="res://assets/textures/material/planks/planks.material" id="4_6h3ie"] -[ext_resource type="Material" uid="uid://c6rvbga7g5f4l" path="res://assets/textures/material/tiles_white/tiles_white.material" id="5_kpr5l"] +[ext_resource type="PackedScene" uid="uid://uj3gy5jen0gn" path="res://assets/models/interior3.obj" id="1_go0ef"] +[ext_resource type="PackedScene" uid="uid://0l85runj5xs6" path="res://scenes/objects/physics_objects/plank.tscn" id="4_ytoi1"] [ext_resource type="PackedScene" uid="uid://gg5ph541e4p3" path="res://scenes/player.tscn" id="6_6mqu6"] -[ext_resource type="PackedScene" uid="uid://ced2w03t8er5k" path="res://scenes/objects/physics_objects/cube.tscn" id="10_7eyfc"] [ext_resource type="PackedScene" uid="uid://d2rmg0r1hircj" path="res://scenes/level_finish_area.tscn" id="20_andv2"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_thqbu"] - [node name="LVL1" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1) @@ -19,51 +13,20 @@ transform = Transform3D(0.707107, -0.707107, -4.21468e-08, -0.5, -0.5, 0.707107, directional_shadow_blend_splits = true sky_mode = 1 -[node name="interior" parent="." instance=ExtResource("1_o2dcb")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0) +[node name="interior3" parent="." instance=ExtResource("1_go0ef")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, -1) -[node name="Ground1" parent="interior" index="0"] -surface_material_override/0 = ExtResource("2_35w8n") - -[node name="StaticBody3D" parent="interior/Ground1" index="0"] -collision_layer = 7 -collision_mask = 7 - -[node name="Walls2" parent="interior" index="1"] -surface_material_override/0 = ExtResource("3_ots23") - -[node name="StaticBody3D" parent="interior/Walls2" index="0"] -collision_layer = 7 -collision_mask = 7 - -[node name="Ground2" parent="interior" index="2"] -surface_material_override/0 = ExtResource("4_6h3ie") - -[node name="StaticBody3D" parent="interior/Ground2" index="0"] -collision_layer = 7 -collision_mask = 7 - -[node name="Walls1" parent="interior" index="3"] -surface_material_override/0 = ExtResource("5_kpr5l") - -[node name="StaticBody3D" parent="interior/Walls1" index="0"] -collision_layer = 7 -collision_mask = 7 - -[node name="Ceiling" parent="interior" index="4"] -surface_material_override/0 = SubResource("StandardMaterial3D_thqbu") - -[node name="StaticBody3D" parent="interior/Ceiling" index="0"] +[node name="StaticBody3D" parent="interior3/Cube" index="0"] collision_layer = 7 collision_mask = 7 [node name="Player" parent="." instance=ExtResource("6_6mqu6")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 5.7209) -[node name="Cube" parent="." instance=ExtResource("10_7eyfc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.51, 0) - [node name="Area3D" parent="." instance=ExtResource("20_andv2")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.318473, 2, 10.63) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.681527, 2, 10.63) -[editable path="interior"] +[node name="Plank" parent="." instance=ExtResource("4_ytoi1")] +transform = Transform3D(0.0605154, -0.611886, 0.788628, 0.0468155, 0.790946, 0.610092, -0.997069, 0, 0.0765102, 8.48353, 1.80933, 0.0262713) + +[editable path="interior3"] diff --git a/scenes/objects/physics_objects/bottle.gdshader b/scenes/objects/physics_objects/bottle.gdshader new file mode 100644 index 0000000..dd66690 --- /dev/null +++ b/scenes/objects/physics_objects/bottle.gdshader @@ -0,0 +1,14 @@ +shader_type spatial; + +void vertex() { + // Called for every vertex the material is visible on. +} + +void fragment() { + // Called for every pixel the material is visible on. +} + +//void light() { + // Called for every pixel for every light affecting the material. + // Uncomment to replace the default light processing function with this one. +//} diff --git a/scenes/objects/physics_objects/bottle.tscn b/scenes/objects/physics_objects/bottle.tscn index effc58d..c5cda6d 100644 --- a/scenes/objects/physics_objects/bottle.tscn +++ b/scenes/objects/physics_objects/bottle.tscn @@ -1,20 +1,14 @@ -[gd_scene load_steps=6 format=3 uid="uid://idxtvhvxccgl"] +[gd_scene load_steps=5 format=3 uid="uid://idxtvhvxccgl"] [ext_resource type="ArrayMesh" uid="uid://c7i8bpqtest8q" path="res://assets/models/bottle.obj" id="1_pj6wy"] -[ext_resource type="Shader" path="res://shaders/pbr_glass.gdshader" id="2_nc55p"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_rff84"] rough = true bounce = 0.1 absorbent = true -[sub_resource type="ShaderMaterial" id="ShaderMaterial_dus7y"] -render_priority = 0 -shader = ExtResource("2_nc55p") -shader_parameter/albedo = Color(0.2, 0.0470588, 0, 0.631373) -shader_parameter/roughness = 0.15 -shader_parameter/normal_strength = 1.0 -shader_parameter/edge_color = Color(0, 0, 0, 1) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_514sr"] +albedo_color = Color(0.243137, 0.0901961, 0, 0.831373) [sub_resource type="BoxShape3D" id="BoxShape3D_bsmvc"] size = Vector3(0.15, 0.5, 0.15) @@ -28,7 +22,7 @@ continuous_cd = true [node name="MeshInstance3D" type="MeshInstance3D" parent="."] transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) mesh = ExtResource("1_pj6wy") -surface_material_override/0 = SubResource("ShaderMaterial_dus7y") +surface_material_override/0 = SubResource("StandardMaterial3D_514sr") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.168721, 0) diff --git a/scenes/objects/physics_objects/lamp.tscn b/scenes/objects/physics_objects/lamp.tscn new file mode 100644 index 0000000..59da641 --- /dev/null +++ b/scenes/objects/physics_objects/lamp.tscn @@ -0,0 +1,46 @@ +[gd_scene load_steps=7 format=3 uid="uid://jpjth6qixuym"] + +[ext_resource type="ArrayMesh" uid="uid://c3whx2k0x3txk" path="res://assets/models/ceiling_lamp.obj" id="1_v7x4v"] +[ext_resource type="Material" uid="uid://wi5k6axixuwr" path="res://assets/materials/metal.material" id="2_yfdrc"] + +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_rff84"] +rough = true +bounce = 0.1 +absorbent = true + +[sub_resource type="GDScript" id="GDScript_y1mpp"] +script/source = "extends RigidBody3D + +@onready var mesh: MeshInstance3D = $MeshInstance3D + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(_delta: float) -> void: + if !freeze: + mesh.set_surface_override_material(1,preload(\"res://resources/light_bulb_off.tres\")) +" + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nuagc"] +emission_enabled = true +emission = Color(1, 1, 0, 1) +emission_energy_multiplier = 16.0 + +[sub_resource type="BoxShape3D" id="BoxShape3D_bsmvc"] +size = Vector3(1.17546, 0.681323, 1.19681) + +[node name="CeilingLamp" type="RigidBody3D" groups=["pushables"]] +collision_priority = 2.0 +mass = 1.5 +physics_material_override = SubResource("PhysicsMaterial_rff84") +freeze = true +continuous_cd = true +script = SubResource("GDScript_y1mpp") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 0, 0) +mesh = ExtResource("1_v7x4v") +surface_material_override/0 = ExtResource("2_yfdrc") +surface_material_override/1 = SubResource("StandardMaterial3D_nuagc") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00848395, 0.31488, 0.0030334) +shape = SubResource("BoxShape3D_bsmvc") diff --git a/scenes/objects/physics_objects/plank.tscn b/scenes/objects/physics_objects/plank.tscn new file mode 100644 index 0000000..f105875 --- /dev/null +++ b/scenes/objects/physics_objects/plank.tscn @@ -0,0 +1,43 @@ +[gd_scene load_steps=10 format=3 uid="uid://0l85runj5xs6"] + +[ext_resource type="Texture2D" uid="uid://2vf1arfpjpls" path="res://assets/textures/material/light_planks/light_planks_color.png" id="1_csx1h"] +[ext_resource type="Texture2D" uid="uid://bo5iehmqthkeu" path="res://assets/textures/material/light_planks/light_planks_ambientocclusion.png" id="2_lkemc"] +[ext_resource type="Texture2D" uid="uid://cyklcrww6x6ll" path="res://assets/textures/material/light_planks/light_planks_metalness.png" id="3_dm1q2"] +[ext_resource type="Texture2D" uid="uid://puhr4gxfrfep" path="res://assets/textures/material/light_planks/light_planks_normalgl.png" id="4_3bt2i"] +[ext_resource type="Texture2D" uid="uid://btaq3y61uc4pm" path="res://assets/textures/material/light_planks/light_planks_roughness.png" id="5_btl8m"] + +[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_rff84"] +rough = true +bounce = 0.1 +absorbent = true + +[sub_resource type="BoxMesh" id="BoxMesh_qx6i0"] +size = Vector3(1, 0.05, 6) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0kjst"] +albedo_texture = ExtResource("1_csx1h") +metallic = 1.0 +metallic_texture = ExtResource("3_dm1q2") +roughness_texture = ExtResource("5_btl8m") +normal_enabled = true +normal_scale = 3.0 +normal_texture = ExtResource("4_3bt2i") +ao_enabled = true +ao_texture = ExtResource("2_lkemc") +uv1_scale = Vector3(10, 10, 10) + +[sub_resource type="BoxShape3D" id="BoxShape3D_bsmvc"] +size = Vector3(1, 0.05, 6) + +[node name="Plank" type="RigidBody3D" groups=["pushables"]] +collision_priority = 2.0 +mass = 1.5 +physics_material_override = SubResource("PhysicsMaterial_rff84") +continuous_cd = true + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +mesh = SubResource("BoxMesh_qx6i0") +surface_material_override/0 = SubResource("StandardMaterial3D_0kjst") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("BoxShape3D_bsmvc") diff --git a/scripts/autoloads/music_manager.gd b/scripts/autoloads/music_manager.gd index 2166514..af71cd8 100644 --- a/scripts/autoloads/music_manager.gd +++ b/scripts/autoloads/music_manager.gd @@ -10,6 +10,7 @@ func _on_level_switched() -> void: print(get_tree().current_scene.name) match get_tree().current_scene.name: "MainMenu": + await get_tree().create_timer(.4).timeout soundeffect.play_key("main") "LVL1": soundeffect.play_key("lvl1") diff --git a/unimported-models/cola_machine.blend b/unimported-models/cola_machine.blend index 40694ae..611b4d6 100644 Binary files a/unimported-models/cola_machine.blend and b/unimported-models/cola_machine.blend differ diff --git a/unimported-models/cola_machine.blend1 b/unimported-models/cola_machine.blend1 index 1788fa7..2180837 100644 Binary files a/unimported-models/cola_machine.blend1 and b/unimported-models/cola_machine.blend1 differ diff --git a/unimported-models/interior.blend b/unimported-models/interior.blend index cb41eb4..3d91d68 100644 Binary files a/unimported-models/interior.blend and b/unimported-models/interior.blend differ diff --git a/unimported-models/interior.blend1 b/unimported-models/interior.blend1 index ed7e96e..cb41eb4 100644 Binary files a/unimported-models/interior.blend1 and b/unimported-models/interior.blend1 differ diff --git a/unimported-models/interior3.blend b/unimported-models/interior3.blend new file mode 100644 index 0000000..5419a1b Binary files /dev/null and b/unimported-models/interior3.blend differ diff --git a/unimported-models/interior3.blend1 b/unimported-models/interior3.blend1 new file mode 100644 index 0000000..773045e Binary files /dev/null and b/unimported-models/interior3.blend1 differ diff --git a/unimported-models/rug.blend b/unimported-models/rug.blend new file mode 100644 index 0000000..e0ac110 Binary files /dev/null and b/unimported-models/rug.blend differ