From b0874ebbb66e1ebe52be403b2127778992c0e140 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Apr 2020 11:12:20 +0200 Subject: [PATCH] Renamed voxel_libraries to voxel_library and moved in into the test planet's folder. (Note that the library is at the moment used by World scene, this will be changed later.) --- game/data/models/Material_003.material | Bin 783 -> 792 bytes .../voxel_library}/1_main_lib_merger_empty.tres | 10 ++++++---- .../voxel_library}/merger_library_mat.tres | 0 .../voxel_library}/merger_prop_mat.tres | 4 +++- .../voxel_library}/surfaces/1_stone.tres | 4 +++- .../voxel_library}/surfaces/2_test.tres | 4 +++- .../voxel_library}/surfaces/3_test2.tres | 4 +++- .../surfaces/4_dungeon_stone.tres | 4 +++- .../voxel_library}/surfaces/stone_2.ptex | 0 .../surfaces/stone_2_albedo.png.import | 0 .../voxel_library}/textures/Ground03_col.png | Bin .../textures/Ground03_col.png.import | 6 +++--- .../voxel_library}/textures/Ground03_col2.png | Bin .../textures/Ground03_col2.png.import | 6 +++--- .../voxel_library}/textures/Rock24_col.png | Bin .../textures/Rock24_col.png.import} | 6 +++--- .../voxel_library}/textures/Rock24_col2.png | Bin .../textures/Rock24_col2.png.import | 6 +++--- .../voxel_library}/textures/dirt.ptex | 0 .../voxel_library}/textures/dirt_albedo.png | Bin .../textures/dirt_albedo.png.import | 6 +++--- .../voxel_library}/textures/grass.ptex | 0 .../voxel_library}/textures/grass_mossy.ptex | 0 .../textures/grass_mossy_albedo.png | Bin .../textures/grass_mossy_albedo.png.import} | 6 +++--- .../voxel_library}/textures/stone_1.ptex | 0 .../voxel_library}/textures/stone_1_albedo.png | Bin .../textures/stone_1_albedo.png.import | 6 +++--- .../voxel_library}/textures/stone_1_readme.txt | 0 .../textures/stone_dungeon_1.ptex | 0 .../textures/stone_dungeon_1_albedo.png | Bin .../textures/stone_dungeon_1_albedo.png.import | 6 +++--- .../voxel_library}/textures/test.png.import | 0 .../voxel_library}/textures/test_brick.ptex | 0 .../textures/test_brick_albedo.png | Bin .../textures/test_brick_albedo.png.import | 6 +++--- game/scenes/Menu.tscn | 4 +++- game/scenes/World.tscn | 4 +++- game/voxelman/TestScene.tscn | 4 +++- game/voxelman/world/TVTestScene.tscn | 4 +++- game/voxelman/world/TVVoxelWorld.tscn | 4 +++- 41 files changed, 63 insertions(+), 41 deletions(-) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/1_main_lib_merger_empty.tres (53%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/merger_library_mat.tres (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/merger_prop_mat.tres (63%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/surfaces/1_stone.tres (66%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/surfaces/2_test.tres (65%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/surfaces/3_test2.tres (65%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/surfaces/4_dungeon_stone.tres (65%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/surfaces/stone_2.ptex (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/surfaces/stone_2_albedo.png.import (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/Ground03_col.png (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/Ground03_col.png.import (65%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/Ground03_col2.png (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/Ground03_col2.png.import (65%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/Rock24_col.png (100%) rename game/data/{voxel_libraries/textures/grass_mossy_albedo.png.import => planets/test_planet/voxel_library/textures/Rock24_col.png.import} (67%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/Rock24_col2.png (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/Rock24_col2.png.import (65%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/dirt.ptex (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/dirt_albedo.png (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/dirt_albedo.png.import (65%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/grass.ptex (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/grass_mossy.ptex (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/grass_mossy_albedo.png (100%) rename game/data/{voxel_libraries/textures/Rock24_col.png.import => planets/test_planet/voxel_library/textures/grass_mossy_albedo.png.import} (63%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/stone_1.ptex (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/stone_1_albedo.png (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/stone_1_albedo.png.import (64%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/stone_1_readme.txt (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/stone_dungeon_1.ptex (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/stone_dungeon_1_albedo.png (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/stone_dungeon_1_albedo.png.import (62%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/test.png.import (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/test_brick.ptex (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/test_brick_albedo.png (100%) rename game/data/{voxel_libraries => planets/test_planet/voxel_library}/textures/test_brick_albedo.png.import (64%) diff --git a/game/data/models/Material_003.material b/game/data/models/Material_003.material index 40260610f997c867efe2778ba38372389a520ae7..c862e8e839260134e1f70b8930435d7027369275 100644 GIT binary patch literal 792 zcmV+z1LyowQ$s@n000005C8zT1^@s60{{RhwJ-f(w*|Eq02U{3GC*$v0VpL-iBsZS ztQ5I_nu1UM(DYLNOf_Yq z)>*PQKO{UQYk;t6MH5o^lAnw>%f-eFw~r^dn*SDO#&&H<_8-A7tya~x+e|Ds9b^oi zED@jfEkwF5(LTz#|1bV~c!n=jn~fX`Rb%t`?||ZefIqnyi^cVzY@A7*rcvqG!NtZ3 zSC^vy70wHtRd$VXSJCA@%(7W3#=*g5pI*a+1>2J%)^@C(sWx{u?LNc7IPs-ZDM&$ z6|-`Z!jn-ZkM2swkb({askN}v`G4TKPyb)=Rc3|wkkS@nyrMf%@LY)aS|*8%MP=4f z45gE*Tr#yPxM{*#52{EkAv!!dKA13ZLIa2k_>bWN#YQBe@ed#%!qM1>L=M6$lR6tF ztZ7`B)j4L|34|e+#bwmGl@|Sg9E3X|*q9)Y4xAhx@!!CI0Pm(2@&5ve7&fbv37fmL za+F24NhA_U+lx+a8qLMw<5AcdfQzVcEh5a!3=AMh0D=He0suo*#RC!mBtgppSJ4c( zg8n~u>jICCW|_D#;yHaSHZE;vYEwe=7-!WAQ4~^`F4zomCJWi1#4rKdt;9yh9CRfl zt@akQOzW0j8q6J`ygkr}-DpSQv)K{)mdMqfs5?SM3X1Aqf#b?G=|I7P!IX3qZYP|y^wr#Df)(AAIo%O`FU_1%oD5$dfeYEaCxv!}*U z7fV&8La)R7q1tMv WO3)Hr#Ju9%#^*ez9PbiRQ$s_uhIK*! literal 783 zcmV+q1MvJ(Q$s@n000005C8zB1^@u}0ssIgwJ-f(r3Gyl0M=%2GC*$v0VpL-iBsZS zmPjdonu1UM&`eVP(3Ty%~t zI5JF(w9&ex3t`$v8TbFie~xvz*au==_BD_H4JQ6m`~eIXW3jiMgpEN3r$vB5_F~_O6l9+H&D?_R(oS7_ZgD%)e6*B8G6kf8a z_#V5}avQ0&YQYi7s99=*@Mdg8>4qw*(`|#h*xl^I%)^S{qv^JCG6#K{_HZR9S209P zlQ|unaAcIpqq~r?qa=ipa;gA4N*kKo-%7C zLur*3ge;fkR!LavNfjy|Iy^c$kRVY4gNFzBf8nRFFtHJdX#4^Oa5x$pkqCnDLZwcI z32Pc3%<3TK+X;jrjJdZ=F0}BX70C4|2xJ2zhlluI;6H$O%T4^B048?LsZd>mK02Me z=r)N&B58Zk$W5cTG*q6v#(;>Zp)De1W(EQX5ClO0Pyzr$R@DI#phH2+60M>ca0UH; z0QZd=aG*`0P+}0hRwx`BXIvAot|*r-_FzU7FuV*+iPV`xL=_6b=r}_<&@E7y*=;)- z!yT#He$b9xio?*E^$2~H$m(6T7NJJ~k!?I84oYcafCC(6sve%mw&2*vpuz^S^gKJ- zo>Qn_MdkMwO#ZWK%yz=kgdrw`B|U@~h$y^?mK}?Cihx5XVj;{3aGzzm0f&+Ur5!t! zhL>3^k`6ISc2`CfO-7CRoB6gDKH@(MV)@NYpGP6u;aP`h(Xfl2 zP@Z~*&R-z7;>fr76WmTEk(0!i?PU$UtDFUu>q7gU%A`Z1!~e+73R9J$)e>bMb51Am Nrs#Rbc9~LBLqqqqV|f4o diff --git a/game/data/voxel_libraries/1_main_lib_merger_empty.tres b/game/data/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres similarity index 53% rename from game/data/voxel_libraries/1_main_lib_merger_empty.tres rename to game/data/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres index db2763d5..2820072b 100644 --- a/game/data/voxel_libraries/1_main_lib_merger_empty.tres +++ b/game/data/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres @@ -1,15 +1,17 @@ [gd_resource type="VoxelmanLibraryMerger" load_steps=8 format=2] [ext_resource path="res://data/materials/1_standard_material.tres" type="Material" id=1] -[ext_resource path="res://data/voxel_libraries/surfaces/4_dungeon_stone.tres" type="VoxelSurfaceMerger" id=2] -[ext_resource path="res://data/voxel_libraries/surfaces/2_test.tres" type="VoxelSurfaceMerger" id=3] -[ext_resource path="res://data/voxel_libraries/surfaces/1_stone.tres" type="VoxelSurfaceMerger" id=4] -[ext_resource path="res://data/voxel_libraries/surfaces/3_test2.tres" type="VoxelSurfaceMerger" id=5] +[ext_resource path="res://data/planets/test_planet/voxel_library/surfaces/4_dungeon_stone.tres" type="VoxelSurfaceMerger" id=2] +[ext_resource path="res://data/planets/test_planet/voxel_library/surfaces/2_test.tres" type="VoxelSurfaceMerger" id=3] +[ext_resource path="res://data/planets/test_planet/voxel_library/surfaces/1_stone.tres" type="VoxelSurfaceMerger" id=4] +[ext_resource path="res://data/planets/test_planet/voxel_library/surfaces/3_test2.tres" type="VoxelSurfaceMerger" id=5] [ext_resource path="res://data/materials/5_standard_material_nouv2.tres" type="Material" id=8] [ext_resource path="res://data/materials/7_standard_material_notex.tres" type="Material" id=10] + + [resource] materials = [ ExtResource( 1 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 10 ) ] texture_flags = 1 diff --git a/game/data/voxel_libraries/merger_library_mat.tres b/game/data/planets/test_planet/voxel_library/merger_library_mat.tres similarity index 100% rename from game/data/voxel_libraries/merger_library_mat.tres rename to game/data/planets/test_planet/voxel_library/merger_library_mat.tres diff --git a/game/data/voxel_libraries/merger_prop_mat.tres b/game/data/planets/test_planet/voxel_library/merger_prop_mat.tres similarity index 63% rename from game/data/voxel_libraries/merger_prop_mat.tres rename to game/data/planets/test_planet/voxel_library/merger_prop_mat.tres index 33594d57..f5454e37 100644 --- a/game/data/voxel_libraries/merger_prop_mat.tres +++ b/game/data/planets/test_planet/voxel_library/merger_prop_mat.tres @@ -1,6 +1,8 @@ [gd_resource type="SpatialMaterial" load_steps=2 format=2] -[ext_resource path="res://data/voxel_libraries/textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] + + diff --git a/game/data/voxel_libraries/surfaces/1_stone.tres b/game/data/planets/test_planet/voxel_library/surfaces/1_stone.tres similarity index 66% rename from game/data/voxel_libraries/surfaces/1_stone.tres rename to game/data/planets/test_planet/voxel_library/surfaces/1_stone.tres index 1f04bf3d..4cf33817 100644 --- a/game/data/voxel_libraries/surfaces/1_stone.tres +++ b/game/data/planets/test_planet/voxel_library/surfaces/1_stone.tres @@ -1,6 +1,8 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_libraries/textures/dirt_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/planets/test_planet/voxel_library/textures/dirt_albedo.png" type="Texture" id=1] + + diff --git a/game/data/voxel_libraries/surfaces/2_test.tres b/game/data/planets/test_planet/voxel_library/surfaces/2_test.tres similarity index 65% rename from game/data/voxel_libraries/surfaces/2_test.tres rename to game/data/planets/test_planet/voxel_library/surfaces/2_test.tres index 001f4907..8f276e14 100644 --- a/game/data/voxel_libraries/surfaces/2_test.tres +++ b/game/data/planets/test_planet/voxel_library/surfaces/2_test.tres @@ -1,6 +1,8 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_libraries/textures/stone_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=1] + + diff --git a/game/data/voxel_libraries/surfaces/3_test2.tres b/game/data/planets/test_planet/voxel_library/surfaces/3_test2.tres similarity index 65% rename from game/data/voxel_libraries/surfaces/3_test2.tres rename to game/data/planets/test_planet/voxel_library/surfaces/3_test2.tres index 45069302..dc27cd71 100644 --- a/game/data/voxel_libraries/surfaces/3_test2.tres +++ b/game/data/planets/test_planet/voxel_library/surfaces/3_test2.tres @@ -1,6 +1,8 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_libraries/textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] + + diff --git a/game/data/voxel_libraries/surfaces/4_dungeon_stone.tres b/game/data/planets/test_planet/voxel_library/surfaces/4_dungeon_stone.tres similarity index 65% rename from game/data/voxel_libraries/surfaces/4_dungeon_stone.tres rename to game/data/planets/test_planet/voxel_library/surfaces/4_dungeon_stone.tres index 0fa567cf..5e37e583 100644 --- a/game/data/voxel_libraries/surfaces/4_dungeon_stone.tres +++ b/game/data/planets/test_planet/voxel_library/surfaces/4_dungeon_stone.tres @@ -1,6 +1,8 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_libraries/textures/stone_dungeon_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=1] + + diff --git a/game/data/voxel_libraries/surfaces/stone_2.ptex b/game/data/planets/test_planet/voxel_library/surfaces/stone_2.ptex similarity index 100% rename from game/data/voxel_libraries/surfaces/stone_2.ptex rename to game/data/planets/test_planet/voxel_library/surfaces/stone_2.ptex diff --git a/game/data/voxel_libraries/surfaces/stone_2_albedo.png.import b/game/data/planets/test_planet/voxel_library/surfaces/stone_2_albedo.png.import similarity index 100% rename from game/data/voxel_libraries/surfaces/stone_2_albedo.png.import rename to game/data/planets/test_planet/voxel_library/surfaces/stone_2_albedo.png.import diff --git a/game/data/voxel_libraries/textures/Ground03_col.png b/game/data/planets/test_planet/voxel_library/textures/Ground03_col.png similarity index 100% rename from game/data/voxel_libraries/textures/Ground03_col.png rename to game/data/planets/test_planet/voxel_library/textures/Ground03_col.png diff --git a/game/data/voxel_libraries/textures/Ground03_col.png.import b/game/data/planets/test_planet/voxel_library/textures/Ground03_col.png.import similarity index 65% rename from game/data/voxel_libraries/textures/Ground03_col.png.import rename to game/data/planets/test_planet/voxel_library/textures/Ground03_col.png.import index 499798fb..3e390b94 100644 --- a/game/data/voxel_libraries/textures/Ground03_col.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/Ground03_col.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Ground03_col.png-05a4aa26f9fa266cf400cf49915547ac.stex" +path="res://.import/Ground03_col.png-7fc02a77cefa8db972c4f7f6263197ad.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/Ground03_col.png" -dest_files=[ "res://.import/Ground03_col.png-05a4aa26f9fa266cf400cf49915547ac.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/Ground03_col.png" +dest_files=[ "res://.import/Ground03_col.png-7fc02a77cefa8db972c4f7f6263197ad.stex" ] [params] diff --git a/game/data/voxel_libraries/textures/Ground03_col2.png b/game/data/planets/test_planet/voxel_library/textures/Ground03_col2.png similarity index 100% rename from game/data/voxel_libraries/textures/Ground03_col2.png rename to game/data/planets/test_planet/voxel_library/textures/Ground03_col2.png diff --git a/game/data/voxel_libraries/textures/Ground03_col2.png.import b/game/data/planets/test_planet/voxel_library/textures/Ground03_col2.png.import similarity index 65% rename from game/data/voxel_libraries/textures/Ground03_col2.png.import rename to game/data/planets/test_planet/voxel_library/textures/Ground03_col2.png.import index b84f81e3..f4fdfa0b 100644 --- a/game/data/voxel_libraries/textures/Ground03_col2.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/Ground03_col2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Ground03_col2.png-a42946178d8e9a2830d1eede8573679e.stex" +path="res://.import/Ground03_col2.png-5c4c0b5963c6721b0edbe6abb39825c1.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/Ground03_col2.png" -dest_files=[ "res://.import/Ground03_col2.png-a42946178d8e9a2830d1eede8573679e.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/Ground03_col2.png" +dest_files=[ "res://.import/Ground03_col2.png-5c4c0b5963c6721b0edbe6abb39825c1.stex" ] [params] diff --git a/game/data/voxel_libraries/textures/Rock24_col.png b/game/data/planets/test_planet/voxel_library/textures/Rock24_col.png similarity index 100% rename from game/data/voxel_libraries/textures/Rock24_col.png rename to game/data/planets/test_planet/voxel_library/textures/Rock24_col.png diff --git a/game/data/voxel_libraries/textures/grass_mossy_albedo.png.import b/game/data/planets/test_planet/voxel_library/textures/Rock24_col.png.import similarity index 67% rename from game/data/voxel_libraries/textures/grass_mossy_albedo.png.import rename to game/data/planets/test_planet/voxel_library/textures/Rock24_col.png.import index 0127c9f4..ace21058 100644 --- a/game/data/voxel_libraries/textures/grass_mossy_albedo.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/Rock24_col.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass_mossy_albedo.png-16785a259e3d6b163da72c9345fb595b.stex" +path="res://.import/Rock24_col.png-9a87a7efaf0afac9cd06a98df0fc7216.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/grass_mossy_albedo.png" -dest_files=[ "res://.import/grass_mossy_albedo.png-16785a259e3d6b163da72c9345fb595b.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/Rock24_col.png" +dest_files=[ "res://.import/Rock24_col.png-9a87a7efaf0afac9cd06a98df0fc7216.stex" ] [params] diff --git a/game/data/voxel_libraries/textures/Rock24_col2.png b/game/data/planets/test_planet/voxel_library/textures/Rock24_col2.png similarity index 100% rename from game/data/voxel_libraries/textures/Rock24_col2.png rename to game/data/planets/test_planet/voxel_library/textures/Rock24_col2.png diff --git a/game/data/voxel_libraries/textures/Rock24_col2.png.import b/game/data/planets/test_planet/voxel_library/textures/Rock24_col2.png.import similarity index 65% rename from game/data/voxel_libraries/textures/Rock24_col2.png.import rename to game/data/planets/test_planet/voxel_library/textures/Rock24_col2.png.import index 74bebc6e..00cfe0d5 100644 --- a/game/data/voxel_libraries/textures/Rock24_col2.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/Rock24_col2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Rock24_col2.png-2817c54e28d7f4841cfbaa315064ade9.stex" +path="res://.import/Rock24_col2.png-ea184594f66bc6e74290e10e582995ae.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/Rock24_col2.png" -dest_files=[ "res://.import/Rock24_col2.png-2817c54e28d7f4841cfbaa315064ade9.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/Rock24_col2.png" +dest_files=[ "res://.import/Rock24_col2.png-ea184594f66bc6e74290e10e582995ae.stex" ] [params] diff --git a/game/data/voxel_libraries/textures/dirt.ptex b/game/data/planets/test_planet/voxel_library/textures/dirt.ptex similarity index 100% rename from game/data/voxel_libraries/textures/dirt.ptex rename to game/data/planets/test_planet/voxel_library/textures/dirt.ptex diff --git a/game/data/voxel_libraries/textures/dirt_albedo.png b/game/data/planets/test_planet/voxel_library/textures/dirt_albedo.png similarity index 100% rename from game/data/voxel_libraries/textures/dirt_albedo.png rename to game/data/planets/test_planet/voxel_library/textures/dirt_albedo.png diff --git a/game/data/voxel_libraries/textures/dirt_albedo.png.import b/game/data/planets/test_planet/voxel_library/textures/dirt_albedo.png.import similarity index 65% rename from game/data/voxel_libraries/textures/dirt_albedo.png.import rename to game/data/planets/test_planet/voxel_library/textures/dirt_albedo.png.import index 0f77d5ea..27ca234a 100644 --- a/game/data/voxel_libraries/textures/dirt_albedo.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/dirt_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dirt_albedo.png-d0bf5444f208485b852a65527bae9813.stex" +path="res://.import/dirt_albedo.png-c20fd07280e558c7b47f1857b0b197b9.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/dirt_albedo.png" -dest_files=[ "res://.import/dirt_albedo.png-d0bf5444f208485b852a65527bae9813.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/dirt_albedo.png" +dest_files=[ "res://.import/dirt_albedo.png-c20fd07280e558c7b47f1857b0b197b9.stex" ] [params] diff --git a/game/data/voxel_libraries/textures/grass.ptex b/game/data/planets/test_planet/voxel_library/textures/grass.ptex similarity index 100% rename from game/data/voxel_libraries/textures/grass.ptex rename to game/data/planets/test_planet/voxel_library/textures/grass.ptex diff --git a/game/data/voxel_libraries/textures/grass_mossy.ptex b/game/data/planets/test_planet/voxel_library/textures/grass_mossy.ptex similarity index 100% rename from game/data/voxel_libraries/textures/grass_mossy.ptex rename to game/data/planets/test_planet/voxel_library/textures/grass_mossy.ptex diff --git a/game/data/voxel_libraries/textures/grass_mossy_albedo.png b/game/data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png similarity index 100% rename from game/data/voxel_libraries/textures/grass_mossy_albedo.png rename to game/data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png diff --git a/game/data/voxel_libraries/textures/Rock24_col.png.import b/game/data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png.import similarity index 63% rename from game/data/voxel_libraries/textures/Rock24_col.png.import rename to game/data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png.import index fb3f76c7..4fea6358 100644 --- a/game/data/voxel_libraries/textures/Rock24_col.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Rock24_col.png-fa414d48c07e6f891a61d4bb734652b9.stex" +path="res://.import/grass_mossy_albedo.png-f6086e017a3b9c245f5e73f74f4b8541.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/Rock24_col.png" -dest_files=[ "res://.import/Rock24_col.png-fa414d48c07e6f891a61d4bb734652b9.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" +dest_files=[ "res://.import/grass_mossy_albedo.png-f6086e017a3b9c245f5e73f74f4b8541.stex" ] [params] diff --git a/game/data/voxel_libraries/textures/stone_1.ptex b/game/data/planets/test_planet/voxel_library/textures/stone_1.ptex similarity index 100% rename from game/data/voxel_libraries/textures/stone_1.ptex rename to game/data/planets/test_planet/voxel_library/textures/stone_1.ptex diff --git a/game/data/voxel_libraries/textures/stone_1_albedo.png b/game/data/planets/test_planet/voxel_library/textures/stone_1_albedo.png similarity index 100% rename from game/data/voxel_libraries/textures/stone_1_albedo.png rename to game/data/planets/test_planet/voxel_library/textures/stone_1_albedo.png diff --git a/game/data/voxel_libraries/textures/stone_1_albedo.png.import b/game/data/planets/test_planet/voxel_library/textures/stone_1_albedo.png.import similarity index 64% rename from game/data/voxel_libraries/textures/stone_1_albedo.png.import rename to game/data/planets/test_planet/voxel_library/textures/stone_1_albedo.png.import index 8a727607..878a4c99 100644 --- a/game/data/voxel_libraries/textures/stone_1_albedo.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/stone_1_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/stone_1_albedo.png-b38e364d30b4eb4b7c7bfbc56a76a295.stex" +path="res://.import/stone_1_albedo.png-56fa6f911b519fba4bf962c7ab92386d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/stone_1_albedo.png" -dest_files=[ "res://.import/stone_1_albedo.png-b38e364d30b4eb4b7c7bfbc56a76a295.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/stone_1_albedo.png" +dest_files=[ "res://.import/stone_1_albedo.png-56fa6f911b519fba4bf962c7ab92386d.stex" ] [params] diff --git a/game/data/voxel_libraries/textures/stone_1_readme.txt b/game/data/planets/test_planet/voxel_library/textures/stone_1_readme.txt similarity index 100% rename from game/data/voxel_libraries/textures/stone_1_readme.txt rename to game/data/planets/test_planet/voxel_library/textures/stone_1_readme.txt diff --git a/game/data/voxel_libraries/textures/stone_dungeon_1.ptex b/game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1.ptex similarity index 100% rename from game/data/voxel_libraries/textures/stone_dungeon_1.ptex rename to game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1.ptex diff --git a/game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png b/game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png similarity index 100% rename from game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png rename to game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png diff --git a/game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png.import b/game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png.import similarity index 62% rename from game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png.import rename to game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png.import index 92b415bc..cd6e1c4b 100644 --- a/game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/stone_dungeon_1_albedo.png-d602f0463a9a529a6bf8adf39ac0bd92.stex" +path="res://.import/stone_dungeon_1_albedo.png-8a4ea1752e50c2d2a2a8f0926e1a63fd.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/stone_dungeon_1_albedo.png" -dest_files=[ "res://.import/stone_dungeon_1_albedo.png-d602f0463a9a529a6bf8adf39ac0bd92.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" +dest_files=[ "res://.import/stone_dungeon_1_albedo.png-8a4ea1752e50c2d2a2a8f0926e1a63fd.stex" ] [params] diff --git a/game/data/voxel_libraries/textures/test.png.import b/game/data/planets/test_planet/voxel_library/textures/test.png.import similarity index 100% rename from game/data/voxel_libraries/textures/test.png.import rename to game/data/planets/test_planet/voxel_library/textures/test.png.import diff --git a/game/data/voxel_libraries/textures/test_brick.ptex b/game/data/planets/test_planet/voxel_library/textures/test_brick.ptex similarity index 100% rename from game/data/voxel_libraries/textures/test_brick.ptex rename to game/data/planets/test_planet/voxel_library/textures/test_brick.ptex diff --git a/game/data/voxel_libraries/textures/test_brick_albedo.png b/game/data/planets/test_planet/voxel_library/textures/test_brick_albedo.png similarity index 100% rename from game/data/voxel_libraries/textures/test_brick_albedo.png rename to game/data/planets/test_planet/voxel_library/textures/test_brick_albedo.png diff --git a/game/data/voxel_libraries/textures/test_brick_albedo.png.import b/game/data/planets/test_planet/voxel_library/textures/test_brick_albedo.png.import similarity index 64% rename from game/data/voxel_libraries/textures/test_brick_albedo.png.import rename to game/data/planets/test_planet/voxel_library/textures/test_brick_albedo.png.import index 38069da0..e2d67799 100644 --- a/game/data/voxel_libraries/textures/test_brick_albedo.png.import +++ b/game/data/planets/test_planet/voxel_library/textures/test_brick_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/test_brick_albedo.png-734188ca3004d74cf5b69df355e94544.stex" +path="res://.import/test_brick_albedo.png-ae727770ad63daf92b41ae6f995ef82f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_libraries/textures/test_brick_albedo.png" -dest_files=[ "res://.import/test_brick_albedo.png-734188ca3004d74cf5b69df355e94544.stex" ] +source_file="res://data/planets/test_planet/voxel_library/textures/test_brick_albedo.png" +dest_files=[ "res://.import/test_brick_albedo.png-ae727770ad63daf92b41ae6f995ef82f.stex" ] [params] diff --git a/game/scenes/Menu.tscn b/game/scenes/Menu.tscn index 75d217c4..3e06e94e 100644 --- a/game/scenes/Menu.tscn +++ b/game/scenes/Menu.tscn @@ -16,7 +16,7 @@ [ext_resource path="res://scenes/ConnectServerButton.gd" type="Script" id=14] [ext_resource path="res://scenes/HostGameButton.gd" type="Script" id=15] [ext_resource path="res://voxelman/world/TVVoxelWorld.gd" type="Script" id=16] -[ext_resource path="res://data/voxel_libraries/1_main_lib_merger_empty.tres" type="VoxelmanLibraryMerger" id=17] +[ext_resource path="res://data/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres" type="VoxelmanLibraryMerger" id=17] [ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=18] [ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19] @@ -24,6 +24,8 @@ + + [sub_resource type="VoxelmanLevelGenerator" id=1] script = ExtResource( 18 ) _force_planet = -1 diff --git a/game/scenes/World.tscn b/game/scenes/World.tscn index cb3504b2..f7f7654e 100644 --- a/game/scenes/World.tscn +++ b/game/scenes/World.tscn @@ -1,13 +1,15 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=1] -[ext_resource path="res://data/voxel_libraries/1_main_lib_merger_empty.tres" type="VoxelmanLibraryMerger" id=2] +[ext_resource path="res://data/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres" type="VoxelmanLibraryMerger" id=2] [ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=3] [ext_resource path="res://voxelman/world/TVVoxelWorld.gd" type="Script" id=8] + + [sub_resource type="VoxelmanLevelGenerator" id=1] script = ExtResource( 1 ) _force_planet = -1 diff --git a/game/voxelman/TestScene.tscn b/game/voxelman/TestScene.tscn index d1fa8296..67c3b40a 100644 --- a/game/voxelman/TestScene.tscn +++ b/game/voxelman/TestScene.tscn @@ -4,7 +4,9 @@ [ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2] [ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3] [ext_resource path="res://voxelman/cubic_mesher/CubicVoxelWorld.tscn" type="PackedScene" id=4] -[ext_resource path="res://data/voxel_libraries/textures/grass_mossy_albedo.png" type="Texture" id=5] +[ext_resource path="res://data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=5] + + diff --git a/game/voxelman/world/TVTestScene.tscn b/game/voxelman/world/TVTestScene.tscn index 62169b6a..271ee81d 100644 --- a/game/voxelman/world/TVTestScene.tscn +++ b/game/voxelman/world/TVTestScene.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2] [ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3] [ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=4] -[ext_resource path="res://data/voxel_libraries/textures/grass_mossy_albedo.png" type="Texture" id=5] +[ext_resource path="res://data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=5] [ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=6] @@ -15,6 +15,8 @@ + + [sub_resource type="Environment" id=1] ambient_light_color = Color( 1, 1, 1, 1 ) diff --git a/game/voxelman/world/TVVoxelWorld.tscn b/game/voxelman/world/TVVoxelWorld.tscn index a997f863..e18d7455 100644 --- a/game/voxelman/world/TVVoxelWorld.tscn +++ b/game/voxelman/world/TVVoxelWorld.tscn @@ -1,9 +1,11 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://data/voxel_libraries/1_main_lib_merger_empty.tres" type="VoxelmanLibraryMerger" id=1] +[ext_resource path="res://data/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres" type="VoxelmanLibraryMerger" id=1] [ext_resource path="res://voxelman/world/TVVoxelWorld.gd" type="Script" id=2] + + [node name="World" type="VoxelWorld"] library = ExtResource( 1 ) voxel_scale = 2.0