From db9f4fa44e3c38dd3f97bd9ee29a9db923f4aa34 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Fri, 17 Jan 2025 10:48:59 +0100 Subject: [PATCH] WIP: Some nonsense stuff --- .../dark/texture_02.png.import | 13 ++-- .../dark/texture_03.png.import | 13 ++-- .../dark/texture_06.png.import | 13 ++-- .../dark/texture_07.png.import | 13 ++-- .../dark/texture_08.png.import | 13 ++-- .../dark/texture_09.png.import | 13 ++-- .../dark/texture_10.png.import | 13 ++-- .../dark/texture_11.png.import | 13 ++-- .../dark/texture_12.png.import | 13 ++-- .../green/texture_02.png.import | 13 ++-- .../light/texture_01.png.import | 13 ++-- .../purple/texture_02.png.import | 13 ++-- .../textures/Ch02_1001_Diffuse.png.import | 13 ++-- .../textures/Ch02_1001_Glossiness.png.import | 13 ++-- .../textures/Ch02_1001_Normal.png.import | 19 +++--- .../textures/Ch02_1002_Diffuse.png.import | 13 ++-- .../textures/Ch02_1002_Normal.png.import | 19 +++--- scenes/maps/test_map.tscn | 66 ++++++++++++++----- scenes/utils/body.tscn | 24 +++---- scenes/utils/character.tscn | 1 + scripts/character_controller.gd | 4 +- 21 files changed, 188 insertions(+), 140 deletions(-) diff --git a/addons/kenney_prototype_textures/dark/texture_02.png.import b/addons/kenney_prototype_textures/dark/texture_02.png.import index eab9268..b1e82df 100644 --- a/addons/kenney_prototype_textures/dark/texture_02.png.import +++ b/addons/kenney_prototype_textures/dark/texture_02.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bawho1fs8uowk" -path="res://.godot/imported/texture_02.png-814d4f515892bb8274d285748f4a73a0.ctex" +path.s3tc="res://.godot/imported/texture_02.png-814d4f515892bb8274d285748f4a73a0.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_02.png" -dest_files=["res://.godot/imported/texture_02.png-814d4f515892bb8274d285748f4a73a0.ctex"] +dest_files=["res://.godot/imported/texture_02.png-814d4f515892bb8274d285748f4a73a0.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/dark/texture_03.png.import b/addons/kenney_prototype_textures/dark/texture_03.png.import index 1d27c3c..6ffa424 100644 --- a/addons/kenney_prototype_textures/dark/texture_03.png.import +++ b/addons/kenney_prototype_textures/dark/texture_03.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://kijtpalgio4q" -path="res://.godot/imported/texture_03.png-eef45c22e5a84c5df22e7f80e41112c6.ctex" +path.s3tc="res://.godot/imported/texture_03.png-eef45c22e5a84c5df22e7f80e41112c6.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_03.png" -dest_files=["res://.godot/imported/texture_03.png-eef45c22e5a84c5df22e7f80e41112c6.ctex"] +dest_files=["res://.godot/imported/texture_03.png-eef45c22e5a84c5df22e7f80e41112c6.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/dark/texture_06.png.import b/addons/kenney_prototype_textures/dark/texture_06.png.import index 8eb25dd..8d1dc4f 100644 --- a/addons/kenney_prototype_textures/dark/texture_06.png.import +++ b/addons/kenney_prototype_textures/dark/texture_06.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://du0f7hc4skged" -path="res://.godot/imported/texture_06.png-004ed3d5b88361cdfb83a20714e917e7.ctex" +path.s3tc="res://.godot/imported/texture_06.png-004ed3d5b88361cdfb83a20714e917e7.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_06.png" -dest_files=["res://.godot/imported/texture_06.png-004ed3d5b88361cdfb83a20714e917e7.ctex"] +dest_files=["res://.godot/imported/texture_06.png-004ed3d5b88361cdfb83a20714e917e7.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/dark/texture_07.png.import b/addons/kenney_prototype_textures/dark/texture_07.png.import index b40c4ba..66f733e 100644 --- a/addons/kenney_prototype_textures/dark/texture_07.png.import +++ b/addons/kenney_prototype_textures/dark/texture_07.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bg7hbu285xx3c" -path="res://.godot/imported/texture_07.png-7c77ff22e41b4a54319073cb71530d81.ctex" +path.s3tc="res://.godot/imported/texture_07.png-7c77ff22e41b4a54319073cb71530d81.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_07.png" -dest_files=["res://.godot/imported/texture_07.png-7c77ff22e41b4a54319073cb71530d81.ctex"] +dest_files=["res://.godot/imported/texture_07.png-7c77ff22e41b4a54319073cb71530d81.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/dark/texture_08.png.import b/addons/kenney_prototype_textures/dark/texture_08.png.import index 53b923a..4cf77b0 100644 --- a/addons/kenney_prototype_textures/dark/texture_08.png.import +++ b/addons/kenney_prototype_textures/dark/texture_08.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://o0rxfy5dvpsb" -path="res://.godot/imported/texture_08.png-5883ddd047173c8b118ead887054e6fc.ctex" +path.s3tc="res://.godot/imported/texture_08.png-5883ddd047173c8b118ead887054e6fc.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_08.png" -dest_files=["res://.godot/imported/texture_08.png-5883ddd047173c8b118ead887054e6fc.ctex"] +dest_files=["res://.godot/imported/texture_08.png-5883ddd047173c8b118ead887054e6fc.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/dark/texture_09.png.import b/addons/kenney_prototype_textures/dark/texture_09.png.import index 6ada7a7..81c72f1 100644 --- a/addons/kenney_prototype_textures/dark/texture_09.png.import +++ b/addons/kenney_prototype_textures/dark/texture_09.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://cxj3qslcw455r" -path="res://.godot/imported/texture_09.png-8e25cd5657e2d326068eb27bfa1aacec.ctex" +path.s3tc="res://.godot/imported/texture_09.png-8e25cd5657e2d326068eb27bfa1aacec.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_09.png" -dest_files=["res://.godot/imported/texture_09.png-8e25cd5657e2d326068eb27bfa1aacec.ctex"] +dest_files=["res://.godot/imported/texture_09.png-8e25cd5657e2d326068eb27bfa1aacec.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/dark/texture_10.png.import b/addons/kenney_prototype_textures/dark/texture_10.png.import index fd7c986..53c3f21 100644 --- a/addons/kenney_prototype_textures/dark/texture_10.png.import +++ b/addons/kenney_prototype_textures/dark/texture_10.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://n25a1tlc20r2" -path="res://.godot/imported/texture_10.png-1e788999a192eabd201c3b3435475799.ctex" +path.s3tc="res://.godot/imported/texture_10.png-1e788999a192eabd201c3b3435475799.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_10.png" -dest_files=["res://.godot/imported/texture_10.png-1e788999a192eabd201c3b3435475799.ctex"] +dest_files=["res://.godot/imported/texture_10.png-1e788999a192eabd201c3b3435475799.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/dark/texture_11.png.import b/addons/kenney_prototype_textures/dark/texture_11.png.import index e57d8a2..c32fe65 100644 --- a/addons/kenney_prototype_textures/dark/texture_11.png.import +++ b/addons/kenney_prototype_textures/dark/texture_11.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://ciwwbgcpode0d" -path="res://.godot/imported/texture_11.png-f61ad46caf1a41d85454e490ec43c8ec.ctex" +path.s3tc="res://.godot/imported/texture_11.png-f61ad46caf1a41d85454e490ec43c8ec.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_11.png" -dest_files=["res://.godot/imported/texture_11.png-f61ad46caf1a41d85454e490ec43c8ec.ctex"] +dest_files=["res://.godot/imported/texture_11.png-f61ad46caf1a41d85454e490ec43c8ec.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/dark/texture_12.png.import b/addons/kenney_prototype_textures/dark/texture_12.png.import index 1f7bb79..504e71c 100644 --- a/addons/kenney_prototype_textures/dark/texture_12.png.import +++ b/addons/kenney_prototype_textures/dark/texture_12.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dsf0exq5n4glb" -path="res://.godot/imported/texture_12.png-aa893b2c5354267551e55ec14bb1999b.ctex" +path.s3tc="res://.godot/imported/texture_12.png-aa893b2c5354267551e55ec14bb1999b.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/dark/texture_12.png" -dest_files=["res://.godot/imported/texture_12.png-aa893b2c5354267551e55ec14bb1999b.ctex"] +dest_files=["res://.godot/imported/texture_12.png-aa893b2c5354267551e55ec14bb1999b.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/green/texture_02.png.import b/addons/kenney_prototype_textures/green/texture_02.png.import index 455147d..7b4c3f1 100644 --- a/addons/kenney_prototype_textures/green/texture_02.png.import +++ b/addons/kenney_prototype_textures/green/texture_02.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://yg2714dns88k" -path="res://.godot/imported/texture_02.png-aa1bb055b55bdc7c20e196b7286eebdf.ctex" +path.s3tc="res://.godot/imported/texture_02.png-aa1bb055b55bdc7c20e196b7286eebdf.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/green/texture_02.png" -dest_files=["res://.godot/imported/texture_02.png-aa1bb055b55bdc7c20e196b7286eebdf.ctex"] +dest_files=["res://.godot/imported/texture_02.png-aa1bb055b55bdc7c20e196b7286eebdf.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/light/texture_01.png.import b/addons/kenney_prototype_textures/light/texture_01.png.import index d5718ff..4232cf2 100644 --- a/addons/kenney_prototype_textures/light/texture_01.png.import +++ b/addons/kenney_prototype_textures/light/texture_01.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dkaygit5l83nq" -path="res://.godot/imported/texture_01.png-e10423e44834e1b4a90c3134e446b32d.ctex" +path.s3tc="res://.godot/imported/texture_01.png-e10423e44834e1b4a90c3134e446b32d.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/light/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-e10423e44834e1b4a90c3134e446b32d.ctex"] +dest_files=["res://.godot/imported/texture_01.png-e10423e44834e1b4a90c3134e446b32d.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/addons/kenney_prototype_textures/purple/texture_02.png.import b/addons/kenney_prototype_textures/purple/texture_02.png.import index 34e4e69..320c1f5 100644 --- a/addons/kenney_prototype_textures/purple/texture_02.png.import +++ b/addons/kenney_prototype_textures/purple/texture_02.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dx31pblshvnjw" -path="res://.godot/imported/texture_02.png-fcb52d424cd62d43221e4153fa3176f8.ctex" +path.s3tc="res://.godot/imported/texture_02.png-fcb52d424cd62d43221e4153fa3176f8.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://addons/kenney_prototype_textures/purple/texture_02.png" -dest_files=["res://.godot/imported/texture_02.png-fcb52d424cd62d43221e4153fa3176f8.ctex"] +dest_files=["res://.godot/imported/texture_02.png-fcb52d424cd62d43221e4153fa3176f8.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/resources/blender/textures/Ch02_1001_Diffuse.png.import b/resources/blender/textures/Ch02_1001_Diffuse.png.import index f1fbe49..b00ed36 100644 --- a/resources/blender/textures/Ch02_1001_Diffuse.png.import +++ b/resources/blender/textures/Ch02_1001_Diffuse.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://b8pyp1wrao7g8" -path="res://.godot/imported/Ch02_1001_Diffuse.png-be8443a66fcdba335ccc626d3ee507e2.ctex" +path.s3tc="res://.godot/imported/Ch02_1001_Diffuse.png-be8443a66fcdba335ccc626d3ee507e2.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://resources/blender/textures/Ch02_1001_Diffuse.png" -dest_files=["res://.godot/imported/Ch02_1001_Diffuse.png-be8443a66fcdba335ccc626d3ee507e2.ctex"] +dest_files=["res://.godot/imported/Ch02_1001_Diffuse.png-be8443a66fcdba335ccc626d3ee507e2.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/resources/blender/textures/Ch02_1001_Glossiness.png.import b/resources/blender/textures/Ch02_1001_Glossiness.png.import index 2cec040..8ba56d1 100644 --- a/resources/blender/textures/Ch02_1001_Glossiness.png.import +++ b/resources/blender/textures/Ch02_1001_Glossiness.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dcyhsg2exug4j" -path="res://.godot/imported/Ch02_1001_Glossiness.png-311a15692f16ebafd2971310794de848.ctex" +path.s3tc="res://.godot/imported/Ch02_1001_Glossiness.png-311a15692f16ebafd2971310794de848.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://resources/blender/textures/Ch02_1001_Glossiness.png" -dest_files=["res://.godot/imported/Ch02_1001_Glossiness.png-311a15692f16ebafd2971310794de848.ctex"] +dest_files=["res://.godot/imported/Ch02_1001_Glossiness.png-311a15692f16ebafd2971310794de848.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/resources/blender/textures/Ch02_1001_Normal.png.import b/resources/blender/textures/Ch02_1001_Normal.png.import index 596d13d..5f06bf9 100644 --- a/resources/blender/textures/Ch02_1001_Normal.png.import +++ b/resources/blender/textures/Ch02_1001_Normal.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://cigrjs1blf1pf" -path="res://.godot/imported/Ch02_1001_Normal.png-f49aa32435644d57263d5929c7eb6574.ctex" +path.s3tc="res://.godot/imported/Ch02_1001_Normal.png-f49aa32435644d57263d5929c7eb6574.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://resources/blender/textures/Ch02_1001_Normal.png" -dest_files=["res://.godot/imported/Ch02_1001_Normal.png-f49aa32435644d57263d5929c7eb6574.ctex"] +dest_files=["res://.godot/imported/Ch02_1001_Normal.png-f49aa32435644d57263d5929c7eb6574.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://resources/blender/textures/Ch02_1001_Normal.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=1 +detect_3d/compress_to=0 diff --git a/resources/blender/textures/Ch02_1002_Diffuse.png.import b/resources/blender/textures/Ch02_1002_Diffuse.png.import index 49991cf..270721a 100644 --- a/resources/blender/textures/Ch02_1002_Diffuse.png.import +++ b/resources/blender/textures/Ch02_1002_Diffuse.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://yojjaplgldct" -path="res://.godot/imported/Ch02_1002_Diffuse.png-dd63e4bfbae61671584ae5f9722ea551.ctex" +path.s3tc="res://.godot/imported/Ch02_1002_Diffuse.png-dd63e4bfbae61671584ae5f9722ea551.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://resources/blender/textures/Ch02_1002_Diffuse.png" -dest_files=["res://.godot/imported/Ch02_1002_Diffuse.png-dd63e4bfbae61671584ae5f9722ea551.ctex"] +dest_files=["res://.godot/imported/Ch02_1002_Diffuse.png-dd63e4bfbae61671584ae5f9722ea551.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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/resources/blender/textures/Ch02_1002_Normal.png.import b/resources/blender/textures/Ch02_1002_Normal.png.import index de6fdcb..a59db3d 100644 --- a/resources/blender/textures/Ch02_1002_Normal.png.import +++ b/resources/blender/textures/Ch02_1002_Normal.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://d02x1naqnuxtd" -path="res://.godot/imported/Ch02_1002_Normal.png-5866a749dfca963f00bf1a6997545b7c.ctex" +path.s3tc="res://.godot/imported/Ch02_1002_Normal.png-5866a749dfca963f00bf1a6997545b7c.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://resources/blender/textures/Ch02_1002_Normal.png" -dest_files=["res://.godot/imported/Ch02_1002_Normal.png-5866a749dfca963f00bf1a6997545b7c.ctex"] +dest_files=["res://.godot/imported/Ch02_1002_Normal.png-5866a749dfca963f00bf1a6997545b7c.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://resources/blender/textures/Ch02_1002_Normal.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=1 +detect_3d/compress_to=0 diff --git a/scenes/maps/test_map.tscn b/scenes/maps/test_map.tscn index 84a05f4..893ea4b 100644 --- a/scenes/maps/test_map.tscn +++ b/scenes/maps/test_map.tscn @@ -1,23 +1,39 @@ -[gd_scene load_steps=9 format=3 uid="uid://hivk5ek6u887"] +[gd_scene load_steps=13 format=3 uid="uid://hivk5ek6u887"] -[ext_resource type="Texture2D" uid="uid://c5uytbu1wc1bq" path="res://addons/kenney_prototype_textures/orange/texture_09.png" id="1_llm1c"] -[ext_resource type="Texture2D" uid="uid://e4nd8b6f0tw7" path="res://addons/kenney_prototype_textures/dark/texture_04.png" id="2_k2arh"] +[ext_resource type="Texture2D" uid="uid://du0f7hc4skged" path="res://addons/kenney_prototype_textures/dark/texture_06.png" id="1_lae2b"] +[ext_resource type="Texture2D" uid="uid://dmge3tk7w0b1n" path="res://addons/kenney_prototype_textures/dark/texture_01.png" id="2_7newm"] [ext_resource type="PackedScene" uid="uid://ccm77j5rkh21w" path="res://scenes/utils/character.tscn" id="3_omcjn"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_llvtk"] -albedo_texture = ExtResource("1_llm1c") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bcdcw"] +albedo_texture = ExtResource("1_lae2b") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_50gm5"] -albedo_texture = ExtResource("2_k2arh") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_p4psn"] +albedo_texture = ExtResource("2_7newm") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_c334k"] -albedo_texture = ExtResource("2_k2arh") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0jiki"] +albedo_texture = ExtResource("2_7newm") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nlanx"] -albedo_texture = ExtResource("2_k2arh") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1pwnn"] +albedo_texture = ExtResource("2_7newm") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cjh6x"] -albedo_texture = ExtResource("2_k2arh") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1yo6k"] +albedo_texture = ExtResource("2_7newm") + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_3aaun"] + +[sub_resource type="Sky" id="Sky_xco2g"] +sky_material = SubResource("ProceduralSkyMaterial_3aaun") + +[sub_resource type="Environment" id="Environment_5t2t5"] +background_mode = 2 +sky = SubResource("Sky_xco2g") +sdfgi_enabled = true +fog_light_energy = 0.52 +fog_density = 0.1387 +volumetric_fog_enabled = true +volumetric_fog_density = 0.0 + +[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_32hnm"] [node name="TestMap" type="Node3D"] @@ -28,33 +44,47 @@ shadow_enabled = true [node name="Base" type="Node3D" parent="."] [node name="Floor" type="CSGBox3D" parent="Base"] -material_override = SubResource("StandardMaterial3D_llvtk") +material_override = SubResource("StandardMaterial3D_bcdcw") use_collision = true size = Vector3(100, 1, 100) [node name="Wall_1" type="CSGBox3D" parent="Base"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, 0) -material_override = SubResource("StandardMaterial3D_50gm5") +material_override = SubResource("StandardMaterial3D_p4psn") use_collision = true size = Vector3(1, 20, 100) [node name="Wall_2" type="CSGBox3D" parent="Base"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, 0) -material_override = SubResource("StandardMaterial3D_c334k") +material_override = SubResource("StandardMaterial3D_0jiki") use_collision = true size = Vector3(1, 20, 100) [node name="Wall_3" type="CSGBox3D" parent="Base"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 50) -material_override = SubResource("StandardMaterial3D_nlanx") +material_override = SubResource("StandardMaterial3D_1pwnn") use_collision = true size = Vector3(100, 20, 1) [node name="Wall_4" type="CSGBox3D" parent="Base"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -50) -material_override = SubResource("StandardMaterial3D_cjh6x") +material_override = SubResource("StandardMaterial3D_1yo6k") use_collision = true size = Vector3(100, 20, 1) [node name="Character" parent="." instance=ExtResource("3_omcjn")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.9816, 0, 28.0621) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_5t2t5") +camera_attributes = SubResource("CameraAttributesPractical_32hnm") + +[node name="Room" type="Node3D" parent="."] + +[node name="Roof" type="CSGBox3D" parent="Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 10, 40) +size = Vector3(20, 1, 20) + +[node name="Box" type="CSGBox3D" parent="Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 45.354, 2, 30) +size = Vector3(15, 4, 5) diff --git a/scenes/utils/body.tscn b/scenes/utils/body.tscn index 0b03238..e10b5f7 100644 --- a/scenes/utils/body.tscn +++ b/scenes/utils/body.tscn @@ -5,18 +5,18 @@ [node name="character" instance=ExtResource("1_ldvdo")] [node name="Skeleton3D" parent="Armature" index="0"] -bones/0/position = Vector3(0.278639, 0.0511704, -94.5392) +bones/0/position = Vector3(0.27864, 0.0511703, -94.5392) bones/0/rotation = Quaternion(-0.604149, -0.348807, 0.29163, 0.654439) bones/1/rotation = Quaternion(-0.0341781, 0.0566953, 0.0240948, 0.997515) -bones/2/rotation = Quaternion(0.0232735, 0.0685229, 0.00601569, 0.99736) -bones/3/rotation = Quaternion(0.0239388, 0.0686277, 0.00447139, 0.997345) -bones/4/rotation = Quaternion(0.160264, 0.0650182, -0.0283947, 0.984521) +bones/2/rotation = Quaternion(0.0232735, 0.0685228, 0.0060157, 0.99736) +bones/3/rotation = Quaternion(0.0239388, 0.0686278, 0.00447139, 0.997345) +bones/4/rotation = Quaternion(0.160264, 0.0650181, -0.0283947, 0.984521) bones/5/rotation = Quaternion(0.00615673, 0.173887, 0.0695452, 0.982288) bones/7/rotation = Quaternion(-0.573553, -0.410703, 0.634322, -0.316221) bones/8/position = Vector3(-5.17998e-07, 12.6417, 7.24198e-06) bones/8/rotation = Quaternion(0.172527, -0.218225, 0.436503, 0.855615) bones/9/position = Vector3(5.25072e-07, 21.8647, -1.64733e-06) -bones/9/rotation = Quaternion(0.0784446, -0.00225518, 0.650572, 0.755379) +bones/9/rotation = Quaternion(0.0784446, -0.00225524, 0.650572, 0.755379) bones/10/position = Vector3(-6.68945e-06, 25.0647, 1.19204e-06) bones/10/rotation = Quaternion(-0.166441, -0.334552, -0.373809, 0.848905) bones/11/rotation = Quaternion(0.0956501, -0.0429417, 0.168576, 0.980097) @@ -54,9 +54,9 @@ bones/29/rotation = Quaternion(0.273847, -0.000518838, -0.0143469, 0.961666) bones/30/position = Vector3(0.0139517, 2.09557, -1.09673e-05) bones/31/rotation = Quaternion(0.494488, -0.36288, 0.60222, 0.511009) bones/32/position = Vector3(4.22225e-06, 12.6416, -1.10171e-05) -bones/32/rotation = Quaternion(0.37955, 0.030041, -0.743407, 0.549896) +bones/32/rotation = Quaternion(0.37955, 0.0300409, -0.743407, 0.549896) bones/33/position = Vector3(-5.33444e-06, 21.8736, 5.47588e-06) -bones/33/rotation = Quaternion(0.0292596, 0.00337506, -0.249351, 0.967965) +bones/33/rotation = Quaternion(0.0292594, 0.00337502, -0.249351, 0.967965) bones/34/position = Vector3(7.18826e-06, 25.0758, -4.14478e-06) bones/34/rotation = Quaternion(-0.195169, 0.329259, 0.200115, 0.901916) bones/35/rotation = Quaternion(0.296356, -0.111756, -0.179233, 0.931429) @@ -93,10 +93,10 @@ bones/53/position = Vector3(0.0101426, 2.38341, 9.88739e-06) bones/53/rotation = Quaternion(0.436353, 0.00101625, 0.00774158, 0.899742) bones/54/position = Vector3(-0.0213175, 2.19929, 1.97887e-05) bones/55/rotation = Quaternion(0.126585, 0.224655, 0.950727, -0.17212) -bones/56/rotation = Quaternion(-0.243968, -0.0859721, -0.00367415, 0.965958) -bones/57/rotation = Quaternion(0.435122, -0.0653113, -0.00439505, 0.897989) +bones/56/rotation = Quaternion(-0.243967, -0.0859724, -0.00367405, 0.965958) +bones/57/rotation = Quaternion(0.435121, -0.0653114, -0.00439514, 0.897989) bones/58/rotation = Quaternion(0.351876, -0.0232251, 0.00873377, 0.935718) -bones/60/rotation = Quaternion(-0.124929, 0.0737928, 0.986052, 0.0815444) -bones/61/rotation = Quaternion(-0.156002, -0.0709137, 0.0190795, 0.985023) -bones/62/rotation = Quaternion(0.496513, 0.112741, 0.0299064, 0.860157) +bones/60/rotation = Quaternion(-0.124929, 0.0737917, 0.986052, 0.0815441) +bones/61/rotation = Quaternion(-0.156, -0.0709137, 0.0190794, 0.985024) +bones/62/rotation = Quaternion(0.496512, 0.112741, 0.0299064, 0.860157) bones/63/rotation = Quaternion(0.352338, 0.0234385, -0.00882726, 0.935538) diff --git a/scenes/utils/character.tscn b/scenes/utils/character.tscn index 6a3d2e7..56bb7f3 100644 --- a/scenes/utils/character.tscn +++ b/scenes/utils/character.tscn @@ -17,6 +17,7 @@ shape = SubResource("CylinderShape3D_1sre5") [node name="character" parent="CharacterBody3D" instance=ExtResource("2_2couv")] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) +visible = false [node name="UpperTorso" type="CSGSphere3D" parent="CharacterBody3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2734, 0) diff --git a/scripts/character_controller.gd b/scripts/character_controller.gd index 61d95a9..3d17592 100644 --- a/scripts/character_controller.gd +++ b/scripts/character_controller.gd @@ -34,8 +34,8 @@ func _unhandled_input(event: InputEvent) -> void: if mouse_captured: _rotate_camera() if Input.is_action_just_pressed("jump"): jumping = true if Input.is_action_just_pressed("exit"): get_tree().quit() - if Input.is_action_just_pressed("shot"): $Body/UpperTorso/Pistol.shot() - if Input.is_action_just_pressed("reload"): $Body/UpperTorso/Pistol.reload() + if Input.is_action_just_pressed("shot"): $UpperTorso/Pistol.shot() + if Input.is_action_just_pressed("reload"): $UpperTorso/Pistol.reload() func _physics_process(delta: float) -> void: