From 42ab2960cc2d9746aa57dd9d1c0bfd04b7ef04dc Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Apr 2020 11:09:31 +0200 Subject: [PATCH] Moved voxel textures and surfaces into the voxel libraries folder. --- game/data/models/Material_003.material | Bin 774 -> 783 bytes .../1_main_lib_merger_empty.tres | 10 ++++++---- game/data/voxel_libraries/merger_prop_mat.tres | 4 +++- .../surfaces}/1_stone.tres | 4 +++- .../surfaces}/2_test.tres | 4 +++- .../surfaces}/3_test2.tres | 4 +++- .../surfaces}/4_dungeon_stone.tres | 4 +++- .../surfaces}/stone_2.ptex | 0 .../surfaces}/stone_2_albedo.png.import | 0 .../textures}/Ground03_col.png | Bin .../textures}/Ground03_col.png.import | 6 +++--- .../textures}/Ground03_col2.png | Bin .../textures}/Ground03_col2.png.import | 6 +++--- .../textures}/Rock24_col.png | Bin .../textures}/Rock24_col.png.import | 6 +++--- .../textures}/Rock24_col2.png | Bin .../textures}/Rock24_col2.png.import | 6 +++--- .../textures}/dirt.ptex | 0 .../textures}/dirt_albedo.png | Bin .../textures}/dirt_albedo.png.import | 6 +++--- .../textures}/grass.ptex | 0 .../textures}/grass_mossy.ptex | 0 .../textures}/grass_mossy_albedo.png | Bin .../textures}/grass_mossy_albedo.png.import | 6 +++--- .../textures}/stone_1.ptex | 0 .../textures}/stone_1_albedo.png | Bin .../textures}/stone_1_albedo.png.import | 6 +++--- .../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 +++--- .../textures}/test.png.import | 0 .../textures}/test_brick.ptex | 0 .../textures}/test_brick_albedo.png | Bin .../textures}/test_brick_albedo.png.import | 6 +++--- game/voxelman/TestScene.tscn | 4 +++- game/voxelman/world/TVTestScene.tscn | 4 +++- 37 files changed, 54 insertions(+), 38 deletions(-) rename game/data/{voxel_surfaces => voxel_libraries/surfaces}/1_stone.tres (70%) rename game/data/{voxel_surfaces => voxel_libraries/surfaces}/2_test.tres (69%) rename game/data/{voxel_surfaces => voxel_libraries/surfaces}/3_test2.tres (68%) rename game/data/{voxel_surfaces => voxel_libraries/surfaces}/4_dungeon_stone.tres (69%) rename game/data/{voxel_surfaces => voxel_libraries/surfaces}/stone_2.ptex (100%) rename game/data/{voxel_surfaces => voxel_libraries/surfaces}/stone_2_albedo.png.import (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/Ground03_col.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/Ground03_col.png.import (67%) rename game/data/{voxel_textures => voxel_libraries/textures}/Ground03_col2.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/Ground03_col2.png.import (66%) rename game/data/{voxel_textures => voxel_libraries/textures}/Rock24_col.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/Rock24_col.png.import (67%) rename game/data/{voxel_textures => voxel_libraries/textures}/Rock24_col2.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/Rock24_col2.png.import (67%) rename game/data/{voxel_textures => voxel_libraries/textures}/dirt.ptex (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/dirt_albedo.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/dirt_albedo.png.import (67%) rename game/data/{voxel_textures => voxel_libraries/textures}/grass.ptex (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/grass_mossy.ptex (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/grass_mossy_albedo.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/grass_mossy_albedo.png.import (65%) rename game/data/{voxel_textures => voxel_libraries/textures}/stone_1.ptex (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/stone_1_albedo.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/stone_1_albedo.png.import (66%) rename game/data/{voxel_textures => voxel_libraries/textures}/stone_1_readme.txt (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/stone_dungeon_1.ptex (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/stone_dungeon_1_albedo.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/stone_dungeon_1_albedo.png.import (64%) rename game/data/{voxel_textures => voxel_libraries/textures}/test.png.import (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/test_brick.ptex (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/test_brick_albedo.png (100%) rename game/data/{voxel_textures => voxel_libraries/textures}/test_brick_albedo.png.import (65%) diff --git a/game/data/models/Material_003.material b/game/data/models/Material_003.material index a49488d452984b57286c3a363a4ddfcfed12e82e..40260610f997c867efe2778ba38372389a520ae7 100644 GIT binary patch delta 739 zcmV<90v!E@29E}RQd2`i0ssI201yBGr3L^1_W}R_D77#BV5J3Z7Xa2~Z!$n{0s$x` zPKi_ET$V^Ff0}|%{?JTP{^b3X8pkCWU=M8}qo`XSdySAh4at`Twi!V^T>xDGU;s$j zgHKpCWs(bBuoo*4u8=WE*VLlwD2$Mwj5ou*#_YBcPi{3o|1HjZ4fO@t{{#Q%T+MB0 zQ88R}jx9JcOpLVAx}*zX+D94p|HXffb-CCFVqNw%kN*uO{!{z`3>Raux1NNNv^sw> z6kf8a_#V5}avQ0&YQYi7s99=*@Mdg8>4qw*(`|#h*xl^I%)^S{qv^JCG6#K{_HZR9 zS209PlQ|unaAcIpqq~r?qa=ipa;gA4N*kK zo-%7CLur*3ge;fkR!LavNfjy|Iy`?mI*=ey0)vMK_)+25>kU8<7Zt z@Is|dh6!sLAI$0?=GzH`A&j}VOfIzWq7}&XDF|c(BZr6hU*JE0cgs!up8zIy&8bjb zgFZT)yy!NGL?UT>(a24sxHMFryvBftsG%()Wo8Bf2oMB808jz|Lsr!R5}H>p2)V~*vO#5 z2D0=#JKCO8s9#0p_ZLk5vuc0LcEZwxAtr<+J%kvDD7=Z59gBC0fI}!^A54lzo0S4I_0MveKK`L-55;y*q)O4xU{d5V#=CdkKP`OQtAMR$hY_t+)gEtlf;+pWevTnoCTHZLi?V|q(d8{!~e+73R9J$ V)e>bMb51Amrs#Rbc9~LBLqi%VO<4c{ delta 730 zcmV<00ww*A28ITIQd2`i0ssI201yBGn+5;??g9V+D77#BV4DRc7XapEZ8AV_0s$!{ zPKi_ET$V^Ff0}|%{?JTP{^b3X8pkCWAOQHvE$Y_CULzz=L-HjdINq%XS^!%BUjW&Z zNiKB3UaUm8LdGCnQ;VvjFhYJX-VFB|v)e{Ixz+ryIP*0%)E8v`58R`3HMgNf#c1*Y((jX3MqT=2@A|TtOz`sZYw8q(5Gn+S8{R{L&P+h)4>TxMwvXi z3mH2~LKi95x<==}f#W{?U%^+IGch_!TX%7b?j*r+U1HP_LtyMFvsN;cR%t=Va#?Pb zgteYTp%^ZvVsAYOe*+#kIyg9de2l=*;R60&upqG!iDdi(CL~VAMkInDyfRE!%kW@U z2QlAHAiVIR70C4|2t)&;#zFiq@E^dtg$08jz|L{;4qe*h#w3IkWs47h^+KX>dR z&vMFCP#$DbS}O7qcbXwn#)l|pmnbmj;1^$y!D&FiWEy(vJt_2@Asz76YB=9rv9y6Z z61n}L8G9&>QfFvK^r$Fw4qd0-q=?h68P@D-`y@IzvW`-3_i8>oMa|xJu#D9I~GEupM)c_?{l_CVh-u;+1Qo-60U#H&0icNUJ zASxF+&js-q$5q7#%XX!bj!0nENYYT7$~mD9ovuhtTwGQE%8$34d*sK M=NYDbnNm|jLv6%E^8f$< diff --git a/game/data/voxel_libraries/1_main_lib_merger_empty.tres b/game/data/voxel_libraries/1_main_lib_merger_empty.tres index 4b090538..db2763d5 100644 --- a/game/data/voxel_libraries/1_main_lib_merger_empty.tres +++ b/game/data/voxel_libraries/1_main_lib_merger_empty.tres @@ -1,13 +1,15 @@ [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_surfaces/4_dungeon_stone.tres" type="VoxelSurfaceMerger" id=2] -[ext_resource path="res://data/voxel_surfaces/2_test.tres" type="VoxelSurfaceMerger" id=3] -[ext_resource path="res://data/voxel_surfaces/1_stone.tres" type="VoxelSurfaceMerger" id=4] -[ext_resource path="res://data/voxel_surfaces/3_test2.tres" type="VoxelSurfaceMerger" id=5] +[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/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_prop_mat.tres b/game/data/voxel_libraries/merger_prop_mat.tres index 195db96e..33594d57 100644 --- a/game/data/voxel_libraries/merger_prop_mat.tres +++ b/game/data/voxel_libraries/merger_prop_mat.tres @@ -1,6 +1,8 @@ [gd_resource type="SpatialMaterial" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_libraries/textures/grass_mossy_albedo.png" type="Texture" id=1] + + [resource] resource_name = "Material.003" diff --git a/game/data/voxel_surfaces/1_stone.tres b/game/data/voxel_libraries/surfaces/1_stone.tres similarity index 70% rename from game/data/voxel_surfaces/1_stone.tres rename to game/data/voxel_libraries/surfaces/1_stone.tres index a942f31f..1f04bf3d 100644 --- a/game/data/voxel_surfaces/1_stone.tres +++ b/game/data/voxel_libraries/surfaces/1_stone.tres @@ -1,6 +1,8 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/dirt_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_libraries/textures/dirt_albedo.png" type="Texture" id=1] + + [resource] resource_name = "Stone" diff --git a/game/data/voxel_surfaces/2_test.tres b/game/data/voxel_libraries/surfaces/2_test.tres similarity index 69% rename from game/data/voxel_surfaces/2_test.tres rename to game/data/voxel_libraries/surfaces/2_test.tres index 6c24b704..001f4907 100644 --- a/game/data/voxel_surfaces/2_test.tres +++ b/game/data/voxel_libraries/surfaces/2_test.tres @@ -1,6 +1,8 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/stone_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_libraries/textures/stone_1_albedo.png" type="Texture" id=1] + + [resource] resource_name = "Test" diff --git a/game/data/voxel_surfaces/3_test2.tres b/game/data/voxel_libraries/surfaces/3_test2.tres similarity index 68% rename from game/data/voxel_surfaces/3_test2.tres rename to game/data/voxel_libraries/surfaces/3_test2.tres index c1cd78bd..45069302 100644 --- a/game/data/voxel_surfaces/3_test2.tres +++ b/game/data/voxel_libraries/surfaces/3_test2.tres @@ -1,6 +1,8 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_libraries/textures/grass_mossy_albedo.png" type="Texture" id=1] + + [resource] diff --git a/game/data/voxel_surfaces/4_dungeon_stone.tres b/game/data/voxel_libraries/surfaces/4_dungeon_stone.tres similarity index 69% rename from game/data/voxel_surfaces/4_dungeon_stone.tres rename to game/data/voxel_libraries/surfaces/4_dungeon_stone.tres index 0ac07b68..0fa567cf 100644 --- a/game/data/voxel_surfaces/4_dungeon_stone.tres +++ b/game/data/voxel_libraries/surfaces/4_dungeon_stone.tres @@ -1,6 +1,8 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/stone_dungeon_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_libraries/textures/stone_dungeon_1_albedo.png" type="Texture" id=1] + + [resource] resource_name = "Dungeon Stone" diff --git a/game/data/voxel_surfaces/stone_2.ptex b/game/data/voxel_libraries/surfaces/stone_2.ptex similarity index 100% rename from game/data/voxel_surfaces/stone_2.ptex rename to game/data/voxel_libraries/surfaces/stone_2.ptex diff --git a/game/data/voxel_surfaces/stone_2_albedo.png.import b/game/data/voxel_libraries/surfaces/stone_2_albedo.png.import similarity index 100% rename from game/data/voxel_surfaces/stone_2_albedo.png.import rename to game/data/voxel_libraries/surfaces/stone_2_albedo.png.import diff --git a/game/data/voxel_textures/Ground03_col.png b/game/data/voxel_libraries/textures/Ground03_col.png similarity index 100% rename from game/data/voxel_textures/Ground03_col.png rename to game/data/voxel_libraries/textures/Ground03_col.png diff --git a/game/data/voxel_textures/Ground03_col.png.import b/game/data/voxel_libraries/textures/Ground03_col.png.import similarity index 67% rename from game/data/voxel_textures/Ground03_col.png.import rename to game/data/voxel_libraries/textures/Ground03_col.png.import index fb29b043..499798fb 100644 --- a/game/data/voxel_textures/Ground03_col.png.import +++ b/game/data/voxel_libraries/textures/Ground03_col.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Ground03_col.png-789a075092f5c979e6b761f44f4a710f.stex" +path="res://.import/Ground03_col.png-05a4aa26f9fa266cf400cf49915547ac.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/Ground03_col.png" -dest_files=[ "res://.import/Ground03_col.png-789a075092f5c979e6b761f44f4a710f.stex" ] +source_file="res://data/voxel_libraries/textures/Ground03_col.png" +dest_files=[ "res://.import/Ground03_col.png-05a4aa26f9fa266cf400cf49915547ac.stex" ] [params] diff --git a/game/data/voxel_textures/Ground03_col2.png b/game/data/voxel_libraries/textures/Ground03_col2.png similarity index 100% rename from game/data/voxel_textures/Ground03_col2.png rename to game/data/voxel_libraries/textures/Ground03_col2.png diff --git a/game/data/voxel_textures/Ground03_col2.png.import b/game/data/voxel_libraries/textures/Ground03_col2.png.import similarity index 66% rename from game/data/voxel_textures/Ground03_col2.png.import rename to game/data/voxel_libraries/textures/Ground03_col2.png.import index 5ada44c6..b84f81e3 100644 --- a/game/data/voxel_textures/Ground03_col2.png.import +++ b/game/data/voxel_libraries/textures/Ground03_col2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Ground03_col2.png-8e6b105ba2bca96f6345fd816abd4b8e.stex" +path="res://.import/Ground03_col2.png-a42946178d8e9a2830d1eede8573679e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/Ground03_col2.png" -dest_files=[ "res://.import/Ground03_col2.png-8e6b105ba2bca96f6345fd816abd4b8e.stex" ] +source_file="res://data/voxel_libraries/textures/Ground03_col2.png" +dest_files=[ "res://.import/Ground03_col2.png-a42946178d8e9a2830d1eede8573679e.stex" ] [params] diff --git a/game/data/voxel_textures/Rock24_col.png b/game/data/voxel_libraries/textures/Rock24_col.png similarity index 100% rename from game/data/voxel_textures/Rock24_col.png rename to game/data/voxel_libraries/textures/Rock24_col.png diff --git a/game/data/voxel_textures/Rock24_col.png.import b/game/data/voxel_libraries/textures/Rock24_col.png.import similarity index 67% rename from game/data/voxel_textures/Rock24_col.png.import rename to game/data/voxel_libraries/textures/Rock24_col.png.import index c1532dd1..fb3f76c7 100644 --- a/game/data/voxel_textures/Rock24_col.png.import +++ b/game/data/voxel_libraries/textures/Rock24_col.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Rock24_col.png-c2b54976c6c2af9913c7b01dd6049a0a.stex" +path="res://.import/Rock24_col.png-fa414d48c07e6f891a61d4bb734652b9.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/Rock24_col.png" -dest_files=[ "res://.import/Rock24_col.png-c2b54976c6c2af9913c7b01dd6049a0a.stex" ] +source_file="res://data/voxel_libraries/textures/Rock24_col.png" +dest_files=[ "res://.import/Rock24_col.png-fa414d48c07e6f891a61d4bb734652b9.stex" ] [params] diff --git a/game/data/voxel_textures/Rock24_col2.png b/game/data/voxel_libraries/textures/Rock24_col2.png similarity index 100% rename from game/data/voxel_textures/Rock24_col2.png rename to game/data/voxel_libraries/textures/Rock24_col2.png diff --git a/game/data/voxel_textures/Rock24_col2.png.import b/game/data/voxel_libraries/textures/Rock24_col2.png.import similarity index 67% rename from game/data/voxel_textures/Rock24_col2.png.import rename to game/data/voxel_libraries/textures/Rock24_col2.png.import index 6e64d1ca..74bebc6e 100644 --- a/game/data/voxel_textures/Rock24_col2.png.import +++ b/game/data/voxel_libraries/textures/Rock24_col2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Rock24_col2.png-550377381889900c805e3a85cc80c40a.stex" +path="res://.import/Rock24_col2.png-2817c54e28d7f4841cfbaa315064ade9.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/Rock24_col2.png" -dest_files=[ "res://.import/Rock24_col2.png-550377381889900c805e3a85cc80c40a.stex" ] +source_file="res://data/voxel_libraries/textures/Rock24_col2.png" +dest_files=[ "res://.import/Rock24_col2.png-2817c54e28d7f4841cfbaa315064ade9.stex" ] [params] diff --git a/game/data/voxel_textures/dirt.ptex b/game/data/voxel_libraries/textures/dirt.ptex similarity index 100% rename from game/data/voxel_textures/dirt.ptex rename to game/data/voxel_libraries/textures/dirt.ptex diff --git a/game/data/voxel_textures/dirt_albedo.png b/game/data/voxel_libraries/textures/dirt_albedo.png similarity index 100% rename from game/data/voxel_textures/dirt_albedo.png rename to game/data/voxel_libraries/textures/dirt_albedo.png diff --git a/game/data/voxel_textures/dirt_albedo.png.import b/game/data/voxel_libraries/textures/dirt_albedo.png.import similarity index 67% rename from game/data/voxel_textures/dirt_albedo.png.import rename to game/data/voxel_libraries/textures/dirt_albedo.png.import index 63fb63c2..0f77d5ea 100644 --- a/game/data/voxel_textures/dirt_albedo.png.import +++ b/game/data/voxel_libraries/textures/dirt_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dirt_albedo.png-47a676d91b055f6f9b4c1c9187cd7814.stex" +path="res://.import/dirt_albedo.png-d0bf5444f208485b852a65527bae9813.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/dirt_albedo.png" -dest_files=[ "res://.import/dirt_albedo.png-47a676d91b055f6f9b4c1c9187cd7814.stex" ] +source_file="res://data/voxel_libraries/textures/dirt_albedo.png" +dest_files=[ "res://.import/dirt_albedo.png-d0bf5444f208485b852a65527bae9813.stex" ] [params] diff --git a/game/data/voxel_textures/grass.ptex b/game/data/voxel_libraries/textures/grass.ptex similarity index 100% rename from game/data/voxel_textures/grass.ptex rename to game/data/voxel_libraries/textures/grass.ptex diff --git a/game/data/voxel_textures/grass_mossy.ptex b/game/data/voxel_libraries/textures/grass_mossy.ptex similarity index 100% rename from game/data/voxel_textures/grass_mossy.ptex rename to game/data/voxel_libraries/textures/grass_mossy.ptex diff --git a/game/data/voxel_textures/grass_mossy_albedo.png b/game/data/voxel_libraries/textures/grass_mossy_albedo.png similarity index 100% rename from game/data/voxel_textures/grass_mossy_albedo.png rename to game/data/voxel_libraries/textures/grass_mossy_albedo.png diff --git a/game/data/voxel_textures/grass_mossy_albedo.png.import b/game/data/voxel_libraries/textures/grass_mossy_albedo.png.import similarity index 65% rename from game/data/voxel_textures/grass_mossy_albedo.png.import rename to game/data/voxel_libraries/textures/grass_mossy_albedo.png.import index 5f09e61b..0127c9f4 100644 --- a/game/data/voxel_textures/grass_mossy_albedo.png.import +++ b/game/data/voxel_libraries/textures/grass_mossy_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass_mossy_albedo.png-48dc7381838146b29f2f25837944b973.stex" +path="res://.import/grass_mossy_albedo.png-16785a259e3d6b163da72c9345fb595b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/grass_mossy_albedo.png" -dest_files=[ "res://.import/grass_mossy_albedo.png-48dc7381838146b29f2f25837944b973.stex" ] +source_file="res://data/voxel_libraries/textures/grass_mossy_albedo.png" +dest_files=[ "res://.import/grass_mossy_albedo.png-16785a259e3d6b163da72c9345fb595b.stex" ] [params] diff --git a/game/data/voxel_textures/stone_1.ptex b/game/data/voxel_libraries/textures/stone_1.ptex similarity index 100% rename from game/data/voxel_textures/stone_1.ptex rename to game/data/voxel_libraries/textures/stone_1.ptex diff --git a/game/data/voxel_textures/stone_1_albedo.png b/game/data/voxel_libraries/textures/stone_1_albedo.png similarity index 100% rename from game/data/voxel_textures/stone_1_albedo.png rename to game/data/voxel_libraries/textures/stone_1_albedo.png diff --git a/game/data/voxel_textures/stone_1_albedo.png.import b/game/data/voxel_libraries/textures/stone_1_albedo.png.import similarity index 66% rename from game/data/voxel_textures/stone_1_albedo.png.import rename to game/data/voxel_libraries/textures/stone_1_albedo.png.import index 819c6dc7..8a727607 100644 --- a/game/data/voxel_textures/stone_1_albedo.png.import +++ b/game/data/voxel_libraries/textures/stone_1_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/stone_1_albedo.png-f7805e5128f8ebcd9aab69b431b35954.stex" +path="res://.import/stone_1_albedo.png-b38e364d30b4eb4b7c7bfbc56a76a295.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/stone_1_albedo.png" -dest_files=[ "res://.import/stone_1_albedo.png-f7805e5128f8ebcd9aab69b431b35954.stex" ] +source_file="res://data/voxel_libraries/textures/stone_1_albedo.png" +dest_files=[ "res://.import/stone_1_albedo.png-b38e364d30b4eb4b7c7bfbc56a76a295.stex" ] [params] diff --git a/game/data/voxel_textures/stone_1_readme.txt b/game/data/voxel_libraries/textures/stone_1_readme.txt similarity index 100% rename from game/data/voxel_textures/stone_1_readme.txt rename to game/data/voxel_libraries/textures/stone_1_readme.txt diff --git a/game/data/voxel_textures/stone_dungeon_1.ptex b/game/data/voxel_libraries/textures/stone_dungeon_1.ptex similarity index 100% rename from game/data/voxel_textures/stone_dungeon_1.ptex rename to game/data/voxel_libraries/textures/stone_dungeon_1.ptex diff --git a/game/data/voxel_textures/stone_dungeon_1_albedo.png b/game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png similarity index 100% rename from game/data/voxel_textures/stone_dungeon_1_albedo.png rename to game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png diff --git a/game/data/voxel_textures/stone_dungeon_1_albedo.png.import b/game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png.import similarity index 64% rename from game/data/voxel_textures/stone_dungeon_1_albedo.png.import rename to game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png.import index 68336526..92b415bc 100644 --- a/game/data/voxel_textures/stone_dungeon_1_albedo.png.import +++ b/game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/stone_dungeon_1_albedo.png-3d06924ddcf0b0f2b0aed1d017c2379c.stex" +path="res://.import/stone_dungeon_1_albedo.png-d602f0463a9a529a6bf8adf39ac0bd92.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/stone_dungeon_1_albedo.png" -dest_files=[ "res://.import/stone_dungeon_1_albedo.png-3d06924ddcf0b0f2b0aed1d017c2379c.stex" ] +source_file="res://data/voxel_libraries/textures/stone_dungeon_1_albedo.png" +dest_files=[ "res://.import/stone_dungeon_1_albedo.png-d602f0463a9a529a6bf8adf39ac0bd92.stex" ] [params] diff --git a/game/data/voxel_textures/test.png.import b/game/data/voxel_libraries/textures/test.png.import similarity index 100% rename from game/data/voxel_textures/test.png.import rename to game/data/voxel_libraries/textures/test.png.import diff --git a/game/data/voxel_textures/test_brick.ptex b/game/data/voxel_libraries/textures/test_brick.ptex similarity index 100% rename from game/data/voxel_textures/test_brick.ptex rename to game/data/voxel_libraries/textures/test_brick.ptex diff --git a/game/data/voxel_textures/test_brick_albedo.png b/game/data/voxel_libraries/textures/test_brick_albedo.png similarity index 100% rename from game/data/voxel_textures/test_brick_albedo.png rename to game/data/voxel_libraries/textures/test_brick_albedo.png diff --git a/game/data/voxel_textures/test_brick_albedo.png.import b/game/data/voxel_libraries/textures/test_brick_albedo.png.import similarity index 65% rename from game/data/voxel_textures/test_brick_albedo.png.import rename to game/data/voxel_libraries/textures/test_brick_albedo.png.import index 73790d35..38069da0 100644 --- a/game/data/voxel_textures/test_brick_albedo.png.import +++ b/game/data/voxel_libraries/textures/test_brick_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/test_brick_albedo.png-f24e6b9c0f0ab0573a8291a4f3ce9092.stex" +path="res://.import/test_brick_albedo.png-734188ca3004d74cf5b69df355e94544.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/test_brick_albedo.png" -dest_files=[ "res://.import/test_brick_albedo.png-f24e6b9c0f0ab0573a8291a4f3ce9092.stex" ] +source_file="res://data/voxel_libraries/textures/test_brick_albedo.png" +dest_files=[ "res://.import/test_brick_albedo.png-734188ca3004d74cf5b69df355e94544.stex" ] [params] diff --git a/game/voxelman/TestScene.tscn b/game/voxelman/TestScene.tscn index ba696ab3..d1fa8296 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_textures/grass_mossy_albedo.png" type="Texture" id=5] +[ext_resource path="res://data/voxel_libraries/textures/grass_mossy_albedo.png" type="Texture" id=5] + + diff --git a/game/voxelman/world/TVTestScene.tscn b/game/voxelman/world/TVTestScene.tscn index 2d4a5b77..62169b6a 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_textures/grass_mossy_albedo.png" type="Texture" id=5] +[ext_resource path="res://data/voxel_libraries/textures/grass_mossy_albedo.png" type="Texture" id=5] [ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=6] @@ -13,6 +13,8 @@ + + [sub_resource type="Environment" id=1] ambient_light_color = Color( 1, 1, 1, 1 )