diff --git a/Asset Sources/Maps/Materials/MaterialLibrary.blend b/Asset Sources/Maps/Materials/MaterialLibrary.blend deleted file mode 100644 index e37d34f..0000000 --- a/Asset Sources/Maps/Materials/MaterialLibrary.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84291dff0ddeaf2a9a5dd2e5cf1e36bfd097ade22438d7445449f38b0783a1fc -size 1835372 diff --git a/Asset Sources/Maps/Materials/dev_materials_blender/dev_materials.blend b/Asset Sources/Maps/Materials/dev_materials_blender/dev_materials.blend deleted file mode 100644 index 71b9a46..0000000 Binary files a/Asset Sources/Maps/Materials/dev_materials_blender/dev_materials.blend and /dev/null differ diff --git a/Asset Sources/Maps/Materials/AnimatedSmoke.ptex b/Asset Sources/Materials/AnimatedSmoke.ptex similarity index 100% rename from Asset Sources/Maps/Materials/AnimatedSmoke.ptex rename to Asset Sources/Materials/AnimatedSmoke.ptex diff --git a/Asset Sources/Maps/Materials/BrickWall_01.ptex b/Asset Sources/Materials/BrickWall_01.ptex similarity index 100% rename from Asset Sources/Maps/Materials/BrickWall_01.ptex rename to Asset Sources/Materials/BrickWall_01.ptex diff --git a/Asset Sources/Maps/Materials/BrickWall_01.ptex.mmcr b/Asset Sources/Materials/BrickWall_01.ptex.mmcr similarity index 100% rename from Asset Sources/Maps/Materials/BrickWall_01.ptex.mmcr rename to Asset Sources/Materials/BrickWall_01.ptex.mmcr diff --git a/Asset Sources/Maps/Materials/Concrete_Base.ptex b/Asset Sources/Materials/Concrete_Base.ptex similarity index 100% rename from Asset Sources/Maps/Materials/Concrete_Base.ptex rename to Asset Sources/Materials/Concrete_Base.ptex diff --git a/Asset Sources/Maps/Materials/Concrete_Wall.ptex b/Asset Sources/Materials/Concrete_Wall.ptex similarity index 100% rename from Asset Sources/Maps/Materials/Concrete_Wall.ptex rename to Asset Sources/Materials/Concrete_Wall.ptex diff --git a/Asset Sources/Maps/Materials/DecorationLight01.ptex b/Asset Sources/Materials/DecorationLight01.ptex similarity index 100% rename from Asset Sources/Maps/Materials/DecorationLight01.ptex rename to Asset Sources/Materials/DecorationLight01.ptex diff --git a/Asset Sources/Maps/Materials/Floor 01.ptex b/Asset Sources/Materials/Floor 01.ptex similarity index 100% rename from Asset Sources/Maps/Materials/Floor 01.ptex rename to Asset Sources/Materials/Floor 01.ptex diff --git a/Asset Sources/Maps/Materials/DevMaterials/DevMaterials.ptex b/Asset Sources/Materials/Maps/Dev/DevMaterials.ptex similarity index 100% rename from Asset Sources/Maps/Materials/DevMaterials/DevMaterials.ptex rename to Asset Sources/Materials/Maps/Dev/DevMaterials.ptex diff --git a/Asset Sources/Maps/Materials/DevMaterials/liblast.svg b/Asset Sources/Materials/Maps/Dev/liblast.svg similarity index 100% rename from Asset Sources/Maps/Materials/DevMaterials/liblast.svg rename to Asset Sources/Materials/Maps/Dev/liblast.svg diff --git a/Asset Sources/Materials/MaterialLibrary.blend b/Asset Sources/Materials/MaterialLibrary.blend new file mode 100644 index 0000000..82052aa --- /dev/null +++ b/Asset Sources/Materials/MaterialLibrary.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4e086b04570ba0ee92c5c1a1b4bd8dbce07c652fd6721614382ec7f01327a05 +size 1835372 diff --git a/Asset Sources/Maps/Materials/MetalGrating.ptex b/Asset Sources/Materials/MetalGrating.ptex similarity index 100% rename from Asset Sources/Maps/Materials/MetalGrating.ptex rename to Asset Sources/Materials/MetalGrating.ptex diff --git a/Asset Sources/Maps/Materials/MetalPanel.ptex b/Asset Sources/Materials/MetalPanel.ptex similarity index 100% rename from Asset Sources/Maps/Materials/MetalPanel.ptex rename to Asset Sources/Materials/MetalPanel.ptex diff --git a/Asset Sources/Maps/Materials/MetalPanel2.ptex b/Asset Sources/Materials/MetalPanel2.ptex similarity index 100% rename from Asset Sources/Maps/Materials/MetalPanel2.ptex rename to Asset Sources/Materials/MetalPanel2.ptex diff --git a/Asset Sources/Maps/Materials/Metal_Floor_01.ptex b/Asset Sources/Materials/Metal_Floor_01.ptex similarity index 100% rename from Asset Sources/Maps/Materials/Metal_Floor_01.ptex rename to Asset Sources/Materials/Metal_Floor_01.ptex diff --git a/Asset Sources/Materials/blender_assets.cats.txt b/Asset Sources/Materials/blender_assets.cats.txt new file mode 100644 index 0000000..2478a08 --- /dev/null +++ b/Asset Sources/Materials/blender_assets.cats.txt @@ -0,0 +1,9 @@ +# This is an Asset Catalog Definition file for Blender. +# +# Empty lines and lines starting with `#` will be ignored. +# The first non-ignored line should be the version indicator. +# Other lines are of the format "UUID:catalog/path/for/assets:simple catalog name" + +VERSION 1 + +35441d47-d39f-4ef6-a52e-28e12b514e5e:Map Materials:Map Materials diff --git a/Game/Assets/Maps/MapImporter.gd b/Game/Assets/Maps/MapImporter.gd new file mode 100644 index 0000000..4c6744e --- /dev/null +++ b/Game/Assets/Maps/MapImporter.gd @@ -0,0 +1,89 @@ +## Based on file: https://gist.github.com/AndreaCatania/afd01671e35e9d004d1d7a498fc0e2a3 (licensed under MIT) +## Modified for Liblast, relicensed under AGPL. +## +## This Post Import script automatically assign the +## material to the Mesh if it's found inside the +## `res://materials` directory. +## +## # How to use +## To you use it, you need to set this script as Post Import script +## on the file.fbx or file.glb. +## +## Your `materials` directory can look like: +## res://materials/iron_mat.material +## res://materials/glass_mat.tres +## res://materials/my_asset_kit_1/abc_mat.material +## res://materials/my_asset_kit_1/asd_mat.tres + +@tool +extends EditorScenePostImport + +const materials_dir = "res://Assets/Materials" + +func _post_process(scene): + print("Post import start") + ## Process the scene + apply_global_material(scene) + return scene + + +func apply_global_material(node): + if node == null: + return + + if node is MeshInstance3D: + for i in range(node.mesh.get_surface_count()): + # Extract the material name + var material_name = node.mesh.get("surface_" + str(i + 1) + "/name") + var mat = search_material(material_name) + if mat != null: + node.mesh.surface_set_material(i, mat) + print("Global material set for: ", material_name, " ", mat) + + for child in node.get_children(): + apply_global_material(child) + + +var materials: Dictionary = {} + +func search_material(material_name, base_dir = materials_dir) -> Material: + if materials.has(material_name): + return materials[material_name] + + return _search_material(material_name) + + +func _search_material(material_name, base_dir = materials_dir) -> Material: + var dir = Directory.new() + if dir.open(base_dir) == OK: + + # Search the file inside this directory + dir.list_dir_begin() + var file_name = dir.get_next() + while file_name != "": + if dir.current_is_dir() == false: + if file_name == material_name + ".tres" or file_name == material_name + ".material": + var mat: Material = load(base_dir + "/" + file_name) + if mat != null: + # This material is valid, cache it since it's likely it's reused. + materials[material_name] = mat + print("Material found: ", material_name, " in path: ", base_dir + "/" + file_name) + return mat + else: + print("IMPORT ERROR: The material ", material_name, " is found, but it's not valid material.") + file_name = dir.get_next() + dir.list_dir_end() + + # Search inside sub dirs now + dir.list_dir_begin() + file_name = dir.get_next() + while file_name != "": + if dir.current_is_dir() and file_name != "." and file_name != "..": + var mat = _search_material(material_name, base_dir + "/" + file_name) + if mat != null: + return mat + file_name = dir.get_next() + dir.list_dir_end() + + # Nothing found + return null diff --git a/Game/Assets/Materials/Dev/DevMaterial_orm.png.import b/Game/Assets/Materials/Dev/DevMaterial_orm.png.import deleted file mode 100644 index c281cbe..0000000 --- a/Game/Assets/Materials/Dev/DevMaterial_orm.png.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture2D" -uid="uid://on3cnja7e0qs" -path.s3tc="res://.godot/imported/DevMaterial_orm.png-1ef993c91d6c739d01524355ef13ca50.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_orm.png-1ef993c91d6c739d01524355ef13ca50.etc2.stex" -metadata={ -"imported_formats": ["s3tc", "etc2"], -"vram_texture": true -} - -[deps] - -source_file="res://Assets/Materials/Dev/DevMaterial_orm.png" -dest_files=["res://.godot/imported/DevMaterial_orm.png-1ef993c91d6c739d01524355ef13ca50.s3tc.stex", "res://.godot/imported/DevMaterial_orm.png-1ef993c91d6c739d01524355ef13ca50.etc2.stex"] - -[params] - -compress/mode=2 -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/bptc_ldr=0 -compress/normal_map=0 -compress/channel_pack=1 -compress/streamed=false -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="res://Assets/Materials/DevMaterials/DevMaterial_normal.png" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/HDR_as_SRGB=false -process/size_limit=0 -detect_3d/compress_to=0 -svg/scale=1.0 diff --git a/Game/Assets/Materials/Dev/Dev_Black.tres b/Game/Assets/Materials/Dev/Dev_Black.tres deleted file mode 100644 index 84c541f..0000000 --- a/Game/Assets/Materials/Dev/Dev_Black.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://dmk0o21l08adh"] - -[ext_resource type="Texture2D" uid="uid://416jhylh4lqj" path="res://Assets/Materials/Dev/DevMaterial_albedo_4.png" id="1_ouayt"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_yv7rb"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_hd688"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_ouayt" ) -orm_texture = ExtResource( "3_hd688" ) -normal_enabled = true -normal_texture = ExtResource( "2_yv7rb" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Brown.tres b/Game/Assets/Materials/Dev/Dev_Brown.tres deleted file mode 100644 index b449e10..0000000 --- a/Game/Assets/Materials/Dev/Dev_Brown.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://cgjhie22843h5"] - -[ext_resource type="Texture2D" uid="uid://qvikv4belel" path="res://Assets/Materials/Dev/DevMaterial_albedo_17.png" id="1_vl7il"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_pd7s6"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_8uk47"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_vl7il" ) -orm_texture = ExtResource( "3_8uk47" ) -normal_enabled = true -normal_texture = ExtResource( "2_pd7s6" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_DarkBlue.tres b/Game/Assets/Materials/Dev/Dev_DarkBlue.tres deleted file mode 100644 index 01e5ac7..0000000 --- a/Game/Assets/Materials/Dev/Dev_DarkBlue.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://b0rp6wb0npw1o"] - -[ext_resource type="Texture2D" uid="uid://dcopeqlr2llxh" path="res://Assets/Materials/Dev/DevMaterial_albedo_14.png" id="1_1uf3w"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_akgxp"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_608jv"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_1uf3w" ) -orm_texture = ExtResource( "3_608jv" ) -normal_enabled = true -normal_texture = ExtResource( "2_akgxp" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_DarkGreen.tres b/Game/Assets/Materials/Dev/Dev_DarkGreen.tres deleted file mode 100644 index 5c3c7b0..0000000 --- a/Game/Assets/Materials/Dev/Dev_DarkGreen.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://s07xtdpyykqp"] - -[ext_resource type="Texture2D" uid="uid://csqk0236r2d47" path="res://Assets/Materials/Dev/DevMaterial_albedo_15.png" id="1_85x80"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_bhg5s"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_nqbug"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_85x80" ) -orm_texture = ExtResource( "3_nqbug" ) -normal_enabled = true -normal_texture = ExtResource( "2_bhg5s" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_DarkGrey.tres b/Game/Assets/Materials/Dev/Dev_DarkGrey.tres deleted file mode 100644 index 71d5b43..0000000 --- a/Game/Assets/Materials/Dev/Dev_DarkGrey.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://cywv8mrr0bpdv"] - -[ext_resource type="Texture2D" uid="uid://cjiiwgrl6cl3t" path="res://Assets/Materials/Dev/DevMaterial_albedo_3.png" id="1_3o42o"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_2l81n"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_tj7is"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_3o42o" ) -orm_texture = ExtResource( "3_tj7is" ) -normal_enabled = true -normal_texture = ExtResource( "2_2l81n" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_DarkPink.tres b/Game/Assets/Materials/Dev/Dev_DarkPink.tres deleted file mode 100644 index ccefa1c..0000000 --- a/Game/Assets/Materials/Dev/Dev_DarkPink.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://dn4u42xexmcb8"] - -[ext_resource type="Texture2D" uid="uid://bngcc4cuh4a4l" path="res://Assets/Materials/Dev/DevMaterial_albedo_12.png" id="1_j8o0m"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_idyjg"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_rjvyx"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_j8o0m" ) -orm_texture = ExtResource( "3_rjvyx" ) -normal_enabled = true -normal_texture = ExtResource( "2_idyjg" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_DarkRed.tres b/Game/Assets/Materials/Dev/Dev_DarkRed.tres deleted file mode 100644 index 79da890..0000000 --- a/Game/Assets/Materials/Dev/Dev_DarkRed.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://dca6kvr7m0x5y"] - -[ext_resource type="Texture2D" uid="uid://c8ymi8au04uor" path="res://Assets/Materials/Dev/DevMaterial_albedo_18.png" id="1_ylqgm"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_no37t"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_mxfxj"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_ylqgm" ) -orm_texture = ExtResource( "3_mxfxj" ) -normal_enabled = true -normal_texture = ExtResource( "2_no37t" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_DarkViolet.tres b/Game/Assets/Materials/Dev/Dev_DarkViolet.tres deleted file mode 100644 index 6c09397..0000000 --- a/Game/Assets/Materials/Dev/Dev_DarkViolet.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://bpiwh0a8jc5pg"] - -[ext_resource type="Texture2D" uid="uid://cortigmlmhagi" path="res://Assets/Materials/Dev/DevMaterial_albedo_13.png" id="1_ypu02"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_rjsab"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_actbk"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_ypu02" ) -orm_texture = ExtResource( "3_actbk" ) -normal_enabled = true -normal_texture = ExtResource( "2_rjsab" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_DarkYellow.tres b/Game/Assets/Materials/Dev/Dev_DarkYellow.tres deleted file mode 100644 index 68fa299..0000000 --- a/Game/Assets/Materials/Dev/Dev_DarkYellow.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://cnxe51f5b3v62"] - -[ext_resource type="Texture2D" uid="uid://bgeyt62oexop2" path="res://Assets/Materials/Dev/DevMaterial_albedo_16.png" id="1_41ty8"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_m3u71"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_5efpf"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_41ty8" ) -orm_texture = ExtResource( "3_5efpf" ) -normal_enabled = true -normal_texture = ExtResource( "2_m3u71" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Gray.tres b/Game/Assets/Materials/Dev/Dev_Gray.tres deleted file mode 100644 index 5514ab1..0000000 --- a/Game/Assets/Materials/Dev/Dev_Gray.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3] - -[ext_resource type="Texture2D" path="res://Assets/Materials/Dev/DevMaterial_albedo_1.png" id="1_yuer3"] -[ext_resource type="Texture2D" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_iy55d"] -[ext_resource type="Texture2D" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_pr1hu"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_yuer3" ) -orm_texture = ExtResource( "3_pr1hu" ) -normal_enabled = true -normal_texture = ExtResource( "2_iy55d" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Green.tres b/Game/Assets/Materials/Dev/Dev_Green.tres deleted file mode 100644 index aaf5210..0000000 --- a/Game/Assets/Materials/Dev/Dev_Green.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://c6bpw6ifes66g"] - -[ext_resource type="Texture2D" uid="uid://dhq507hghwbpr" path="res://Assets/Materials/Dev/DevMaterial_albedo_8.png" id="1_jfciy"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_yv7rb"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_hd688"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_jfciy" ) -orm_texture = ExtResource( "3_hd688" ) -normal_enabled = true -normal_texture = ExtResource( "2_yv7rb" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Orange.tres b/Game/Assets/Materials/Dev/Dev_Orange.tres deleted file mode 100644 index 54cb092..0000000 --- a/Game/Assets/Materials/Dev/Dev_Orange.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://cvn1ntsuvl0fi"] - -[ext_resource type="Texture2D" uid="uid://cb35jbree0ide" path="res://Assets/Materials/Dev/DevMaterial_albedo_10.png" id="1_s0rme"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_54icg"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_urhpa"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_s0rme" ) -orm_texture = ExtResource( "3_urhpa" ) -normal_enabled = true -normal_texture = ExtResource( "2_54icg" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Pink.tres b/Game/Assets/Materials/Dev/Dev_Pink.tres deleted file mode 100644 index a282da2..0000000 --- a/Game/Assets/Materials/Dev/Dev_Pink.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://t3l8ppe41c6w"] - -[ext_resource type="Texture2D" uid="uid://ga8xxqwg33d7" path="res://Assets/Materials/Dev/DevMaterial_albedo_5.png" id="1_vfsr2"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_yv7rb"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_hd688"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_vfsr2" ) -orm_texture = ExtResource( "3_hd688" ) -normal_enabled = true -normal_texture = ExtResource( "2_yv7rb" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Red.tres b/Game/Assets/Materials/Dev/Dev_Red.tres deleted file mode 100644 index caadb02..0000000 --- a/Game/Assets/Materials/Dev/Dev_Red.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://bbp57bfuwstgh"] - -[ext_resource type="Texture2D" uid="uid://vke7o5xbfwlg" path="res://Assets/Materials/Dev/DevMaterial_albedo_11.png" id="1_2hw73"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_m0rhu"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_ej53q"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_2hw73" ) -orm_texture = ExtResource( "3_ej53q" ) -normal_enabled = true -normal_texture = ExtResource( "2_m0rhu" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Violet.tres b/Game/Assets/Materials/Dev/Dev_Violet.tres deleted file mode 100644 index 6835a24..0000000 --- a/Game/Assets/Materials/Dev/Dev_Violet.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://jcmiffnluukb"] - -[ext_resource type="Texture2D" uid="uid://dnyynah1u4gbr" path="res://Assets/Materials/Dev/DevMaterial_albedo_6.png" id="1_eg03e"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_yv7rb"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_hd688"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_eg03e" ) -orm_texture = ExtResource( "3_hd688" ) -normal_enabled = true -normal_texture = ExtResource( "2_yv7rb" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Yellow.tres b/Game/Assets/Materials/Dev/Dev_Yellow.tres deleted file mode 100644 index e5e35f3..0000000 --- a/Game/Assets/Materials/Dev/Dev_Yellow.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://cowacqvi71pxu"] - -[ext_resource type="Texture2D" uid="uid://bko21kk5w1lk5" path="res://Assets/Materials/Dev/DevMaterial_albedo_9.png" id="1_e38la"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_yv7rb"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_hd688"] - -[resource] -vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_e38la" ) -orm_texture = ExtResource( "3_hd688" ) -normal_enabled = true -normal_texture = ExtResource( "2_yv7rb" ) -uv1_scale = Vector3(0.25, 0.25, 0.25) -uv1_triplanar = true -uv1_triplanar_sharpness = 100.0 -texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Black.tres b/Game/Assets/Materials/Maps/Dev/Dev_Black.tres new file mode 100644 index 0000000..f64a49e --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Black.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_4.png" id="1_ouayt"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_yv7rb"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_hd688"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_ouayt" ) +orm_texture = ExtResource( "3_hd688" ) +normal_enabled = true +normal_texture = ExtResource( "2_yv7rb" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_Blue.tres b/Game/Assets/Materials/Maps/Dev/Dev_Blue.tres similarity index 72% rename from Game/Assets/Materials/Dev/Dev_Blue.tres rename to Game/Assets/Materials/Maps/Dev/Dev_Blue.tres index bd667e3..499a933 100644 --- a/Game/Assets/Materials/Dev/Dev_Blue.tres +++ b/Game/Assets/Materials/Maps/Dev/Dev_Blue.tres @@ -1,8 +1,8 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://csnoumdhk83we"] +[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://57yq8q50rrni"] -[ext_resource type="Texture2D" uid="uid://b51liyv2amv8v" path="res://Assets/Materials/Dev/DevMaterial_albedo_7.png" id="1_h61mw"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_sl4qt"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_4mjw6"] +[ext_resource type="Texture2D" uid="uid://b51liyv2amv8v" path="res://Assets/Materials/Maps/Dev/Dev_albedo_7.png" id="1_h61mw"] +[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_sl4qt"] +[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_4mjw6"] [resource] vertex_color_use_as_albedo = true diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Brown.tres b/Game/Assets/Materials/Maps/Dev/Dev_Brown.tres new file mode 100644 index 0000000..8d32d66 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Brown.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_17.png" id="1_vl7il"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_pd7s6"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_8uk47"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_vl7il" ) +orm_texture = ExtResource( "3_8uk47" ) +normal_enabled = true +normal_texture = ExtResource( "2_pd7s6" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_DarkBlue.tres b/Game/Assets/Materials/Maps/Dev/Dev_DarkBlue.tres new file mode 100644 index 0000000..3b050b2 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_DarkBlue.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_14.png" id="1_1uf3w"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_akgxp"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_608jv"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_1uf3w" ) +orm_texture = ExtResource( "3_608jv" ) +normal_enabled = true +normal_texture = ExtResource( "2_akgxp" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_DarkGreen.tres b/Game/Assets/Materials/Maps/Dev/Dev_DarkGreen.tres new file mode 100644 index 0000000..30d84a6 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_DarkGreen.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_15.png" id="1_85x80"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_bhg5s"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_nqbug"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_85x80" ) +orm_texture = ExtResource( "3_nqbug" ) +normal_enabled = true +normal_texture = ExtResource( "2_bhg5s" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_DarkGrey.tres b/Game/Assets/Materials/Maps/Dev/Dev_DarkGrey.tres new file mode 100644 index 0000000..1ecb18e --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_DarkGrey.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_3.png" id="1_3o42o"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_2l81n"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_tj7is"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_3o42o" ) +orm_texture = ExtResource( "3_tj7is" ) +normal_enabled = true +normal_texture = ExtResource( "2_2l81n" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_DarkPink.tres b/Game/Assets/Materials/Maps/Dev/Dev_DarkPink.tres new file mode 100644 index 0000000..24d3ac0 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_DarkPink.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_12.png" id="1_j8o0m"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_idyjg"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_rjvyx"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_j8o0m" ) +orm_texture = ExtResource( "3_rjvyx" ) +normal_enabled = true +normal_texture = ExtResource( "2_idyjg" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_DarkRed.tres b/Game/Assets/Materials/Maps/Dev/Dev_DarkRed.tres new file mode 100644 index 0000000..9639f23 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_DarkRed.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_18.png" id="1_ylqgm"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_no37t"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_mxfxj"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_ylqgm" ) +orm_texture = ExtResource( "3_mxfxj" ) +normal_enabled = true +normal_texture = ExtResource( "2_no37t" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_DarkViolet.tres b/Game/Assets/Materials/Maps/Dev/Dev_DarkViolet.tres new file mode 100644 index 0000000..86d8645 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_DarkViolet.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_13.png" id="1_ypu02"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_rjsab"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_actbk"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_ypu02" ) +orm_texture = ExtResource( "3_actbk" ) +normal_enabled = true +normal_texture = ExtResource( "2_rjsab" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_DarkYellow.tres b/Game/Assets/Materials/Maps/Dev/Dev_DarkYellow.tres new file mode 100644 index 0000000..76745c6 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_DarkYellow.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_16.png" id="1_41ty8"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_m3u71"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_5efpf"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_41ty8" ) +orm_texture = ExtResource( "3_5efpf" ) +normal_enabled = true +normal_texture = ExtResource( "2_m3u71" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Gray.tres b/Game/Assets/Materials/Maps/Dev/Dev_Gray.tres new file mode 100644 index 0000000..9220d1a --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Gray.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_1.png" id="1_yuer3"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_twgab"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_fym1y"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_yuer3" ) +orm_texture = ExtResource( "3_fym1y" ) +normal_enabled = true +normal_texture = ExtResource( "2_twgab" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Green.tres b/Game/Assets/Materials/Maps/Dev/Dev_Green.tres new file mode 100644 index 0000000..6cdca23 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Green.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_8.png" id="1_jfciy"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_yv7rb"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_hd688"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_jfciy" ) +orm_texture = ExtResource( "3_hd688" ) +normal_enabled = true +normal_texture = ExtResource( "2_yv7rb" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/Dev_LightGray.tres b/Game/Assets/Materials/Maps/Dev/Dev_LightGray.tres similarity index 56% rename from Game/Assets/Materials/Dev/Dev_LightGray.tres rename to Game/Assets/Materials/Maps/Dev/Dev_LightGray.tres index 5d3b479..fffe022 100644 --- a/Game/Assets/Materials/Dev/Dev_LightGray.tres +++ b/Game/Assets/Materials/Maps/Dev/Dev_LightGray.tres @@ -1,15 +1,15 @@ -[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://ddwfc8a51lcvj"] +[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://cx53mnq3gateb"] -[ext_resource type="Texture2D" uid="uid://bwaij3m4b1j7e" path="res://Assets/Materials/Dev/DevMaterial_albedo_2.png" id="1_63exl"] -[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Dev/DevMaterial_normal.png" id="2_8fvc5"] -[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Dev/DevMaterial_orm.png" id="3_3k0qx"] +[ext_resource type="Texture2D" uid="uid://bwaij3m4b1j7e" path="res://Assets/Materials/Maps/Dev/Dev_albedo_2.png" id="1_724f0"] +[ext_resource type="Texture2D" uid="uid://ceqlxxp2f04o7" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_gtrnj"] +[ext_resource type="Texture2D" uid="uid://on3cnja7e0qs" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_idbw5"] [resource] vertex_color_use_as_albedo = true -albedo_texture = ExtResource( "1_63exl" ) -orm_texture = ExtResource( "3_3k0qx" ) +albedo_texture = ExtResource( "1_724f0" ) +orm_texture = ExtResource( "3_idbw5" ) normal_enabled = true -normal_texture = ExtResource( "2_8fvc5" ) +normal_texture = ExtResource( "2_gtrnj" ) uv1_scale = Vector3(0.25, 0.25, 0.25) uv1_triplanar = true uv1_triplanar_sharpness = 100.0 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Orange.tres b/Game/Assets/Materials/Maps/Dev/Dev_Orange.tres new file mode 100644 index 0000000..7f4e915 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Orange.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_10.png" id="1_s0rme"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_54icg"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_urhpa"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_s0rme" ) +orm_texture = ExtResource( "3_urhpa" ) +normal_enabled = true +normal_texture = ExtResource( "2_54icg" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Pink.tres b/Game/Assets/Materials/Maps/Dev/Dev_Pink.tres new file mode 100644 index 0000000..9d18ebc --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Pink.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_5.png" id="1_vfsr2"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_yv7rb"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_hd688"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_vfsr2" ) +orm_texture = ExtResource( "3_hd688" ) +normal_enabled = true +normal_texture = ExtResource( "2_yv7rb" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Red.tres b/Game/Assets/Materials/Maps/Dev/Dev_Red.tres new file mode 100644 index 0000000..591ecfc --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Red.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_11.png" id="1_2hw73"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_m0rhu"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_ej53q"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_2hw73" ) +orm_texture = ExtResource( "3_ej53q" ) +normal_enabled = true +normal_texture = ExtResource( "2_m0rhu" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Violet.tres b/Game/Assets/Materials/Maps/Dev/Dev_Violet.tres new file mode 100644 index 0000000..bf61525 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Violet.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_6.png" id="1_eg03e"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_yv7rb"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_hd688"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_eg03e" ) +orm_texture = ExtResource( "3_hd688" ) +normal_enabled = true +normal_texture = ExtResource( "2_yv7rb" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Maps/Dev/Dev_Yellow.tres b/Game/Assets/Materials/Maps/Dev/Dev_Yellow.tres new file mode 100644 index 0000000..0354870 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_Yellow.tres @@ -0,0 +1,16 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3] + +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_albedo_9.png" id="1_e38la"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_normal.png" id="2_yv7rb"] +[ext_resource type="Texture2D" path="res://Assets/Materials/Maps/Dev/Dev_orm.png" id="3_hd688"] + +[resource] +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "1_e38la" ) +orm_texture = ExtResource( "3_hd688" ) +normal_enabled = true +normal_texture = ExtResource( "2_yv7rb" ) +uv1_scale = Vector3(0.25, 0.25, 0.25) +uv1_triplanar = true +uv1_triplanar_sharpness = 100.0 +texture_filter = 4 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_1.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_1.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_1.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_1.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_1.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_1.png.import similarity index 53% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_1.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_1.png.import index 3673353..01b5fac 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_1.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_1.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://dchev6aq1ornc" -path.s3tc="res://.godot/imported/DevMaterial_albedo_1.png-2ba16b18cacbbc3c03e7b81ed0b1e6a9.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_1.png-2ba16b18cacbbc3c03e7b81ed0b1e6a9.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_1.png-90a1fc49a2f3241b5d3c56753e4e6130.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_1.png-90a1fc49a2f3241b5d3c56753e4e6130.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_1.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_1.png-2ba16b18cacbbc3c03e7b81ed0b1e6a9.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_1.png-2ba16b18cacbbc3c03e7b81ed0b1e6a9.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_1.png" +dest_files=["res://.godot/imported/Dev_albedo_1.png-90a1fc49a2f3241b5d3c56753e4e6130.s3tc.stex", "res://.godot/imported/Dev_albedo_1.png-90a1fc49a2f3241b5d3c56753e4e6130.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_10.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_10.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_10.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_10.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_10.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_10.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_10.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_10.png.import index 4c66dd6..a9b5f2f 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_10.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_10.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://cb35jbree0ide" -path.s3tc="res://.godot/imported/DevMaterial_albedo_10.png-9689ca25c516f6ab9105a1507d0b4b77.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_10.png-9689ca25c516f6ab9105a1507d0b4b77.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_10.png-53281a12f7b00a760112a7fbf60ca157.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_10.png-53281a12f7b00a760112a7fbf60ca157.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_10.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_10.png-9689ca25c516f6ab9105a1507d0b4b77.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_10.png-9689ca25c516f6ab9105a1507d0b4b77.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_10.png" +dest_files=["res://.godot/imported/Dev_albedo_10.png-53281a12f7b00a760112a7fbf60ca157.s3tc.stex", "res://.godot/imported/Dev_albedo_10.png-53281a12f7b00a760112a7fbf60ca157.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_11.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_11.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_11.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_11.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_11.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_11.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_11.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_11.png.import index 5e6745c..4bd9a2e 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_11.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_11.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://vke7o5xbfwlg" -path.s3tc="res://.godot/imported/DevMaterial_albedo_11.png-9544e9cbcaefcb45ca171de0126b4b9c.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_11.png-9544e9cbcaefcb45ca171de0126b4b9c.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_11.png-f4984537b88362f4d03e2dc231a1c56d.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_11.png-f4984537b88362f4d03e2dc231a1c56d.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_11.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_11.png-9544e9cbcaefcb45ca171de0126b4b9c.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_11.png-9544e9cbcaefcb45ca171de0126b4b9c.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_11.png" +dest_files=["res://.godot/imported/Dev_albedo_11.png-f4984537b88362f4d03e2dc231a1c56d.s3tc.stex", "res://.godot/imported/Dev_albedo_11.png-f4984537b88362f4d03e2dc231a1c56d.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_12.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_12.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_12.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_12.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_12.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_12.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_12.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_12.png.import index 5898340..eca9c06 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_12.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_12.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://bngcc4cuh4a4l" -path.s3tc="res://.godot/imported/DevMaterial_albedo_12.png-b8f16e5eae81581ee43d3ca9ef31534e.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_12.png-b8f16e5eae81581ee43d3ca9ef31534e.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_12.png-f84de14c76dec61176fc9afc8b586815.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_12.png-f84de14c76dec61176fc9afc8b586815.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_12.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_12.png-b8f16e5eae81581ee43d3ca9ef31534e.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_12.png-b8f16e5eae81581ee43d3ca9ef31534e.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_12.png" +dest_files=["res://.godot/imported/Dev_albedo_12.png-f84de14c76dec61176fc9afc8b586815.s3tc.stex", "res://.godot/imported/Dev_albedo_12.png-f84de14c76dec61176fc9afc8b586815.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_13.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_13.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_13.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_13.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_13.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_13.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_13.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_13.png.import index 28a7391..0604652 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_13.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_13.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://cortigmlmhagi" -path.s3tc="res://.godot/imported/DevMaterial_albedo_13.png-66e3e14837ae5851204eabf0375e3121.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_13.png-66e3e14837ae5851204eabf0375e3121.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_13.png-772ff326c7291ec02dd4fe3f539fdd7c.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_13.png-772ff326c7291ec02dd4fe3f539fdd7c.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_13.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_13.png-66e3e14837ae5851204eabf0375e3121.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_13.png-66e3e14837ae5851204eabf0375e3121.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_13.png" +dest_files=["res://.godot/imported/Dev_albedo_13.png-772ff326c7291ec02dd4fe3f539fdd7c.s3tc.stex", "res://.godot/imported/Dev_albedo_13.png-772ff326c7291ec02dd4fe3f539fdd7c.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_14.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_14.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_14.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_14.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_14.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_14.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_14.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_14.png.import index d9c0f4e..93a369f 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_14.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_14.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://dcopeqlr2llxh" -path.s3tc="res://.godot/imported/DevMaterial_albedo_14.png-18eabfd78dd9d912731d8f16609c7b00.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_14.png-18eabfd78dd9d912731d8f16609c7b00.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_14.png-35080d9f084fd3a6b10ab4c20eb857c4.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_14.png-35080d9f084fd3a6b10ab4c20eb857c4.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_14.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_14.png-18eabfd78dd9d912731d8f16609c7b00.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_14.png-18eabfd78dd9d912731d8f16609c7b00.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_14.png" +dest_files=["res://.godot/imported/Dev_albedo_14.png-35080d9f084fd3a6b10ab4c20eb857c4.s3tc.stex", "res://.godot/imported/Dev_albedo_14.png-35080d9f084fd3a6b10ab4c20eb857c4.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_15.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_15.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_15.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_15.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_15.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_15.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_15.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_15.png.import index 73edcff..96a5e6a 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_15.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_15.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://csqk0236r2d47" -path.s3tc="res://.godot/imported/DevMaterial_albedo_15.png-d6f9988876d1a2724179261fbadd0acf.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_15.png-d6f9988876d1a2724179261fbadd0acf.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_15.png-0c968fd85bf8d7819d797531cc87b613.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_15.png-0c968fd85bf8d7819d797531cc87b613.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_15.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_15.png-d6f9988876d1a2724179261fbadd0acf.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_15.png-d6f9988876d1a2724179261fbadd0acf.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_15.png" +dest_files=["res://.godot/imported/Dev_albedo_15.png-0c968fd85bf8d7819d797531cc87b613.s3tc.stex", "res://.godot/imported/Dev_albedo_15.png-0c968fd85bf8d7819d797531cc87b613.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_16.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_16.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_16.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_16.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_16.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_16.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_16.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_16.png.import index c941ff7..64b1106 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_16.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_16.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://bgeyt62oexop2" -path.s3tc="res://.godot/imported/DevMaterial_albedo_16.png-d51cb9662eb92c0822d00392da02b48b.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_16.png-d51cb9662eb92c0822d00392da02b48b.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_16.png-69f9d53229cd01e4358c46331b3960c5.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_16.png-69f9d53229cd01e4358c46331b3960c5.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_16.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_16.png-d51cb9662eb92c0822d00392da02b48b.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_16.png-d51cb9662eb92c0822d00392da02b48b.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_16.png" +dest_files=["res://.godot/imported/Dev_albedo_16.png-69f9d53229cd01e4358c46331b3960c5.s3tc.stex", "res://.godot/imported/Dev_albedo_16.png-69f9d53229cd01e4358c46331b3960c5.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_17.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_17.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_17.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_17.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_17.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_17.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_17.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_17.png.import index c6ac561..a0b9b1c 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_17.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_17.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://qvikv4belel" -path.s3tc="res://.godot/imported/DevMaterial_albedo_17.png-3780c18c7c71c4aed9e14f2978f27676.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_17.png-3780c18c7c71c4aed9e14f2978f27676.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_17.png-0d607c2df242cd6ae58aacedc5385338.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_17.png-0d607c2df242cd6ae58aacedc5385338.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_17.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_17.png-3780c18c7c71c4aed9e14f2978f27676.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_17.png-3780c18c7c71c4aed9e14f2978f27676.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_17.png" +dest_files=["res://.godot/imported/Dev_albedo_17.png-0d607c2df242cd6ae58aacedc5385338.s3tc.stex", "res://.godot/imported/Dev_albedo_17.png-0d607c2df242cd6ae58aacedc5385338.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_18.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_18.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_18.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_18.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_18.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_18.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_18.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_18.png.import index 2eb50cd..54da2c6 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_18.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_18.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://c8ymi8au04uor" -path.s3tc="res://.godot/imported/DevMaterial_albedo_18.png-8a8fa916ade03d67104646ad5da46b2c.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_18.png-8a8fa916ade03d67104646ad5da46b2c.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_18.png-7873398076ef88361ca26c4e41aafecb.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_18.png-7873398076ef88361ca26c4e41aafecb.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_18.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_18.png-8a8fa916ade03d67104646ad5da46b2c.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_18.png-8a8fa916ade03d67104646ad5da46b2c.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_18.png" +dest_files=["res://.godot/imported/Dev_albedo_18.png-7873398076ef88361ca26c4e41aafecb.s3tc.stex", "res://.godot/imported/Dev_albedo_18.png-7873398076ef88361ca26c4e41aafecb.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_2.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_2.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_2.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_2.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_2.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_2.png.import similarity index 53% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_2.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_2.png.import index 0dba832..d459488 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_2.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_2.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://bwaij3m4b1j7e" -path.s3tc="res://.godot/imported/DevMaterial_albedo_2.png-d306e18b857434362063c55b437ac80b.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_2.png-d306e18b857434362063c55b437ac80b.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_2.png-c194474dfc7ed8a06294a18af73c1901.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_2.png-c194474dfc7ed8a06294a18af73c1901.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_2.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_2.png-d306e18b857434362063c55b437ac80b.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_2.png-d306e18b857434362063c55b437ac80b.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_2.png" +dest_files=["res://.godot/imported/Dev_albedo_2.png-c194474dfc7ed8a06294a18af73c1901.s3tc.stex", "res://.godot/imported/Dev_albedo_2.png-c194474dfc7ed8a06294a18af73c1901.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_3.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_3.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_3.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_3.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_3.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_3.png.import similarity index 53% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_3.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_3.png.import index 8860baa..d9888a6 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_3.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_3.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://cjiiwgrl6cl3t" -path.s3tc="res://.godot/imported/DevMaterial_albedo_3.png-09f459f897a70e206c12d7e16188d3e8.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_3.png-09f459f897a70e206c12d7e16188d3e8.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_3.png-d02737a48ba6ccf6fa93524397d75860.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_3.png-d02737a48ba6ccf6fa93524397d75860.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_3.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_3.png-09f459f897a70e206c12d7e16188d3e8.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_3.png-09f459f897a70e206c12d7e16188d3e8.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_3.png" +dest_files=["res://.godot/imported/Dev_albedo_3.png-d02737a48ba6ccf6fa93524397d75860.s3tc.stex", "res://.godot/imported/Dev_albedo_3.png-d02737a48ba6ccf6fa93524397d75860.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_4.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_4.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_4.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_4.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_4.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_4.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_4.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_4.png.import index ff49760..42d7100 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_4.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_4.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://416jhylh4lqj" -path.s3tc="res://.godot/imported/DevMaterial_albedo_4.png-2c7ae2c682edb92da9ce82082797281a.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_4.png-2c7ae2c682edb92da9ce82082797281a.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_4.png-951143ac05335c7bf5fda00d9e2aa759.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_4.png-951143ac05335c7bf5fda00d9e2aa759.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_4.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_4.png-2c7ae2c682edb92da9ce82082797281a.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_4.png-2c7ae2c682edb92da9ce82082797281a.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_4.png" +dest_files=["res://.godot/imported/Dev_albedo_4.png-951143ac05335c7bf5fda00d9e2aa759.s3tc.stex", "res://.godot/imported/Dev_albedo_4.png-951143ac05335c7bf5fda00d9e2aa759.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_5.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_5.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_5.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_5.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_5.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_5.png.import similarity index 52% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_5.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_5.png.import index d2dbb96..34fc82e 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_5.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_5.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://ga8xxqwg33d7" -path.s3tc="res://.godot/imported/DevMaterial_albedo_5.png-a47d076fb76ac9f75affe411df53a67c.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_5.png-a47d076fb76ac9f75affe411df53a67c.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_5.png-b337cb594587b1fc6fe8d42673e21f4f.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_5.png-b337cb594587b1fc6fe8d42673e21f4f.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_5.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_5.png-a47d076fb76ac9f75affe411df53a67c.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_5.png-a47d076fb76ac9f75affe411df53a67c.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_5.png" +dest_files=["res://.godot/imported/Dev_albedo_5.png-b337cb594587b1fc6fe8d42673e21f4f.s3tc.stex", "res://.godot/imported/Dev_albedo_5.png-b337cb594587b1fc6fe8d42673e21f4f.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_6.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_6.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_6.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_6.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_6.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_6.png.import similarity index 53% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_6.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_6.png.import index 1103b18..556c83f 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_6.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_6.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://dnyynah1u4gbr" -path.s3tc="res://.godot/imported/DevMaterial_albedo_6.png-3e3fce941ddda07fa44c69f37c537aed.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_6.png-3e3fce941ddda07fa44c69f37c537aed.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_6.png-a5cfc110ccc7210a99873b4b4889f4b6.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_6.png-a5cfc110ccc7210a99873b4b4889f4b6.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_6.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_6.png-3e3fce941ddda07fa44c69f37c537aed.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_6.png-3e3fce941ddda07fa44c69f37c537aed.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_6.png" +dest_files=["res://.godot/imported/Dev_albedo_6.png-a5cfc110ccc7210a99873b4b4889f4b6.s3tc.stex", "res://.godot/imported/Dev_albedo_6.png-a5cfc110ccc7210a99873b4b4889f4b6.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_7.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_7.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_7.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_7.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_7.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_7.png.import similarity index 53% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_7.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_7.png.import index 9dbb8fc..a0e24b5 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_7.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_7.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://b51liyv2amv8v" -path.s3tc="res://.godot/imported/DevMaterial_albedo_7.png-f2f20b3ac479441b6fc9ff994de4ee74.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_7.png-f2f20b3ac479441b6fc9ff994de4ee74.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_7.png-a4d370e0351d23e13b6f2bd74b4d63a0.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_7.png-a4d370e0351d23e13b6f2bd74b4d63a0.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_7.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_7.png-f2f20b3ac479441b6fc9ff994de4ee74.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_7.png-f2f20b3ac479441b6fc9ff994de4ee74.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_7.png" +dest_files=["res://.godot/imported/Dev_albedo_7.png-a4d370e0351d23e13b6f2bd74b4d63a0.s3tc.stex", "res://.godot/imported/Dev_albedo_7.png-a4d370e0351d23e13b6f2bd74b4d63a0.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_8.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_8.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_8.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_8.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_8.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_8.png.import similarity index 53% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_8.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_8.png.import index 9fd3316..abe8fae 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_8.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_8.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://dhq507hghwbpr" -path.s3tc="res://.godot/imported/DevMaterial_albedo_8.png-2abe481e63a74549ac0824d780216ab5.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_8.png-2abe481e63a74549ac0824d780216ab5.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_8.png-a5322c07749b2f1afcd4cfad8ccb9083.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_8.png-a5322c07749b2f1afcd4cfad8ccb9083.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_8.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_8.png-2abe481e63a74549ac0824d780216ab5.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_8.png-2abe481e63a74549ac0824d780216ab5.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_8.png" +dest_files=["res://.godot/imported/Dev_albedo_8.png-a5322c07749b2f1afcd4cfad8ccb9083.s3tc.stex", "res://.godot/imported/Dev_albedo_8.png-a5322c07749b2f1afcd4cfad8ccb9083.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_9.png b/Game/Assets/Materials/Maps/Dev/Dev_albedo_9.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_9.png rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_9.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_albedo_9.png.import b/Game/Assets/Materials/Maps/Dev/Dev_albedo_9.png.import similarity index 53% rename from Game/Assets/Materials/Dev/DevMaterial_albedo_9.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_albedo_9.png.import index 102fd9e..7959fe2 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_albedo_9.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_albedo_9.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://bko21kk5w1lk5" -path.s3tc="res://.godot/imported/DevMaterial_albedo_9.png-1190e536c36b602417af4fb588b4df7f.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_albedo_9.png-1190e536c36b602417af4fb588b4df7f.etc2.stex" +path.s3tc="res://.godot/imported/Dev_albedo_9.png-1de33b332911632d848f636695639710.s3tc.stex" +path.etc2="res://.godot/imported/Dev_albedo_9.png-1de33b332911632d848f636695639710.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_albedo_9.png" -dest_files=["res://.godot/imported/DevMaterial_albedo_9.png-1190e536c36b602417af4fb588b4df7f.s3tc.stex", "res://.godot/imported/DevMaterial_albedo_9.png-1190e536c36b602417af4fb588b4df7f.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_albedo_9.png" +dest_files=["res://.godot/imported/Dev_albedo_9.png-1de33b332911632d848f636695639710.s3tc.stex", "res://.godot/imported/Dev_albedo_9.png-1de33b332911632d848f636695639710.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=0.5 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 diff --git a/Game/Assets/Materials/Dev/DevMaterial_normal.png b/Game/Assets/Materials/Maps/Dev/Dev_normal.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_normal.png rename to Game/Assets/Materials/Maps/Dev/Dev_normal.png diff --git a/Game/Assets/Materials/Dev/DevMaterial_normal.png.import b/Game/Assets/Materials/Maps/Dev/Dev_normal.png.import similarity index 55% rename from Game/Assets/Materials/Dev/DevMaterial_normal.png.import rename to Game/Assets/Materials/Maps/Dev/Dev_normal.png.import index e6614f9..5ad6a76 100644 --- a/Game/Assets/Materials/Dev/DevMaterial_normal.png.import +++ b/Game/Assets/Materials/Maps/Dev/Dev_normal.png.import @@ -3,8 +3,8 @@ importer="texture" type="StreamTexture2D" uid="uid://ceqlxxp2f04o7" -path.s3tc="res://.godot/imported/DevMaterial_normal.png-e554dca2e40f66f0cccdffb9b403fef1.s3tc.stex" -path.etc2="res://.godot/imported/DevMaterial_normal.png-e554dca2e40f66f0cccdffb9b403fef1.etc2.stex" +path.s3tc="res://.godot/imported/Dev_normal.png-70e73be05dac8644e1a626acf5b7e09f.s3tc.stex" +path.etc2="res://.godot/imported/Dev_normal.png-70e73be05dac8644e1a626acf5b7e09f.etc2.stex" metadata={ "imported_formats": ["s3tc", "etc2"], "vram_texture": true @@ -12,13 +12,13 @@ metadata={ [deps] -source_file="res://Assets/Materials/Dev/DevMaterial_normal.png" -dest_files=["res://.godot/imported/DevMaterial_normal.png-e554dca2e40f66f0cccdffb9b403fef1.s3tc.stex", "res://.godot/imported/DevMaterial_normal.png-e554dca2e40f66f0cccdffb9b403fef1.etc2.stex"] +source_file="res://Assets/Materials/Maps/Dev/Dev_normal.png" +dest_files=["res://.godot/imported/Dev_normal.png-70e73be05dac8644e1a626acf5b7e09f.s3tc.stex", "res://.godot/imported/Dev_normal.png-70e73be05dac8644e1a626acf5b7e09f.etc2.stex"] [params] compress/mode=2 -compress/lossy_quality=0.7 +compress/lossy_quality=1.0 compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=1 diff --git a/Game/Assets/Materials/Dev/DevMaterial_orm.png b/Game/Assets/Materials/Maps/Dev/Dev_orm.png similarity index 100% rename from Game/Assets/Materials/Dev/DevMaterial_orm.png rename to Game/Assets/Materials/Maps/Dev/Dev_orm.png diff --git a/Game/Assets/Materials/Maps/Dev/Dev_orm.png.import b/Game/Assets/Materials/Maps/Dev/Dev_orm.png.import new file mode 100644 index 0000000..1132030 --- /dev/null +++ b/Game/Assets/Materials/Maps/Dev/Dev_orm.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture2D" +uid="uid://on3cnja7e0qs" +path.s3tc="res://.godot/imported/Dev_orm.png-e98717c23019ced6ff0a068a2f759571.s3tc.stex" +path.etc2="res://.godot/imported/Dev_orm.png-e98717c23019ced6ff0a068a2f759571.etc2.stex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Materials/Maps/Dev/Dev_orm.png" +dest_files=["res://.godot/imported/Dev_orm.png-e98717c23019ced6ff0a068a2f759571.s3tc.stex", "res://.godot/imported/Dev_orm.png-e98717c23019ced6ff0a068a2f759571.etc2.stex"] + +[params] + +compress/mode=2 +compress/lossy_quality=1.0 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=1 +compress/streamed=false +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="res://Assets/Materials/Dev/DevMaterial_normal.png" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/HDR_as_SRGB=false +process/size_limit=0 +detect_3d/compress_to=0 +svg/scale=1.0 diff --git a/Game/Assets/Shaders/Base.tres b/Game/Assets/Shaders/Base.tres deleted file mode 100644 index d39b74e..0000000 --- a/Game/Assets/Shaders/Base.tres +++ /dev/null @@ -1,5 +0,0 @@ -[gd_resource type="StandardMaterial3D" format=2] - -[resource] -albedo_color = Color( 0.317647, 0.317647, 0.317647, 1 ) -roughness = 0.29