From 4a907a37c527e00de311c239ff2b22786d838d11 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 13 Feb 2022 15:32:36 +0100 Subject: [PATCH] Categorize the textures using folders. --- game/models/buildings/crypt/CryptEntrance.tres | 2 +- game/models/buildings/crypt/CryptEntrance.tscn | 2 +- .../buildings/crypt/CryptEntranceDoor.tscn | 2 +- .../entities/human/models/Material_003.material | Bin 784 -> 774 bytes .../dungeon/simple_dungeon_back_teleporter.tscn | 2 +- .../dungeon/simple_dungeon_teleporter.tscn | 2 +- .../scenes/world/new_terramanlibrarymerger.tres | 6 +++--- .../world/new_terramanlibrarymergerpcm.tres | 6 +++--- game/tests/test_mdr/Spatial.tscn | 2 +- game/tests/test_rooms/Room1.tres | 2 +- game/tests/test_rooms/Room1.tscn | 2 +- game/tests/test_rooms/Room2.tres | 2 +- game/tests/test_rooms/Room2.tscn | 2 +- game/tests/test_rooms/Room3.tres | 2 +- game/tests/test_rooms/Room3.tscn | 2 +- game/tests/test_rooms/Room4.tres | 2 +- game/tests/test_rooms/Room4.tscn | 2 +- game/tests/test_rooms/Room5.tres | 2 +- game/tests/test_rooms/Room5.tscn | 2 +- game/tests/test_rooms/test2_tiledwalldata.tres | 2 +- game/textures/{ => bricks}/test_brick.tres | 0 .../textures/{ => bricks}/test_brick_albedo.png | Bin .../{ => bricks}/test_brick_albedo.png.import | 6 +++--- game/textures/{ => dirt}/dirt.tres | 0 game/textures/{ => dirt}/dirt_albedo.png | Bin game/textures/{ => dirt}/dirt_albedo.png.import | 6 +++--- game/textures/{ => grass}/grass.tres | 0 game/textures/{ => grass}/grass_albedo.png | Bin .../{ => grass}/grass_albedo.png.import | 6 +++--- game/textures/{ => grass}/grass_mossy.tres | 0 .../textures/{ => grass}/grass_mossy_albedo.png | Bin .../{ => grass}/grass_mossy_albedo.png.import | 6 +++--- game/textures/{ => stone}/stone_1.tres | 0 game/textures/{ => stone}/stone_1_albedo.png | Bin .../{ => stone}/stone_1_albedo.png.import | 6 +++--- game/textures/{ => stone}/stone_dungeon_1.tres | 0 .../{ => stone}/stone_dungeon_1_albedo.png | Bin .../stone_dungeon_1_albedo.png.import | 6 +++--- game/worlds/test_world/dungeons/dungeon.tres | 4 ++-- game/worlds/test_world/dungeons/dungeon_l2.tres | 4 ++-- .../voxel_library/merger_prop_mat.tres | 2 +- 41 files changed, 46 insertions(+), 46 deletions(-) rename game/textures/{ => bricks}/test_brick.tres (100%) rename game/textures/{ => bricks}/test_brick_albedo.png (100%) rename game/textures/{ => bricks}/test_brick_albedo.png.import (68%) rename game/textures/{ => dirt}/dirt.tres (100%) rename game/textures/{ => dirt}/dirt_albedo.png (100%) rename game/textures/{ => dirt}/dirt_albedo.png.import (70%) rename game/textures/{ => grass}/grass.tres (100%) rename game/textures/{ => grass}/grass_albedo.png (100%) rename game/textures/{ => grass}/grass_albedo.png.import (70%) rename game/textures/{ => grass}/grass_mossy.tres (100%) rename game/textures/{ => grass}/grass_mossy_albedo.png (100%) rename game/textures/{ => grass}/grass_mossy_albedo.png.import (68%) rename game/textures/{ => stone}/stone_1.tres (100%) rename game/textures/{ => stone}/stone_1_albedo.png (100%) rename game/textures/{ => stone}/stone_1_albedo.png.import (69%) rename game/textures/{ => stone}/stone_dungeon_1.tres (100%) rename game/textures/{ => stone}/stone_dungeon_1_albedo.png (100%) rename game/textures/{ => stone}/stone_dungeon_1_albedo.png.import (67%) diff --git a/game/models/buildings/crypt/CryptEntrance.tres b/game/models/buildings/crypt/CryptEntrance.tres index e90a65a0..951e3a08 100644 --- a/game/models/buildings/crypt/CryptEntrance.tres +++ b/game/models/buildings/crypt/CryptEntrance.tres @@ -1,6 +1,6 @@ [gd_resource type="PropData" load_steps=39 format=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=1] [ext_resource path="res://models/core_models/wall_xp.tres" type="MeshDataResource" id=2] [ext_resource path="res://models/core_models/wall_xn.tres" type="MeshDataResource" id=3] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=4] diff --git a/game/models/buildings/crypt/CryptEntrance.tscn b/game/models/buildings/crypt/CryptEntrance.tscn index 953e3d2d..e1194942 100644 --- a/game/models/buildings/crypt/CryptEntrance.tscn +++ b/game/models/buildings/crypt/CryptEntrance.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://models/core_models/floor.tres" type="MeshDataResource" id=3] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=4] [ext_resource path="res://models/core_models/wall_zp.tres" type="MeshDataResource" id=5] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=6] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=6] [ext_resource path="res://models/buildings/crypt/CryptEntranceDoor.tscn" type="PackedScene" id=7] [sub_resource type="SpatialMaterial" id=7] diff --git a/game/models/buildings/crypt/CryptEntranceDoor.tscn b/game/models/buildings/crypt/CryptEntranceDoor.tscn index 39b7b4ba..4d44bc83 100644 --- a/game/models/buildings/crypt/CryptEntranceDoor.tscn +++ b/game/models/buildings/crypt/CryptEntranceDoor.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://scripts/dungeons/teleporters/dung_teleporter.gd" type="Script" id=1] -[ext_resource path="res://textures/test_brick_albedo.png" type="Texture" id=2] +[ext_resource path="res://textures/bricks/test_brick_albedo.png" type="Texture" id=2] [sub_resource type="CubeMesh" id=1] size = Vector3( 1, 1, 1 ) diff --git a/game/models/entities/human/models/Material_003.material b/game/models/entities/human/models/Material_003.material index e719b5d118c799d4b7fe8233d1bf914d58b1a3e1..9b58955831f08784d844725890d2004941b696d2 100644 GIT binary patch delta 763 zcmVs z6h%=K#ldLZERm$zax+5N8j*X;^IgTC!V0c(8=Ya768)h4u=+zaRKv9+1y}%C09*i* zT*!jG=po?>S%Y*Ho)Gu&&;ZX5CBR`cKD%-2u`Taf)n@Jo@58GkSSe>i}z z%f-GC>$0zP{C7a{KfoVNlM1nOdyVr}m!|&}&g-02hC1P{CWQMi!)BO_a|jo6oQgdX z6E13HNR@>%lVxp?1skbCW?hCtOEwkXW4BsvBehm5Xd)RkOKlO}jEyMWP$6XyK4ICE z+serv^l93|m7H9~5HU^WbbpY-kx?d(?n1_nk`PA9wXV_mf8e-J|6lM`=1h!^($-A`t}P1-U+@VZxfmg;^cMw-X3MARZVuoPWfB1Kn~H|1W@v zU2`f_*Pu(MlNQ}3kw_$MFB-XN6juk2C$CX;x@~Y5yPJKOc~}!%ng)Q2s9`NKN|B6= zBuNSx#!vzwhN_AO65umE%o44lk+{wOYi|>x@)+PCn tz%5;}V^i;ZP@nBJ?c{bJS~>1^@u~0ssIgwJ-f(kOg%Y0H&pGIZ$nq4rpd(W~SxM z%*@Qp%)x9oOC))=+|*CDM&#adK~t}>dl6RLP^S^!=E z6-q92!Cw53aD}Wvx~3LYS7C(wXuKKjHDmsDnp%cR};d0m|-(a#yNzGIZnkNi3u0AGNj7F8OpLY=z@(@A+t_H;Uyc3@3C7g zw~<<_7BrEJnx(b~Z^lNIZm5tl2&b^@ngFEfwsNuueVX=gB_~%gL`;)89i(t%70RQ# zkg=;Il#z0+Yjpk}IPTN`7krgD6QirNbs4wlQWPB5B}NUggvOpSYb8@@l@^37m*rMX zSnEj^is51|_STcIF$N+!JUT#xgq+9_;sX9-xKP0%k!<_}2yAdRI3yAj;T5?)#eu@w z1_-k{i20Th;Yh>-qlT0CZ{RlQH>>Ka>` z(;Y#&8VD1D@s74<$Rn0p@~ds}bL7U!B5ZjF4)W#b07>v=sag0MTT{i+3`T7bpzpF_ z?Y+c}dHTHPluSNjVv-4LONMA5q{$FVprXi0!F76i^T;o}M68Ti1K!-UH=v>9f}M@6 zrD4lhio{IJm+iHqc&2y5eL#-hxsR#Zha?ijJ5dLqZ%FfERE)Jk(>5wRI!^0&rP#3v zns7;Fljq4MF6+35_@LWvQj!k|t`;RtcAcCP)$N|>j$=om+p*~Q_^P7HzY_FfK1mU@ O1Ap3@6K)AoQ$s`Ac6b2* diff --git a/game/props/teleporters/dungeon/simple_dungeon_back_teleporter.tscn b/game/props/teleporters/dungeon/simple_dungeon_back_teleporter.tscn index 28ef8a8a..cc5bb37f 100644 --- a/game/props/teleporters/dungeon/simple_dungeon_back_teleporter.tscn +++ b/game/props/teleporters/dungeon/simple_dungeon_back_teleporter.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://scripts/dungeons/teleporters/dung_back_teleporter.gd" type="Script" id=1] -[ext_resource path="res://textures/test_brick_albedo.png" type="Texture" id=2] +[ext_resource path="res://textures/bricks/test_brick_albedo.png" type="Texture" id=2] [sub_resource type="CubeMesh" id=1] size = Vector3( 1, 1, 1 ) diff --git a/game/props/teleporters/dungeon/simple_dungeon_teleporter.tscn b/game/props/teleporters/dungeon/simple_dungeon_teleporter.tscn index f8ed915a..dead92bb 100644 --- a/game/props/teleporters/dungeon/simple_dungeon_teleporter.tscn +++ b/game/props/teleporters/dungeon/simple_dungeon_teleporter.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://scripts/dungeons/teleporters/dung_teleporter.gd" type="Script" id=1] [ext_resource path="res://props/teleporters/dungeon/simple_dungeon_back_teleporter.tscn" type="PackedScene" id=2] -[ext_resource path="res://textures/test_brick_albedo.png" type="Texture" id=4] +[ext_resource path="res://textures/bricks/test_brick_albedo.png" type="Texture" id=4] [sub_resource type="CubeMesh" id=1] size = Vector3( 1, 1, 1 ) diff --git a/game/scenes/world/new_terramanlibrarymerger.tres b/game/scenes/world/new_terramanlibrarymerger.tres index 90c8c633..5254ef2f 100644 --- a/game/scenes/world/new_terramanlibrarymerger.tres +++ b/game/scenes/world/new_terramanlibrarymerger.tres @@ -1,8 +1,8 @@ [gd_resource type="TerrainLibraryMerger" load_steps=10 format=2] -[ext_resource path="res://textures/grass_mossy_albedo.png" type="Texture" id=1] -[ext_resource path="res://textures/dirt_albedo.png" type="Texture" id=2] -[ext_resource path="res://textures/stone_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://textures/grass/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://textures/dirt/dirt_albedo.png" type="Texture" id=2] +[ext_resource path="res://textures/stone/stone_1_albedo.png" type="Texture" id=3] [ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4] [ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5] diff --git a/game/scenes/world/new_terramanlibrarymergerpcm.tres b/game/scenes/world/new_terramanlibrarymergerpcm.tres index 929e4988..07a6107a 100644 --- a/game/scenes/world/new_terramanlibrarymergerpcm.tres +++ b/game/scenes/world/new_terramanlibrarymergerpcm.tres @@ -2,9 +2,9 @@ [ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=1] [ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=2] -[ext_resource path="res://textures/grass_mossy_albedo.png" type="Texture" id=3] -[ext_resource path="res://textures/dirt_albedo.png" type="Texture" id=4] -[ext_resource path="res://textures/stone_1_albedo.png" type="Texture" id=5] +[ext_resource path="res://textures/grass/grass_mossy_albedo.png" type="Texture" id=3] +[ext_resource path="res://textures/dirt/dirt_albedo.png" type="Texture" id=4] +[ext_resource path="res://textures/stone/stone_1_albedo.png" type="Texture" id=5] [ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=6] [ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=7] diff --git a/game/tests/test_mdr/Spatial.tscn b/game/tests/test_mdr/Spatial.tscn index 05918998..384262a9 100644 --- a/game/tests/test_mdr/Spatial.tscn +++ b/game/tests/test_mdr/Spatial.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://textures/grass/grass_mossy_albedo.png" type="Texture" id=1] [sub_resource type="MeshDataResource" id=1] array = [ PoolVector3Array( -0.5, -0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5 ), PoolVector3Array( 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1 ), null, null, PoolVector2Array( 0.253049, 0.336022, 0.253049, 0.00806455, 0.5, 0.00806452, 0.5, 0.336022, 0.253049, 0.663978, 0.5, 0.991935, 0.253049, 0.991935, 0.5, 0.663978, 0.00609756, 0.336022, 0.993902, 0.336021, 0.746951, 0.336021, 0.746951, 0.663978, 0.00609758, 0.663979, 0.993902, 0.663978 ), null, null, null, PoolIntArray( 0, 1, 2, 2, 3, 0, 4, 5, 6, 4, 7, 5, 3, 10, 11, 11, 7, 3, 0, 12, 8, 0, 4, 12, 9, 13, 11, 11, 10, 9, 0, 7, 4, 0, 3, 7 ) ] diff --git a/game/tests/test_rooms/Room1.tres b/game/tests/test_rooms/Room1.tres index eec863bb..1290a0cf 100644 --- a/game/tests/test_rooms/Room1.tres +++ b/game/tests/test_rooms/Room1.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=1] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=3] [sub_resource type="PropDataPortal" id=1] transform = Transform( -1, 0, -9.61651e-07, 0, 1, 0, 9.61651e-07, 0, -1, 2, 1, 0 ) diff --git a/game/tests/test_rooms/Room1.tscn b/game/tests/test_rooms/Room1.tscn index 953741a3..f53d491f 100644 --- a/game/tests/test_rooms/Room1.tscn +++ b/game/tests/test_rooms/Room1.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/Room2.tres b/game/tests/test_rooms/Room2.tres index bd8d8f36..b3d107d6 100644 --- a/game/tests/test_rooms/Room2.tres +++ b/game/tests/test_rooms/Room2.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=3] [ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple.png" type="Texture" id=4] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=5] diff --git a/game/tests/test_rooms/Room2.tscn b/game/tests/test_rooms/Room2.tscn index 80c5d7da..21320804 100644 --- a/game/tests/test_rooms/Room2.tscn +++ b/game/tests/test_rooms/Room2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] [ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple.png" type="Texture" id=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/Room3.tres b/game/tests/test_rooms/Room3.tres index c639a820..ae660dca 100644 --- a/game/tests/test_rooms/Room3.tres +++ b/game/tests/test_rooms/Room3.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=1] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=3] [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) diff --git a/game/tests/test_rooms/Room3.tscn b/game/tests/test_rooms/Room3.tscn index 8c7ba478..c0c922a1 100644 --- a/game/tests/test_rooms/Room3.tscn +++ b/game/tests/test_rooms/Room3.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/Room4.tres b/game/tests/test_rooms/Room4.tres index ee3adf3b..df9e032d 100644 --- a/game/tests/test_rooms/Room4.tres +++ b/game/tests/test_rooms/Room4.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=1] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=3] [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) diff --git a/game/tests/test_rooms/Room4.tscn b/game/tests/test_rooms/Room4.tscn index 100f1e58..d3c5d782 100644 --- a/game/tests/test_rooms/Room4.tscn +++ b/game/tests/test_rooms/Room4.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/Room5.tres b/game/tests/test_rooms/Room5.tres index 0f520df6..995e1a25 100644 --- a/game/tests/test_rooms/Room5.tres +++ b/game/tests/test_rooms/Room5.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=1] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=3] [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) diff --git a/game/tests/test_rooms/Room5.tscn b/game/tests/test_rooms/Room5.tscn index 3afab0b0..8a541026 100644 --- a/game/tests/test_rooms/Room5.tscn +++ b/game/tests/test_rooms/Room5.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/test2_tiledwalldata.tres b/game/tests/test_rooms/test2_tiledwalldata.tres index 611663b9..412c583c 100644 --- a/game/tests/test_rooms/test2_tiledwalldata.tres +++ b/game/tests/test_rooms/test2_tiledwalldata.tres @@ -1,6 +1,6 @@ [gd_resource type="TiledWallData" load_steps=2 format=2] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=1] [resource] tiling_type = 3 diff --git a/game/textures/test_brick.tres b/game/textures/bricks/test_brick.tres similarity index 100% rename from game/textures/test_brick.tres rename to game/textures/bricks/test_brick.tres diff --git a/game/textures/test_brick_albedo.png b/game/textures/bricks/test_brick_albedo.png similarity index 100% rename from game/textures/test_brick_albedo.png rename to game/textures/bricks/test_brick_albedo.png diff --git a/game/textures/test_brick_albedo.png.import b/game/textures/bricks/test_brick_albedo.png.import similarity index 68% rename from game/textures/test_brick_albedo.png.import rename to game/textures/bricks/test_brick_albedo.png.import index 6e20df68..6743b47d 100644 --- a/game/textures/test_brick_albedo.png.import +++ b/game/textures/bricks/test_brick_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/test_brick_albedo.png-731f8726c07c0a3899f66f89894a9527.stex" +path="res://.import/test_brick_albedo.png-8e7c577447ede4c1eda61a908c66542a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/test_brick_albedo.png" -dest_files=[ "res://.import/test_brick_albedo.png-731f8726c07c0a3899f66f89894a9527.stex" ] +source_file="res://textures/bricks/test_brick_albedo.png" +dest_files=[ "res://.import/test_brick_albedo.png-8e7c577447ede4c1eda61a908c66542a.stex" ] [params] diff --git a/game/textures/dirt.tres b/game/textures/dirt/dirt.tres similarity index 100% rename from game/textures/dirt.tres rename to game/textures/dirt/dirt.tres diff --git a/game/textures/dirt_albedo.png b/game/textures/dirt/dirt_albedo.png similarity index 100% rename from game/textures/dirt_albedo.png rename to game/textures/dirt/dirt_albedo.png diff --git a/game/textures/dirt_albedo.png.import b/game/textures/dirt/dirt_albedo.png.import similarity index 70% rename from game/textures/dirt_albedo.png.import rename to game/textures/dirt/dirt_albedo.png.import index 99ba8317..100175c4 100644 --- a/game/textures/dirt_albedo.png.import +++ b/game/textures/dirt/dirt_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dirt_albedo.png-cf18c6242612638033ba78a0016e5710.stex" +path="res://.import/dirt_albedo.png-d6fc52a68abcaa5cba6736aac308fc3f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/dirt_albedo.png" -dest_files=[ "res://.import/dirt_albedo.png-cf18c6242612638033ba78a0016e5710.stex" ] +source_file="res://textures/dirt/dirt_albedo.png" +dest_files=[ "res://.import/dirt_albedo.png-d6fc52a68abcaa5cba6736aac308fc3f.stex" ] [params] diff --git a/game/textures/grass.tres b/game/textures/grass/grass.tres similarity index 100% rename from game/textures/grass.tres rename to game/textures/grass/grass.tres diff --git a/game/textures/grass_albedo.png b/game/textures/grass/grass_albedo.png similarity index 100% rename from game/textures/grass_albedo.png rename to game/textures/grass/grass_albedo.png diff --git a/game/textures/grass_albedo.png.import b/game/textures/grass/grass_albedo.png.import similarity index 70% rename from game/textures/grass_albedo.png.import rename to game/textures/grass/grass_albedo.png.import index d7b4082a..5687d1fb 100644 --- a/game/textures/grass_albedo.png.import +++ b/game/textures/grass/grass_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass_albedo.png-47ac8c2804c6c9304d3021c8dbb029e2.stex" +path="res://.import/grass_albedo.png-264672b037c72ffc0fcefce902f3cecf.stex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/grass_albedo.png" -dest_files=[ "res://.import/grass_albedo.png-47ac8c2804c6c9304d3021c8dbb029e2.stex" ] +source_file="res://textures/grass/grass_albedo.png" +dest_files=[ "res://.import/grass_albedo.png-264672b037c72ffc0fcefce902f3cecf.stex" ] [params] diff --git a/game/textures/grass_mossy.tres b/game/textures/grass/grass_mossy.tres similarity index 100% rename from game/textures/grass_mossy.tres rename to game/textures/grass/grass_mossy.tres diff --git a/game/textures/grass_mossy_albedo.png b/game/textures/grass/grass_mossy_albedo.png similarity index 100% rename from game/textures/grass_mossy_albedo.png rename to game/textures/grass/grass_mossy_albedo.png diff --git a/game/textures/grass_mossy_albedo.png.import b/game/textures/grass/grass_mossy_albedo.png.import similarity index 68% rename from game/textures/grass_mossy_albedo.png.import rename to game/textures/grass/grass_mossy_albedo.png.import index b365b8da..3e2a04bc 100644 --- a/game/textures/grass_mossy_albedo.png.import +++ b/game/textures/grass/grass_mossy_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass_mossy_albedo.png-66c842982f7c0cfa2899267b4a00245b.stex" +path="res://.import/grass_mossy_albedo.png-24a324fb3c9987ba0713948e1d98cab3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/grass_mossy_albedo.png" -dest_files=[ "res://.import/grass_mossy_albedo.png-66c842982f7c0cfa2899267b4a00245b.stex" ] +source_file="res://textures/grass/grass_mossy_albedo.png" +dest_files=[ "res://.import/grass_mossy_albedo.png-24a324fb3c9987ba0713948e1d98cab3.stex" ] [params] diff --git a/game/textures/stone_1.tres b/game/textures/stone/stone_1.tres similarity index 100% rename from game/textures/stone_1.tres rename to game/textures/stone/stone_1.tres diff --git a/game/textures/stone_1_albedo.png b/game/textures/stone/stone_1_albedo.png similarity index 100% rename from game/textures/stone_1_albedo.png rename to game/textures/stone/stone_1_albedo.png diff --git a/game/textures/stone_1_albedo.png.import b/game/textures/stone/stone_1_albedo.png.import similarity index 69% rename from game/textures/stone_1_albedo.png.import rename to game/textures/stone/stone_1_albedo.png.import index 75bf1819..f063fec1 100644 --- a/game/textures/stone_1_albedo.png.import +++ b/game/textures/stone/stone_1_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/stone_1_albedo.png-37c59431ed79adeae1710bd7549f5e2b.stex" +path="res://.import/stone_1_albedo.png-16c773285e3ce65fd23a7f7f8ff228ea.stex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/stone_1_albedo.png" -dest_files=[ "res://.import/stone_1_albedo.png-37c59431ed79adeae1710bd7549f5e2b.stex" ] +source_file="res://textures/stone/stone_1_albedo.png" +dest_files=[ "res://.import/stone_1_albedo.png-16c773285e3ce65fd23a7f7f8ff228ea.stex" ] [params] diff --git a/game/textures/stone_dungeon_1.tres b/game/textures/stone/stone_dungeon_1.tres similarity index 100% rename from game/textures/stone_dungeon_1.tres rename to game/textures/stone/stone_dungeon_1.tres diff --git a/game/textures/stone_dungeon_1_albedo.png b/game/textures/stone/stone_dungeon_1_albedo.png similarity index 100% rename from game/textures/stone_dungeon_1_albedo.png rename to game/textures/stone/stone_dungeon_1_albedo.png diff --git a/game/textures/stone_dungeon_1_albedo.png.import b/game/textures/stone/stone_dungeon_1_albedo.png.import similarity index 67% rename from game/textures/stone_dungeon_1_albedo.png.import rename to game/textures/stone/stone_dungeon_1_albedo.png.import index 170a2a5f..e13f0ad1 100644 --- a/game/textures/stone_dungeon_1_albedo.png.import +++ b/game/textures/stone/stone_dungeon_1_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/stone_dungeon_1_albedo.png-9296c9e38cf83cd63efd194654d2a2d4.stex" +path="res://.import/stone_dungeon_1_albedo.png-f712f5e810eed24945a5c2826472a828.stex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/stone_dungeon_1_albedo.png" -dest_files=[ "res://.import/stone_dungeon_1_albedo.png-9296c9e38cf83cd63efd194654d2a2d4.stex" ] +source_file="res://textures/stone/stone_dungeon_1_albedo.png" +dest_files=[ "res://.import/stone_dungeon_1_albedo.png-f712f5e810eed24945a5c2826472a828.stex" ] [params] diff --git a/game/worlds/test_world/dungeons/dungeon.tres b/game/worlds/test_world/dungeons/dungeon.tres index f7306a2b..16f5054c 100644 --- a/game/worlds/test_world/dungeons/dungeon.tres +++ b/game/worlds/test_world/dungeons/dungeon.tres @@ -9,8 +9,8 @@ [ext_resource path="res://models/core_models/floor.tres" type="MeshDataResource" id=7] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=8] [ext_resource path="res://models/core_models/wall_zp.tres" type="MeshDataResource" id=9] -[ext_resource path="res://textures/stone_1_albedo.png" type="Texture" id=10] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=11] +[ext_resource path="res://textures/stone/stone_1_albedo.png" type="Texture" id=10] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=11] [resource] posy = -45 diff --git a/game/worlds/test_world/dungeons/dungeon_l2.tres b/game/worlds/test_world/dungeons/dungeon_l2.tres index 33aee154..59d8348c 100644 --- a/game/worlds/test_world/dungeons/dungeon_l2.tres +++ b/game/worlds/test_world/dungeons/dungeon_l2.tres @@ -9,8 +9,8 @@ [ext_resource path="res://models/core_models/floor.tres" type="MeshDataResource" id=7] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=8] [ext_resource path="res://models/core_models/wall_zp.tres" type="MeshDataResource" id=9] -[ext_resource path="res://textures/stone_1_albedo.png" type="Texture" id=10] -[ext_resource path="res://textures/stone_dungeon_1_albedo.png" type="Texture" id=11] +[ext_resource path="res://textures/stone/stone_1_albedo.png" type="Texture" id=10] +[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=11] [resource] posy = -79 diff --git a/game/worlds/test_world/voxel_library/merger_prop_mat.tres b/game/worlds/test_world/voxel_library/merger_prop_mat.tres index 29f5a1f4..7dc73cde 100644 --- a/game/worlds/test_world/voxel_library/merger_prop_mat.tres +++ b/game/worlds/test_world/voxel_library/merger_prop_mat.tres @@ -1,6 +1,6 @@ [gd_resource type="SpatialMaterial" load_steps=2 format=2] -[ext_resource path="res://textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://textures/grass/grass_mossy_albedo.png" type="Texture" id=1]