From 04ec4d2ad9cc8a1b6f41c7ba588dc9cec87113de Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sun, 13 Feb 2022 17:57:29 +0100
Subject: [PATCH] Moved the current textures under a world folder in the
 textures folder.

---
 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 774 -> 778 bytes
 .../dungeon/simple_dungeon_back_teleporter.tscn |   2 +-
 .../dungeon/simple_dungeon_teleporter.tscn      |   2 +-
 ...e_dungeon_teleporter_highlight_material.tres |   2 +-
 .../simple_dungeon_teleporter_material.tres     |   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 +-
 .../textures/{ => world}/bricks/test_brick.tres |   0
 .../{ => world}/bricks/test_brick_albedo.png    | Bin
 .../bricks/test_brick_albedo.png.import         |   6 +++---
 game/textures/{ => world}/dirt/dirt.tres        |   0
 game/textures/{ => world}/dirt/dirt_albedo.png  | Bin
 .../{ => world}/dirt/dirt_albedo.png.import     |   6 +++---
 game/textures/{ => world}/grass/grass.tres      |   0
 .../textures/{ => world}/grass/grass_albedo.png | Bin
 .../{ => world}/grass/grass_albedo.png.import   |   6 +++---
 .../textures/{ => world}/grass/grass_mossy.tres |   0
 .../{ => world}/grass/grass_mossy_albedo.png    | Bin
 .../grass/grass_mossy_albedo.png.import         |   6 +++---
 game/textures/{ => world}/stone/stone_1.tres    |   0
 .../{ => world}/stone/stone_1_albedo.png        | Bin
 .../{ => world}/stone/stone_1_albedo.png.import |   6 +++---
 .../{ => world}/stone/stone_dungeon_1.tres      |   0
 .../stone/stone_dungeon_1_albedo.png            | Bin
 .../stone/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 +-
 43 files changed, 48 insertions(+), 48 deletions(-)
 rename game/textures/{ => world}/bricks/test_brick.tres (100%)
 rename game/textures/{ => world}/bricks/test_brick_albedo.png (100%)
 rename game/textures/{ => world}/bricks/test_brick_albedo.png.import (68%)
 rename game/textures/{ => world}/dirt/dirt.tres (100%)
 rename game/textures/{ => world}/dirt/dirt_albedo.png (100%)
 rename game/textures/{ => world}/dirt/dirt_albedo.png.import (69%)
 rename game/textures/{ => world}/grass/grass.tres (100%)
 rename game/textures/{ => world}/grass/grass_albedo.png (100%)
 rename game/textures/{ => world}/grass/grass_albedo.png.import (69%)
 rename game/textures/{ => world}/grass/grass_mossy.tres (100%)
 rename game/textures/{ => world}/grass/grass_mossy_albedo.png (100%)
 rename game/textures/{ => world}/grass/grass_mossy_albedo.png.import (67%)
 rename game/textures/{ => world}/stone/stone_1.tres (100%)
 rename game/textures/{ => world}/stone/stone_1_albedo.png (100%)
 rename game/textures/{ => world}/stone/stone_1_albedo.png.import (68%)
 rename game/textures/{ => world}/stone/stone_dungeon_1.tres (100%)
 rename game/textures/{ => world}/stone/stone_dungeon_1_albedo.png (100%)
 rename game/textures/{ => world}/stone/stone_dungeon_1_albedo.png.import (66%)

