From 82f1ef5851159af982559cd81a150e0e204e12d0 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sat, 20 Jul 2024 17:07:17 -0600 Subject: [PATCH] Using textures --- .../concrete_layers_02.tres | 21 ++++++++++++++++ .../concrete_layers_02_ao_1k.png.import | 13 +++++----- .../concrete_layers_02_diff_1k.png.import | 13 +++++----- .../concrete_layers_02_disp_1k.png.import | 13 +++++----- .../concrete_layers_02_nor_gl_1k.png.import | 19 +++++++------- .../concrete_layers_02_rough_1k.png.import | 13 +++++----- .../textures/metal_plate_1k/metal_plate.tres | 25 +++++++++++++++++++ .../metal_plate_ao_1k.png.import | 13 +++++----- .../metal_plate_bump_1k.png.import | 19 +++++++------- .../metal_plate_diff_1k.png.import | 13 +++++----- .../metal_plate_disp_1k.png.import | 17 +++++++------ .../metal_plate_metal_1k.png.import | 13 +++++----- .../metal_plate_nor_gl_1k.png.import | 19 +++++++------- .../metal_plate_rough_1k.png.import | 13 +++++----- src/maps/arena_map/arena_map.tscn | 9 +++++-- src/player/player.tscn | 10 +++++--- 16 files changed, 154 insertions(+), 89 deletions(-) create mode 100644 assets/textures/concrete_layers_02_1k/concrete_layers_02.tres create mode 100644 assets/textures/metal_plate_1k/metal_plate.tres diff --git a/assets/textures/concrete_layers_02_1k/concrete_layers_02.tres b/assets/textures/concrete_layers_02_1k/concrete_layers_02.tres new file mode 100644 index 0000000..85ccf14 --- /dev/null +++ b/assets/textures/concrete_layers_02_1k/concrete_layers_02.tres @@ -0,0 +1,21 @@ +[gd_resource type="StandardMaterial3D" load_steps=6 format=3 uid="uid://cyih8ghc55qgx"] + +[ext_resource type="Texture2D" uid="uid://bmxj5usu08ulk" path="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_diff_1k.png" id="1_dp0gn"] +[ext_resource type="Texture2D" uid="uid://ce6hp0ggebj2m" path="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_ao_1k.png" id="2_yjbxk"] +[ext_resource type="Texture2D" uid="uid://b3imwe2c8pn6y" path="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_disp_1k.png" id="3_vgifc"] +[ext_resource type="Texture2D" uid="uid://b0xhblk6um6ju" path="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_nor_gl_1k.png" id="4_0exe6"] +[ext_resource type="Texture2D" uid="uid://be16ddpshi5x7" path="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_rough_1k.png" id="5_mkftr"] + +[resource] +albedo_texture = ExtResource("1_dp0gn") +metallic_specular = 0.1 +roughness_texture = ExtResource("5_mkftr") +normal_enabled = true +normal_texture = ExtResource("4_0exe6") +ao_enabled = true +ao_texture = ExtResource("2_yjbxk") +heightmap_enabled = true +heightmap_scale = 1.0 +heightmap_texture = ExtResource("3_vgifc") +subsurf_scatter_strength = 0.2 +uv1_scale = Vector3(25, 25, 25) diff --git a/assets/textures/concrete_layers_02_1k/concrete_layers_02_ao_1k.png.import b/assets/textures/concrete_layers_02_1k/concrete_layers_02_ao_1k.png.import index 89583cf..2109182 100644 --- a/assets/textures/concrete_layers_02_1k/concrete_layers_02_ao_1k.png.import +++ b/assets/textures/concrete_layers_02_1k/concrete_layers_02_ao_1k.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://ce6hp0ggebj2m" -path="res://.godot/imported/concrete_layers_02_ao_1k.png-1e85e3f90502ba1afee5fa72cfd7d36a.ctex" +path.s3tc="res://.godot/imported/concrete_layers_02_ao_1k.png-1e85e3f90502ba1afee5fa72cfd7d36a.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_ao_1k.png" -dest_files=["res://.godot/imported/concrete_layers_02_ao_1k.png-1e85e3f90502ba1afee5fa72cfd7d36a.ctex"] +dest_files=["res://.godot/imported/concrete_layers_02_ao_1k.png-1e85e3f90502ba1afee5fa72cfd7d36a.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/assets/textures/concrete_layers_02_1k/concrete_layers_02_diff_1k.png.import b/assets/textures/concrete_layers_02_1k/concrete_layers_02_diff_1k.png.import index 8ba3ac8..f42e548 100644 --- a/assets/textures/concrete_layers_02_1k/concrete_layers_02_diff_1k.png.import +++ b/assets/textures/concrete_layers_02_1k/concrete_layers_02_diff_1k.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bmxj5usu08ulk" -path="res://.godot/imported/concrete_layers_02_diff_1k.png-495f530e8048568d545b2fbcdd1d4e4a.ctex" +path.s3tc="res://.godot/imported/concrete_layers_02_diff_1k.png-495f530e8048568d545b2fbcdd1d4e4a.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_diff_1k.png" -dest_files=["res://.godot/imported/concrete_layers_02_diff_1k.png-495f530e8048568d545b2fbcdd1d4e4a.ctex"] +dest_files=["res://.godot/imported/concrete_layers_02_diff_1k.png-495f530e8048568d545b2fbcdd1d4e4a.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/assets/textures/concrete_layers_02_1k/concrete_layers_02_disp_1k.png.import b/assets/textures/concrete_layers_02_1k/concrete_layers_02_disp_1k.png.import index 8943228..bfcdb59 100644 --- a/assets/textures/concrete_layers_02_1k/concrete_layers_02_disp_1k.png.import +++ b/assets/textures/concrete_layers_02_1k/concrete_layers_02_disp_1k.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://b3imwe2c8pn6y" -path="res://.godot/imported/concrete_layers_02_disp_1k.png-42685dd6547bb48c12a2c2334052d068.ctex" +path.s3tc="res://.godot/imported/concrete_layers_02_disp_1k.png-42685dd6547bb48c12a2c2334052d068.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_disp_1k.png" -dest_files=["res://.godot/imported/concrete_layers_02_disp_1k.png-42685dd6547bb48c12a2c2334052d068.ctex"] +dest_files=["res://.godot/imported/concrete_layers_02_disp_1k.png-42685dd6547bb48c12a2c2334052d068.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/assets/textures/concrete_layers_02_1k/concrete_layers_02_nor_gl_1k.png.import b/assets/textures/concrete_layers_02_1k/concrete_layers_02_nor_gl_1k.png.import index 0a49d33..3df3b6e 100644 --- a/assets/textures/concrete_layers_02_1k/concrete_layers_02_nor_gl_1k.png.import +++ b/assets/textures/concrete_layers_02_1k/concrete_layers_02_nor_gl_1k.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://b0xhblk6um6ju" -path="res://.godot/imported/concrete_layers_02_nor_gl_1k.png-529943362f08789827ed4c20e96b7cad.ctex" +path.s3tc="res://.godot/imported/concrete_layers_02_nor_gl_1k.png-529943362f08789827ed4c20e96b7cad.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_nor_gl_1k.png" -dest_files=["res://.godot/imported/concrete_layers_02_nor_gl_1k.png-529943362f08789827ed4c20e96b7cad.ctex"] +dest_files=["res://.godot/imported/concrete_layers_02_nor_gl_1k.png-529943362f08789827ed4c20e96b7cad.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://assets/textures/concrete_layers_02_1k/concrete_layers_02_nor_gl_1k.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/assets/textures/concrete_layers_02_1k/concrete_layers_02_rough_1k.png.import b/assets/textures/concrete_layers_02_1k/concrete_layers_02_rough_1k.png.import index 109ab6b..5b4c1f5 100644 --- a/assets/textures/concrete_layers_02_1k/concrete_layers_02_rough_1k.png.import +++ b/assets/textures/concrete_layers_02_1k/concrete_layers_02_rough_1k.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://be16ddpshi5x7" -path="res://.godot/imported/concrete_layers_02_rough_1k.png-6da0d5e692e8a07a6b35e8fc06438334.ctex" +path.s3tc="res://.godot/imported/concrete_layers_02_rough_1k.png-6da0d5e692e8a07a6b35e8fc06438334.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/concrete_layers_02_1k/concrete_layers_02_rough_1k.png" -dest_files=["res://.godot/imported/concrete_layers_02_rough_1k.png-6da0d5e692e8a07a6b35e8fc06438334.ctex"] +dest_files=["res://.godot/imported/concrete_layers_02_rough_1k.png-6da0d5e692e8a07a6b35e8fc06438334.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/assets/textures/metal_plate_1k/metal_plate.tres b/assets/textures/metal_plate_1k/metal_plate.tres new file mode 100644 index 0000000..97eaf9b --- /dev/null +++ b/assets/textures/metal_plate_1k/metal_plate.tres @@ -0,0 +1,25 @@ +[gd_resource type="StandardMaterial3D" load_steps=7 format=3 uid="uid://7a1uvst7oef2"] + +[ext_resource type="Texture2D" uid="uid://40si8uxqvvv8" path="res://assets/textures/metal_plate_1k/metal_plate_diff_1k.png" id="1_w7t5t"] +[ext_resource type="Texture2D" uid="uid://dp61xi4jibwwi" path="res://assets/textures/metal_plate_1k/metal_plate_ao_1k.png" id="2_bve25"] +[ext_resource type="Texture2D" uid="uid://dixwulrgk25xi" path="res://assets/textures/metal_plate_1k/metal_plate_disp_1k.png" id="3_inw2l"] +[ext_resource type="Texture2D" uid="uid://b33p3igl6eax6" path="res://assets/textures/metal_plate_1k/metal_plate_metal_1k.png" id="4_esqwi"] +[ext_resource type="Texture2D" uid="uid://dl3o7s7iqq6sw" path="res://assets/textures/metal_plate_1k/metal_plate_nor_gl_1k.png" id="5_h46wr"] +[ext_resource type="Texture2D" uid="uid://2by2cxt2lpky" path="res://assets/textures/metal_plate_1k/metal_plate_rough_1k.png" id="6_owdob"] + +[resource] +albedo_color = Color(0.485703, 0.485704, 0.485703, 1) +albedo_texture = ExtResource("1_w7t5t") +metallic = 0.75 +metallic_specular = 1.0 +metallic_texture = ExtResource("4_esqwi") +roughness_texture = ExtResource("6_owdob") +normal_enabled = true +normal_texture = ExtResource("5_h46wr") +ao_enabled = true +ao_texture = ExtResource("2_bve25") +heightmap_enabled = true +heightmap_scale = 1.0 +heightmap_texture = ExtResource("3_inw2l") +proximity_fade_distance = 4.0 +distance_fade_max_distance = 4.0 diff --git a/assets/textures/metal_plate_1k/metal_plate_ao_1k.png.import b/assets/textures/metal_plate_1k/metal_plate_ao_1k.png.import index a36b6ff..a4d0ef7 100644 --- a/assets/textures/metal_plate_1k/metal_plate_ao_1k.png.import +++ b/assets/textures/metal_plate_1k/metal_plate_ao_1k.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dp61xi4jibwwi" -path="res://.godot/imported/metal_plate_ao_1k.png-e4b2668dcbe231a3e4ed2244157678fd.ctex" +path.s3tc="res://.godot/imported/metal_plate_ao_1k.png-e4b2668dcbe231a3e4ed2244157678fd.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/metal_plate_1k/metal_plate_ao_1k.png" -dest_files=["res://.godot/imported/metal_plate_ao_1k.png-e4b2668dcbe231a3e4ed2244157678fd.ctex"] +dest_files=["res://.godot/imported/metal_plate_ao_1k.png-e4b2668dcbe231a3e4ed2244157678fd.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/assets/textures/metal_plate_1k/metal_plate_bump_1k.png.import b/assets/textures/metal_plate_1k/metal_plate_bump_1k.png.import index fad1b42..ef8361f 100644 --- a/assets/textures/metal_plate_1k/metal_plate_bump_1k.png.import +++ b/assets/textures/metal_plate_1k/metal_plate_bump_1k.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://b08hlidov54im" -path="res://.godot/imported/metal_plate_bump_1k.png-f8ff79ee1d5e53e5ffaf32b9435b564d.ctex" +path.s3tc="res://.godot/imported/metal_plate_bump_1k.png-f8ff79ee1d5e53e5ffaf32b9435b564d.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/metal_plate_1k/metal_plate_bump_1k.png" -dest_files=["res://.godot/imported/metal_plate_bump_1k.png-f8ff79ee1d5e53e5ffaf32b9435b564d.ctex"] +dest_files=["res://.godot/imported/metal_plate_bump_1k.png-f8ff79ee1d5e53e5ffaf32b9435b564d.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://assets/textures/metal_plate_1k/metal_plate_bump_1k.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/assets/textures/metal_plate_1k/metal_plate_diff_1k.png.import b/assets/textures/metal_plate_1k/metal_plate_diff_1k.png.import index 3e41617..acae654 100644 --- a/assets/textures/metal_plate_1k/metal_plate_diff_1k.png.import +++ b/assets/textures/metal_plate_1k/metal_plate_diff_1k.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://40si8uxqvvv8" -path="res://.godot/imported/metal_plate_diff_1k.png-9bbaec30643d215423037efdd3471d77.ctex" +path.s3tc="res://.godot/imported/metal_plate_diff_1k.png-9bbaec30643d215423037efdd3471d77.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/metal_plate_1k/metal_plate_diff_1k.png" -dest_files=["res://.godot/imported/metal_plate_diff_1k.png-9bbaec30643d215423037efdd3471d77.ctex"] +dest_files=["res://.godot/imported/metal_plate_diff_1k.png-9bbaec30643d215423037efdd3471d77.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/assets/textures/metal_plate_1k/metal_plate_disp_1k.png.import b/assets/textures/metal_plate_1k/metal_plate_disp_1k.png.import index 824696d..d2476f6 100644 --- a/assets/textures/metal_plate_1k/metal_plate_disp_1k.png.import +++ b/assets/textures/metal_plate_1k/metal_plate_disp_1k.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://dixwulrgk25xi" -path="res://.godot/imported/metal_plate_disp_1k.png-68619e53e059c781a12c62f7d0dd5083.ctex" +path.s3tc="res://.godot/imported/metal_plate_disp_1k.png-68619e53e059c781a12c62f7d0dd5083.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/metal_plate_1k/metal_plate_disp_1k.png" -dest_files=["res://.godot/imported/metal_plate_disp_1k.png-68619e53e059c781a12c62f7d0dd5083.ctex"] +dest_files=["res://.godot/imported/metal_plate_disp_1k.png-68619e53e059c781a12c62f7d0dd5083.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="" +roughness/mode=7 +roughness/src_normal="res://assets/textures/metal_plate_1k/metal_plate_bump_1k.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/assets/textures/metal_plate_1k/metal_plate_metal_1k.png.import b/assets/textures/metal_plate_1k/metal_plate_metal_1k.png.import index bb4da69..ebb198f 100644 --- a/assets/textures/metal_plate_1k/metal_plate_metal_1k.png.import +++ b/assets/textures/metal_plate_1k/metal_plate_metal_1k.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://b33p3igl6eax6" -path="res://.godot/imported/metal_plate_metal_1k.png-aeaa0c452c2ad16da4e5b8bf5922dffe.ctex" +path.s3tc="res://.godot/imported/metal_plate_metal_1k.png-aeaa0c452c2ad16da4e5b8bf5922dffe.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/metal_plate_1k/metal_plate_metal_1k.png" -dest_files=["res://.godot/imported/metal_plate_metal_1k.png-aeaa0c452c2ad16da4e5b8bf5922dffe.ctex"] +dest_files=["res://.godot/imported/metal_plate_metal_1k.png-aeaa0c452c2ad16da4e5b8bf5922dffe.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/assets/textures/metal_plate_1k/metal_plate_nor_gl_1k.png.import b/assets/textures/metal_plate_1k/metal_plate_nor_gl_1k.png.import index b1e3f32..2b513f5 100644 --- a/assets/textures/metal_plate_1k/metal_plate_nor_gl_1k.png.import +++ b/assets/textures/metal_plate_1k/metal_plate_nor_gl_1k.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://dl3o7s7iqq6sw" -path="res://.godot/imported/metal_plate_nor_gl_1k.png-96fbf92551246f7b5f01238a57cd4ff8.ctex" +path.s3tc="res://.godot/imported/metal_plate_nor_gl_1k.png-96fbf92551246f7b5f01238a57cd4ff8.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/metal_plate_1k/metal_plate_nor_gl_1k.png" -dest_files=["res://.godot/imported/metal_plate_nor_gl_1k.png-96fbf92551246f7b5f01238a57cd4ff8.ctex"] +dest_files=["res://.godot/imported/metal_plate_nor_gl_1k.png-96fbf92551246f7b5f01238a57cd4ff8.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=8 +roughness/src_normal="res://assets/textures/metal_plate_1k/metal_plate_bump_1k.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/assets/textures/metal_plate_1k/metal_plate_rough_1k.png.import b/assets/textures/metal_plate_1k/metal_plate_rough_1k.png.import index 00f4f81..07b8549 100644 --- a/assets/textures/metal_plate_1k/metal_plate_rough_1k.png.import +++ b/assets/textures/metal_plate_1k/metal_plate_rough_1k.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://2by2cxt2lpky" -path="res://.godot/imported/metal_plate_rough_1k.png-43e95e43c96f9d9d03754d55aac08fb0.ctex" +path.s3tc="res://.godot/imported/metal_plate_rough_1k.png-43e95e43c96f9d9d03754d55aac08fb0.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/metal_plate_1k/metal_plate_rough_1k.png" -dest_files=["res://.godot/imported/metal_plate_rough_1k.png-43e95e43c96f9d9d03754d55aac08fb0.ctex"] +dest_files=["res://.godot/imported/metal_plate_rough_1k.png-43e95e43c96f9d9d03754d55aac08fb0.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/src/maps/arena_map/arena_map.tscn b/src/maps/arena_map/arena_map.tscn index 2011dd5..34a510b 100644 --- a/src/maps/arena_map/arena_map.tscn +++ b/src/maps/arena_map/arena_map.tscn @@ -1,6 +1,8 @@ -[gd_scene load_steps=9 format=3 uid="uid://drbiyuustse8b"] +[gd_scene load_steps=11 format=3 uid="uid://drbiyuustse8b"] [ext_resource type="PackedScene" uid="uid://bqp5mwyat3asv" path="res://src/player/player.tscn" id="1_tgee4"] +[ext_resource type="Material" uid="uid://7a1uvst7oef2" path="res://assets/textures/metal_plate_1k/metal_plate.tres" id="2_ewgwm"] +[ext_resource type="Material" uid="uid://cyih8ghc55qgx" path="res://assets/textures/concrete_layers_02_1k/concrete_layers_02.tres" id="2_mphn2"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_e4ffr"] sky_top_color = Color(1, 1, 1, 1) @@ -16,6 +18,7 @@ background_mode = 2 sky = SubResource("Sky_7lp20") [sub_resource type="CylinderMesh" id="CylinderMesh_uarav"] +material = ExtResource("2_mphn2") top_radius = 50.0 bottom_radius = 50.0 @@ -23,6 +26,8 @@ bottom_radius = 50.0 points = PackedVector3Array(0, -1, -50, -4.90407, -1, -49.7651, 0, 1, -50, 4.89428, -1, -49.7651, -4.90407, 1, -49.7651, -9.7592, -1, -49.0407, 4.89428, 1, -49.7651, 9.74941, -1, -49.0407, -9.7592, 1, -49.0407, -14.5164, -1, -47.8563, 9.74941, 1, -49.0407, 14.5067, -1, -47.8563, -14.5164, 1, -47.8563, -19.1366, -1, -46.202, 14.5067, 1, -47.8563, 19.1269, -1, -46.202, -19.1366, 1, -46.202, -23.5709, -1, -44.0975, 19.1269, 1, -46.202, 23.5611, -1, -44.0975, -23.5709, 1, -44.0975, -27.78, -1, -41.5818, 23.5611, 1, -44.0975, 27.7702, -1, -41.5818, -27.78, 1, -41.5818, -31.7247, -1, -38.6551, 27.7702, 1, -41.5818, 31.715, -1, -38.6551, -31.7247, 1, -38.6551, -35.3563, -1, -35.3563, 31.715, 1, -38.6551, 35.3465, -1, -35.3563, -35.3563, 1, -35.3563, -38.6551, -1, -31.7247, 35.3465, 1, -35.3563, 38.6453, -1, -31.7247, -38.6551, 1, -31.7247, -41.5818, -1, -27.78, 38.6453, 1, -31.7247, 41.572, -1, -27.78, -41.5818, 1, -27.78, -44.0975, -1, -23.5709, 41.572, 1, -27.78, 44.0877, -1, -23.5709, -44.0975, 1, -23.5709, -46.202, -1, -19.1366, 44.0877, 1, -23.5709, 46.1923, -1, -19.1366, -46.202, 1, -19.1366, -47.8563, -1, -14.5164, 46.1923, 1, -19.1366, 47.8465, -1, -14.5164, -47.8563, 1, -14.5164, -49.0407, -1, -9.7592, 47.8465, 1, -14.5164, 49.0309, -1, -9.7592, -49.0407, 1, -9.7592, -49.7651, -1, -4.90407, 49.0309, 1, -9.7592, 49.7553, -1, -4.90407, -49.7651, 1, -4.90407, -50, -1, 0, 49.7553, 1, -4.90407, 50, -1, 0, -50, 1, 0, -49.7651, -1, 4.89428, 50, 1, 0, 49.7553, -1, 4.89428, -49.7651, 1, 4.89428, -49.0407, -1, 9.74941, 49.7553, 1, 4.89428, 49.0309, -1, 9.74941, -49.0407, 1, 9.74941, -47.8563, -1, 14.5067, 49.0309, 1, 9.74941, 47.8465, -1, 14.5067, -47.8563, 1, 14.5067, -46.202, -1, 19.1269, 47.8465, 1, 14.5067, 46.1923, -1, 19.1269, -46.202, 1, 19.1269, -44.0975, -1, 23.5611, 46.1923, 1, 19.1269, 44.0877, -1, 23.5611, -44.0975, 1, 23.5611, -41.5818, -1, 27.7702, 44.0877, 1, 23.5611, 41.572, -1, 27.7702, -41.5818, 1, 27.7702, -38.6551, -1, 31.715, 41.572, 1, 27.7702, 38.6453, -1, 31.715, -38.6551, 1, 31.715, -35.3563, -1, 35.3465, 38.6453, 1, 31.715, 35.3465, -1, 35.3465, -35.3563, 1, 35.3465, -31.7247, -1, 38.6453, 35.3465, 1, 35.3465, 31.715, -1, 38.6453, -31.7247, 1, 38.6453, -27.78, -1, 41.572, 31.715, 1, 38.6453, 27.7702, -1, 41.572, -27.78, 1, 41.572, -23.5709, -1, 44.0877, 27.7702, 1, 41.572, 23.5611, -1, 44.0877, -23.5709, 1, 44.0877, -19.1366, -1, 46.1923, 23.5611, 1, 44.0877, 19.1269, -1, 46.1923, -19.1366, 1, 46.1923, -14.5164, -1, 47.8465, 19.1269, 1, 46.1923, 14.5067, -1, 47.8465, -14.5164, 1, 47.8465, -9.7592, -1, 49.0309, 14.5067, 1, 47.8465, 9.74941, -1, 49.0309, -9.7592, 1, 49.0309, -4.90407, -1, 49.7553, 9.74941, 1, 49.0309, 4.89428, -1, 49.7553, -4.90407, 1, 49.7553, 0, -1, 50, 4.89428, 1, 49.7553, 0, 1, 50) [sub_resource type="CylinderMesh" id="CylinderMesh_pfp3p"] +lightmap_size_hint = Vector2i(17, 19) +material = ExtResource("2_ewgwm") [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_oxcjq"] points = PackedVector3Array(-0.5, -1, 0, -0.497651, -1, -0.0490407, -0.497651, -1, 0.0489429, -0.5, 1, 0, -0.490407, -1, -0.097592, -0.497651, 1, -0.0490407, -0.490407, -1, 0.0974941, -0.497651, 1, 0.0489429, -0.478563, -1, -0.145164, -0.490407, 1, -0.097592, -0.478563, -1, 0.145067, -0.490407, 1, 0.0974941, -0.46202, -1, -0.191366, -0.478563, 1, -0.145164, -0.46202, -1, 0.191269, -0.478563, 1, 0.145067, -0.440975, -1, -0.235709, -0.46202, 1, -0.191366, -0.440975, -1, 0.235611, -0.46202, 1, 0.191269, -0.415818, -1, -0.2778, -0.440975, 1, -0.235709, -0.415818, -1, 0.277702, -0.440975, 1, 0.235611, -0.386551, -1, -0.317247, -0.415818, 1, -0.2778, -0.386551, -1, 0.31715, -0.415818, 1, 0.277702, -0.353563, -1, -0.353563, -0.386551, 1, -0.317247, -0.353563, -1, 0.353465, -0.386551, 1, 0.31715, -0.317247, -1, -0.386551, -0.353563, 1, -0.353563, -0.317247, -1, 0.386453, -0.353563, 1, 0.353465, -0.2778, -1, -0.415818, -0.317247, 1, -0.386551, -0.2778, -1, 0.41572, -0.317247, 1, 0.386453, -0.235709, -1, -0.440975, -0.2778, 1, -0.415818, -0.235709, -1, 0.440877, -0.2778, 1, 0.41572, -0.191366, -1, -0.46202, -0.235709, 1, -0.440975, -0.191366, -1, 0.461922, -0.235709, 1, 0.440877, -0.145164, -1, -0.478563, -0.191366, 1, -0.46202, -0.145164, -1, 0.478465, -0.191366, 1, 0.461922, -0.097592, -1, -0.490407, -0.145164, 1, -0.478563, -0.097592, -1, 0.490309, -0.145164, 1, 0.478465, -0.0490407, -1, -0.497651, -0.097592, 1, -0.490407, -0.0490407, -1, 0.497553, -0.097592, 1, 0.490309, 0, -1, -0.5, -0.0490407, 1, -0.497651, 0, -1, 0.5, -0.0490407, 1, 0.497553, 0.0489429, -1, -0.497651, 0, 1, -0.5, 0.0489429, -1, 0.497553, 0, 1, 0.5, 0.0974941, -1, -0.490407, 0.0489429, 1, -0.497651, 0.0974941, -1, 0.490309, 0.0489429, 1, 0.497553, 0.145067, -1, -0.478563, 0.0974941, 1, -0.490407, 0.145067, -1, 0.478465, 0.0974941, 1, 0.490309, 0.191269, -1, -0.46202, 0.145067, 1, -0.478563, 0.191269, -1, 0.461922, 0.145067, 1, 0.478465, 0.235611, -1, -0.440975, 0.191269, 1, -0.46202, 0.235611, -1, 0.440877, 0.191269, 1, 0.461922, 0.277702, -1, -0.415818, 0.235611, 1, -0.440975, 0.277702, -1, 0.41572, 0.235611, 1, 0.440877, 0.31715, -1, -0.386551, 0.277702, 1, -0.415818, 0.31715, -1, 0.386453, 0.277702, 1, 0.41572, 0.353465, -1, -0.353563, 0.31715, 1, -0.386551, 0.353465, -1, 0.353465, 0.31715, 1, 0.386453, 0.386453, -1, -0.317247, 0.353465, 1, -0.353563, 0.386453, -1, 0.31715, 0.353465, 1, 0.353465, 0.41572, -1, -0.2778, 0.386453, 1, -0.317247, 0.41572, -1, 0.277702, 0.386453, 1, 0.31715, 0.440877, -1, -0.235709, 0.41572, 1, -0.2778, 0.440877, -1, 0.235611, 0.41572, 1, 0.277702, 0.461922, -1, -0.191366, 0.440877, 1, -0.235709, 0.461922, -1, 0.191269, 0.440877, 1, 0.235611, 0.478465, -1, -0.145164, 0.461922, 1, -0.191366, 0.478465, -1, 0.145067, 0.461922, 1, 0.191269, 0.490309, -1, -0.097592, 0.478465, 1, -0.145164, 0.490309, -1, 0.0974941, 0.478465, 1, 0.145067, 0.497553, -1, -0.0490407, 0.490309, 1, -0.097592, 0.497553, -1, 0.0489429, 0.490309, 1, 0.0974941, 0.5, -1, 0, 0.497553, 1, -0.0490407, 0.497553, 1, 0.0489429, 0.5, 1, 0) @@ -38,7 +43,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) environment = SubResource("Environment_0cwcw") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="Environment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 50, 0) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 5, 0) [node name="WorldGeometry" type="Node3D" parent="."] diff --git a/src/player/player.tscn b/src/player/player.tscn index b8c10a2..68f8483 100644 --- a/src/player/player.tscn +++ b/src/player/player.tscn @@ -4,10 +4,13 @@ [ext_resource type="Texture2D" uid="uid://b0yefajw1cqo" path="res://assets/textures/character_placeholder.png" id="1_iys0p"] [ext_resource type="Script" path="res://src/player/third_person_camera.gd" id="3_gichr"] -[sub_resource type="CapsuleMesh" id="CapsuleMesh_8sedy"] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dd4i1"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ccqgr"] albedo_texture = ExtResource("1_iys0p") +distance_fade_mode = 2 +distance_fade_max_distance = 1.0 + +[sub_resource type="CapsuleMesh" id="CapsuleMesh_8sedy"] +material = SubResource("StandardMaterial3D_ccqgr") [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_otw5j"] @@ -19,7 +22,6 @@ script = ExtResource("1_h16ke") [node name="MeshInstance3D" type="MeshInstance3D" parent="Mesh"] mesh = SubResource("CapsuleMesh_8sedy") skeleton = NodePath("../..") -surface_material_override/0 = SubResource("StandardMaterial3D_dd4i1") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] shape = SubResource("CapsuleShape3D_otw5j")