diff --git a/game/models/buildings/crypt/CryptEntrance.tres b/game/models/buildings/crypt/CryptEntrance.tres
index 951e3a08..81ce7c47 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/stone_dungeon_1_albedo.png" type="Texture" id=1]
+[ext_resource path="res://textures/world/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 e1194942..595bab11 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/stone_dungeon_1_albedo.png" type="Texture" id=6]
+[ext_resource path="res://textures/world/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 4d44bc83..2825b499 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/bricks/test_brick_albedo.png" type="Texture" id=2]
+[ext_resource path="res://textures/world/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 9b58955831f08784d844725890d2004941b696d2..6a4be2bbe2c8e71f3b1c32132c4c291807327ffa 100644
GIT binary patch
literal 778
zcmV+l1NHn;Q$s@n000005C8z21^@u^0ssIgwJ-f(oCQS}0A?j@GC*&V4n$EDMNt&R
zVc2e#NK$RN8KG>1$i3zHuHsK&1y{L^4qY?)8SRJFAF81mt{o{^09pWD0Fx#cs$eg6
zNVr1QAYD_6s+%xEelXq)_ZqX?M%>(D{#Ts&8tMwN{|N5UxtiP1qGGt{9Aj`~m>6lJ
zbx9Y(w2w0Ge~bSeUf}C;u`k5B>}wqV9ZdWW@CWKJOe)0A?KRF@U7G$^IInY78R~?)
znh@^844Yvt&LLdOaVqXeOt`3(AypQ>G|S4M3N})O%Q_5&m1HQs$8NRUMry56kVG<S
zmf9k`85>Qyp+d?aykXe^9!<BElRfCuw1+D>xr!lTn#}1Sg(I6ZkM2UoZj#VN%C)Z1
z`G4TJPyb)=Rpv~LZqn9WoTA$(IIc^K8sZ3yJzdtyWzs4s2w5)5t(vgblPDC!wN&h_
zCt+h$0U$OwHavWMl*sVm0{&yTFrg8NWc&jNXgC=fkqCnDf?S`{(6E-_!K@BqzHJ~7
zhCnzlN-pBRf&T#BEjKYHcFn0!9fLeNovi3Ki9{l4YthIIqqsJ7Jb8_((=CI$*v;(2
z%fp%=fQ+bNtuhLcjEG3m6f%qfPy!)_s)`2^;4?wX60M?<xYGW=0blC^j5#ANxDT0z
zwkT32l5f@%T!@%^Qw<b&`9)^$buts^RwI#Q@PWj;!wkAsN&hS?cgqUw=?-Ap>JA}e
zjfMxII7j0%&=Heg^3`^+E3(8%5x%?&2c2_tfF$_2)Fgb5t!?8H2g5c9(Lb`G_SVDz
zXZ_w2Nd})0GSLLAg+lZba%G4kP_IZ&5j}0ZX{0x-M6Aa|;B1bxHNc|;g3ZU~(s*S|
zi*!KDk8Q8f$Z5Y3&N4@C29K%1ha?ijJJH9ZPbl+ROpLVx(2grSI{xf<h1jzxn{Y^_
z$Mb9x@9a2%_*B`>B59ojP;rtN?R@7%CA=5f$?YPvcnmyFv+AhwtOUE54|dhyO<ObJ
I>{3%hL!3)*sQ>@~

literal 774
zcmV+h1Nr<?Q$s@n000005C8y{1^@u=0ssIgwJ-f(mIWmj05;`oGeB>W4n$EDMNt&R
z!D!tqk)+ykGeX%Kk$cPYUB#cm3a)Y+one;}{h<A@`a?BT!?hy?SO8f7TmX|?$b!A-
zA>j&HgLF+Rs*b`4`N?=Q+-uBk8}Z~;^WWmk*HBxK{YUUi=W1?4i;Cf*bBw`}VPd3>
z)+JpC(>}_$|1bW3IDoIq#l8{ivafagcR=w!z#mPM3bAv0jq_HQrvDYr>zq}FI^nJ+
zg!?eVW|)j~2p4mliain&E^1{+m4!2tWo?iJ8>vEOU4}wSHWlAvw_0u^wN@)=A{jMH
zZ4us#jVRqvA!QIgVcC@1%E=z|Y1+e;oLt2aF-_)lkiwBsCXeny#*UH@M#{CW(fNPi
zxKICI@KxqajE>UQVZ5R{QE*(B7&XKa8GFjCl?<g-RuHmWm0LAottV9|hKsS-TTjBq
zsMHA}I662$e0-e95aI&<W4J)E5s7I00|;<%G&Uj;1mOj_KBZy8n#P4$9mKa22tyzq
z7&n~6e*@ie6aO!OiCuFlRM((Or;`@lCXq-aZ7&+RX%trnk0-BDb-HbE7rUE%n0Z(e
zT$%=ei>P5OGD?w*j3h}48OBfoA%?1o2NK{jJ<JlVqLH}L{=WfV>jI26BNn&-8AJOQ
z=?#gt>j{=|m`?!!lza2VFmGJa2k0gvm1OdFFh@r~I)EXIx#ebdba$9GxI^o#so_EZ
zza#AocEs|Re6?NdiY#$bgahx2gYFzhAPIghH3{EiYumV*!LSWN^p9+$y*crKS&#Qj
zlF?_FOlSgZ=^?s={2O8q)D;m@gPb1TJn{`F5j$f#pf*i<4frV0U~ywprEz79ixf@F
zi|wot$?4Zv?mfpC%VVnjkVJxbC;3-&K`8%;o&hTWEw{qI<3t@75MwsG34v6mbDneJ
z%8omW?~d)(CHauREnTu>Q}29GpY1j6<aQrgItCtxtvaeaE5Y96gIzUvY3m_yOHxxq
ELm*&cPXGV_

diff --git a/game/props/teleporters/dungeon/simple_dungeon_back_teleporter.tscn b/game/props/teleporters/dungeon/simple_dungeon_back_teleporter.tscn
index 77a9bdea..4b2c3d22 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=7 format=2]
 
 [ext_resource path="res://scripts/dungeons/teleporters/dung_back_teleporter.gd" type="Script" id=1]
-[ext_resource path="res://textures/bricks/test_brick_albedo.png" type="Texture" id=2]
+[ext_resource path="res://textures/world/bricks/test_brick_albedo.png" type="Texture" id=2]
 [ext_resource path="res://props/teleporters/dungeon/simple_dungeon_teleporter_material.tres" type="Material" id=3]
 [ext_resource path="res://props/teleporters/dungeon/simple_dungeon_teleporter_highlight_material.tres" type="Material" id=4]
 [ext_resource path="res://models/teleporters/dungeon/simple_dungeon_teleporter.tres" type="MeshDataResource" id=5]
diff --git a/game/props/teleporters/dungeon/simple_dungeon_teleporter.tscn b/game/props/teleporters/dungeon/simple_dungeon_teleporter.tscn
index ead8b419..aa7d569f 100644
--- a/game/props/teleporters/dungeon/simple_dungeon_teleporter.tscn
+++ b/game/props/teleporters/dungeon/simple_dungeon_teleporter.tscn
@@ -3,7 +3,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://models/teleporters/dungeon/simple_dungeon_teleporter.tres" type="MeshDataResource" id=3]
-[ext_resource path="res://textures/stone/stone_1_albedo.png" type="Texture" id=4]
+[ext_resource path="res://textures/world/stone/stone_1_albedo.png" type="Texture" id=4]
 [ext_resource path="res://props/teleporters/dungeon/simple_dungeon_teleporter_material.tres" type="Material" id=5]
 [ext_resource path="res://props/teleporters/dungeon/simple_dungeon_teleporter_highlight_material.tres" type="Material" id=6]
 
diff --git a/game/props/teleporters/dungeon/simple_dungeon_teleporter_highlight_material.tres b/game/props/teleporters/dungeon/simple_dungeon_teleporter_highlight_material.tres
index 35e5f9f5..84a7a138 100644
--- a/game/props/teleporters/dungeon/simple_dungeon_teleporter_highlight_material.tres
+++ b/game/props/teleporters/dungeon/simple_dungeon_teleporter_highlight_material.tres
@@ -1,7 +1,7 @@
 [gd_resource type="ShaderMaterial" load_steps=3 format=2]
 
 [ext_resource path="res://shaders/5_standard_shader_nouv2.tres" type="Shader" id=1]
-[ext_resource path="res://textures/stone/stone_1_albedo.png" type="Texture" id=2]
+[ext_resource path="res://textures/world/stone/stone_1_albedo.png" type="Texture" id=2]
 
 [resource]
 shader = ExtResource( 1 )
diff --git a/game/props/teleporters/dungeon/simple_dungeon_teleporter_material.tres b/game/props/teleporters/dungeon/simple_dungeon_teleporter_material.tres
index 8905acc9..d16b3fca 100644
--- a/game/props/teleporters/dungeon/simple_dungeon_teleporter_material.tres
+++ b/game/props/teleporters/dungeon/simple_dungeon_teleporter_material.tres
@@ -1,7 +1,7 @@
 [gd_resource type="ShaderMaterial" load_steps=3 format=2]
 
 [ext_resource path="res://shaders/5_standard_shader_nouv2.tres" type="Shader" id=1]
-[ext_resource path="res://textures/stone/stone_1_albedo.png" type="Texture" id=2]
+[ext_resource path="res://textures/world/stone/stone_1_albedo.png" type="Texture" id=2]
 
 [resource]
 shader = ExtResource( 1 )
diff --git a/game/scenes/world/new_terramanlibrarymerger.tres b/game/scenes/world/new_terramanlibrarymerger.tres
index 5254ef2f..33f84bd7 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/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://textures/world/grass/grass_mossy_albedo.png" type="Texture" id=1]
+[ext_resource path="res://textures/world/dirt/dirt_albedo.png" type="Texture" id=2]
+[ext_resource path="res://textures/world/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 07a6107a..b14db1ec 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/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://textures/world/grass/grass_mossy_albedo.png" type="Texture" id=3]
+[ext_resource path="res://textures/world/dirt/dirt_albedo.png" type="Texture" id=4]
+[ext_resource path="res://textures/world/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 384262a9..7a5fb1a2 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/grass_mossy_albedo.png" type="Texture" id=1]
+[ext_resource path="res://textures/world/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 1290a0cf..b05687a7 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/stone_dungeon_1_albedo.png" type="Texture" id=3]
+[ext_resource path="res://textures/world/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 f53d491f..f83ee6bf 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/stone_dungeon_1_albedo.png" type="Texture" id=4]
+[ext_resource path="res://textures/world/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 b3d107d6..5fe57da0 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/stone_dungeon_1_albedo.png" type="Texture" id=3]
+[ext_resource path="res://textures/world/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 21320804..5d2581d8 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/stone_dungeon_1_albedo.png" type="Texture" id=4]
+[ext_resource path="res://textures/world/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 ae660dca..217eb366 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/stone_dungeon_1_albedo.png" type="Texture" id=3]
+[ext_resource path="res://textures/world/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 c0c922a1..58c0c5db 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/stone_dungeon_1_albedo.png" type="Texture" id=4]
+[ext_resource path="res://textures/world/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 df9e032d..8710e217 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/stone_dungeon_1_albedo.png" type="Texture" id=3]
+[ext_resource path="res://textures/world/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 d3c5d782..6768bf11 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/stone_dungeon_1_albedo.png" type="Texture" id=4]
+[ext_resource path="res://textures/world/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 995e1a25..594c5046 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/stone_dungeon_1_albedo.png" type="Texture" id=3]
+[ext_resource path="res://textures/world/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 8a541026..d9db50b6 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/stone_dungeon_1_albedo.png" type="Texture" id=4]
+[ext_resource path="res://textures/world/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 412c583c..26b54b83 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/stone_dungeon_1_albedo.png" type="Texture" id=1]
+[ext_resource path="res://textures/world/stone/stone_dungeon_1_albedo.png" type="Texture" id=1]
 
 [resource]
 tiling_type = 3
diff --git a/game/textures/bricks/test_brick.tres b/game/textures/world/bricks/test_brick.tres
similarity index 100%
rename from game/textures/bricks/test_brick.tres
rename to game/textures/world/bricks/test_brick.tres
diff --git a/game/textures/bricks/test_brick_albedo.png b/game/textures/world/bricks/test_brick_albedo.png
similarity index 100%
rename from game/textures/bricks/test_brick_albedo.png
rename to game/textures/world/bricks/test_brick_albedo.png
diff --git a/game/textures/bricks/test_brick_albedo.png.import b/game/textures/world/bricks/test_brick_albedo.png.import
similarity index 68%
rename from game/textures/bricks/test_brick_albedo.png.import
rename to game/textures/world/bricks/test_brick_albedo.png.import
index 6743b47d..4a7ecc41 100644
--- a/game/textures/bricks/test_brick_albedo.png.import
+++ b/game/textures/world/bricks/test_brick_albedo.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/test_brick_albedo.png-8e7c577447ede4c1eda61a908c66542a.stex"
+path="res://.import/test_brick_albedo.png-954a1da055575f495ab0ef84cd1e9878.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://textures/bricks/test_brick_albedo.png"
-dest_files=[ "res://.import/test_brick_albedo.png-8e7c577447ede4c1eda61a908c66542a.stex" ]
+source_file="res://textures/world/bricks/test_brick_albedo.png"
+dest_files=[ "res://.import/test_brick_albedo.png-954a1da055575f495ab0ef84cd1e9878.stex" ]
 
 [params]
 
diff --git a/game/textures/dirt/dirt.tres b/game/textures/world/dirt/dirt.tres
similarity index 100%
rename from game/textures/dirt/dirt.tres
rename to game/textures/world/dirt/dirt.tres
diff --git a/game/textures/dirt/dirt_albedo.png b/game/textures/world/dirt/dirt_albedo.png
similarity index 100%
rename from game/textures/dirt/dirt_albedo.png
rename to game/textures/world/dirt/dirt_albedo.png
diff --git a/game/textures/dirt/dirt_albedo.png.import b/game/textures/world/dirt/dirt_albedo.png.import
similarity index 69%
rename from game/textures/dirt/dirt_albedo.png.import
rename to game/textures/world/dirt/dirt_albedo.png.import
index 100175c4..914eec92 100644
--- a/game/textures/dirt/dirt_albedo.png.import
+++ b/game/textures/world/dirt/dirt_albedo.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/dirt_albedo.png-d6fc52a68abcaa5cba6736aac308fc3f.stex"
+path="res://.import/dirt_albedo.png-7a69d49d8990a3cc74a87f23d6f7d12b.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://textures/dirt/dirt_albedo.png"
-dest_files=[ "res://.import/dirt_albedo.png-d6fc52a68abcaa5cba6736aac308fc3f.stex" ]
+source_file="res://textures/world/dirt/dirt_albedo.png"
+dest_files=[ "res://.import/dirt_albedo.png-7a69d49d8990a3cc74a87f23d6f7d12b.stex" ]
 
 [params]
 
diff --git a/game/textures/grass/grass.tres b/game/textures/world/grass/grass.tres
similarity index 100%
rename from game/textures/grass/grass.tres
rename to game/textures/world/grass/grass.tres
diff --git a/game/textures/grass/grass_albedo.png b/game/textures/world/grass/grass_albedo.png
similarity index 100%
rename from game/textures/grass/grass_albedo.png
rename to game/textures/world/grass/grass_albedo.png
diff --git a/game/textures/grass/grass_albedo.png.import b/game/textures/world/grass/grass_albedo.png.import
similarity index 69%
rename from game/textures/grass/grass_albedo.png.import
rename to game/textures/world/grass/grass_albedo.png.import
index 5687d1fb..6f7d9bcc 100644
--- a/game/textures/grass/grass_albedo.png.import
+++ b/game/textures/world/grass/grass_albedo.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/grass_albedo.png-264672b037c72ffc0fcefce902f3cecf.stex"
+path="res://.import/grass_albedo.png-98f823f3934e2385e621ff43b9d5e799.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://textures/grass/grass_albedo.png"
-dest_files=[ "res://.import/grass_albedo.png-264672b037c72ffc0fcefce902f3cecf.stex" ]
+source_file="res://textures/world/grass/grass_albedo.png"
+dest_files=[ "res://.import/grass_albedo.png-98f823f3934e2385e621ff43b9d5e799.stex" ]
 
 [params]
 
diff --git a/game/textures/grass/grass_mossy.tres b/game/textures/world/grass/grass_mossy.tres
similarity index 100%
rename from game/textures/grass/grass_mossy.tres
rename to game/textures/world/grass/grass_mossy.tres
diff --git a/game/textures/grass/grass_mossy_albedo.png b/game/textures/world/grass/grass_mossy_albedo.png
similarity index 100%
rename from game/textures/grass/grass_mossy_albedo.png
rename to game/textures/world/grass/grass_mossy_albedo.png
diff --git a/game/textures/grass/grass_mossy_albedo.png.import b/game/textures/world/grass/grass_mossy_albedo.png.import
similarity index 67%
rename from game/textures/grass/grass_mossy_albedo.png.import
rename to game/textures/world/grass/grass_mossy_albedo.png.import
index 3e2a04bc..0e838e71 100644
--- a/game/textures/grass/grass_mossy_albedo.png.import
+++ b/game/textures/world/grass/grass_mossy_albedo.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/grass_mossy_albedo.png-24a324fb3c9987ba0713948e1d98cab3.stex"
+path="res://.import/grass_mossy_albedo.png-a81a460ca5e83d451b21837e8f017c21.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://textures/grass/grass_mossy_albedo.png"
-dest_files=[ "res://.import/grass_mossy_albedo.png-24a324fb3c9987ba0713948e1d98cab3.stex" ]
+source_file="res://textures/world/grass/grass_mossy_albedo.png"
+dest_files=[ "res://.import/grass_mossy_albedo.png-a81a460ca5e83d451b21837e8f017c21.stex" ]
 
 [params]
 
diff --git a/game/textures/stone/stone_1.tres b/game/textures/world/stone/stone_1.tres
similarity index 100%
rename from game/textures/stone/stone_1.tres
rename to game/textures/world/stone/stone_1.tres
diff --git a/game/textures/stone/stone_1_albedo.png b/game/textures/world/stone/stone_1_albedo.png
similarity index 100%
rename from game/textures/stone/stone_1_albedo.png
rename to game/textures/world/stone/stone_1_albedo.png
diff --git a/game/textures/stone/stone_1_albedo.png.import b/game/textures/world/stone/stone_1_albedo.png.import
similarity index 68%
rename from game/textures/stone/stone_1_albedo.png.import
rename to game/textures/world/stone/stone_1_albedo.png.import
index f063fec1..fb417057 100644
--- a/game/textures/stone/stone_1_albedo.png.import
+++ b/game/textures/world/stone/stone_1_albedo.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/stone_1_albedo.png-16c773285e3ce65fd23a7f7f8ff228ea.stex"
+path="res://.import/stone_1_albedo.png-fb0a567586fcf362e3d493fbb5f06579.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://textures/stone/stone_1_albedo.png"
-dest_files=[ "res://.import/stone_1_albedo.png-16c773285e3ce65fd23a7f7f8ff228ea.stex" ]
+source_file="res://textures/world/stone/stone_1_albedo.png"
+dest_files=[ "res://.import/stone_1_albedo.png-fb0a567586fcf362e3d493fbb5f06579.stex" ]
 
 [params]
 
diff --git a/game/textures/stone/stone_dungeon_1.tres b/game/textures/world/stone/stone_dungeon_1.tres
similarity index 100%
rename from game/textures/stone/stone_dungeon_1.tres
rename to game/textures/world/stone/stone_dungeon_1.tres
diff --git a/game/textures/stone/stone_dungeon_1_albedo.png b/game/textures/world/stone/stone_dungeon_1_albedo.png
similarity index 100%
rename from game/textures/stone/stone_dungeon_1_albedo.png
rename to game/textures/world/stone/stone_dungeon_1_albedo.png
diff --git a/game/textures/stone/stone_dungeon_1_albedo.png.import b/game/textures/world/stone/stone_dungeon_1_albedo.png.import
similarity index 66%
rename from game/textures/stone/stone_dungeon_1_albedo.png.import
rename to game/textures/world/stone/stone_dungeon_1_albedo.png.import
index e13f0ad1..0291dc8c 100644
--- a/game/textures/stone/stone_dungeon_1_albedo.png.import
+++ b/game/textures/world/stone/stone_dungeon_1_albedo.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/stone_dungeon_1_albedo.png-f712f5e810eed24945a5c2826472a828.stex"
+path="res://.import/stone_dungeon_1_albedo.png-f7da6adb808a7a62b93721a24a2d7f89.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://textures/stone/stone_dungeon_1_albedo.png"
-dest_files=[ "res://.import/stone_dungeon_1_albedo.png-f712f5e810eed24945a5c2826472a828.stex" ]
+source_file="res://textures/world/stone/stone_dungeon_1_albedo.png"
+dest_files=[ "res://.import/stone_dungeon_1_albedo.png-f7da6adb808a7a62b93721a24a2d7f89.stex" ]
 
 [params]
 
diff --git a/game/worlds/test_world/dungeons/dungeon.tres b/game/worlds/test_world/dungeons/dungeon.tres
index 16f5054c..32dd4227 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/stone_1_albedo.png" type="Texture" id=10]
-[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=11]
+[ext_resource path="res://textures/world/stone/stone_1_albedo.png" type="Texture" id=10]
+[ext_resource path="res://textures/world/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 59d8348c..043be067 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/stone_1_albedo.png" type="Texture" id=10]
-[ext_resource path="res://textures/stone/stone_dungeon_1_albedo.png" type="Texture" id=11]
+[ext_resource path="res://textures/world/stone/stone_1_albedo.png" type="Texture" id=10]
+[ext_resource path="res://textures/world/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 7dc73cde..8d19d852 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/grass_mossy_albedo.png" type="Texture" id=1]
+[ext_resource path="res://textures/world/grass/grass_mossy_albedo.png" type="Texture" id=1]