Moved voxel textures and surfaces into the voxel libraries folder.

This commit is contained in:
Relintai 2020-04-26 11:09:31 +02:00
parent fee3ba9137
commit 42ab2960cc
37 changed files with 54 additions and 38 deletions

View File

@ -1,13 +1,15 @@
[gd_resource type="VoxelmanLibraryMerger" load_steps=8 format=2] [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/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_libraries/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_libraries/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_libraries/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/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/5_standard_material_nouv2.tres" type="Material" id=8]
[ext_resource path="res://data/materials/7_standard_material_notex.tres" type="Material" id=10] [ext_resource path="res://data/materials/7_standard_material_notex.tres" type="Material" id=10]
[resource] [resource]
materials = [ ExtResource( 1 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 10 ) ] materials = [ ExtResource( 1 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 10 ) ]
texture_flags = 1 texture_flags = 1

View File

@ -1,6 +1,8 @@
[gd_resource type="SpatialMaterial" load_steps=2 format=2] [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]
resource_name = "Material.003" resource_name = "Material.003"

View File

@ -1,6 +1,8 @@
[gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] [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]
resource_name = "Stone" resource_name = "Stone"

View File

@ -1,6 +1,8 @@
[gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] [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]
resource_name = "Test" resource_name = "Test"

View File

@ -1,6 +1,8 @@
[gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] [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] [resource]

View File

@ -1,6 +1,8 @@
[gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] [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]
resource_name = "Dungeon Stone" resource_name = "Dungeon Stone"

View File

Before

Width:  |  Height:  |  Size: 203 KiB

After

Width:  |  Height:  |  Size: 203 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/Ground03_col.png-789a075092f5c979e6b761f44f4a710f.stex" path="res://.import/Ground03_col.png-05a4aa26f9fa266cf400cf49915547ac.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/Ground03_col.png" source_file="res://data/voxel_libraries/textures/Ground03_col.png"
dest_files=[ "res://.import/Ground03_col.png-789a075092f5c979e6b761f44f4a710f.stex" ] dest_files=[ "res://.import/Ground03_col.png-05a4aa26f9fa266cf400cf49915547ac.stex" ]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 245 KiB

After

Width:  |  Height:  |  Size: 245 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/Ground03_col2.png-8e6b105ba2bca96f6345fd816abd4b8e.stex" path="res://.import/Ground03_col2.png-a42946178d8e9a2830d1eede8573679e.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/Ground03_col2.png" source_file="res://data/voxel_libraries/textures/Ground03_col2.png"
dest_files=[ "res://.import/Ground03_col2.png-8e6b105ba2bca96f6345fd816abd4b8e.stex" ] dest_files=[ "res://.import/Ground03_col2.png-a42946178d8e9a2830d1eede8573679e.stex" ]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 145 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/Rock24_col.png-c2b54976c6c2af9913c7b01dd6049a0a.stex" path="res://.import/Rock24_col.png-fa414d48c07e6f891a61d4bb734652b9.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/Rock24_col.png" source_file="res://data/voxel_libraries/textures/Rock24_col.png"
dest_files=[ "res://.import/Rock24_col.png-c2b54976c6c2af9913c7b01dd6049a0a.stex" ] dest_files=[ "res://.import/Rock24_col.png-fa414d48c07e6f891a61d4bb734652b9.stex" ]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 229 KiB

After

Width:  |  Height:  |  Size: 229 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/Rock24_col2.png-550377381889900c805e3a85cc80c40a.stex" path="res://.import/Rock24_col2.png-2817c54e28d7f4841cfbaa315064ade9.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/Rock24_col2.png" source_file="res://data/voxel_libraries/textures/Rock24_col2.png"
dest_files=[ "res://.import/Rock24_col2.png-550377381889900c805e3a85cc80c40a.stex" ] dest_files=[ "res://.import/Rock24_col2.png-2817c54e28d7f4841cfbaa315064ade9.stex" ]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 116 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/dirt_albedo.png-47a676d91b055f6f9b4c1c9187cd7814.stex" path="res://.import/dirt_albedo.png-d0bf5444f208485b852a65527bae9813.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/dirt_albedo.png" source_file="res://data/voxel_libraries/textures/dirt_albedo.png"
dest_files=[ "res://.import/dirt_albedo.png-47a676d91b055f6f9b4c1c9187cd7814.stex" ] dest_files=[ "res://.import/dirt_albedo.png-d0bf5444f208485b852a65527bae9813.stex" ]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/grass_mossy_albedo.png-48dc7381838146b29f2f25837944b973.stex" path="res://.import/grass_mossy_albedo.png-16785a259e3d6b163da72c9345fb595b.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/grass_mossy_albedo.png" source_file="res://data/voxel_libraries/textures/grass_mossy_albedo.png"
dest_files=[ "res://.import/grass_mossy_albedo.png-48dc7381838146b29f2f25837944b973.stex" ] dest_files=[ "res://.import/grass_mossy_albedo.png-16785a259e3d6b163da72c9345fb595b.stex" ]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/stone_1_albedo.png-f7805e5128f8ebcd9aab69b431b35954.stex" path="res://.import/stone_1_albedo.png-b38e364d30b4eb4b7c7bfbc56a76a295.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/stone_1_albedo.png" source_file="res://data/voxel_libraries/textures/stone_1_albedo.png"
dest_files=[ "res://.import/stone_1_albedo.png-f7805e5128f8ebcd9aab69b431b35954.stex" ] dest_files=[ "res://.import/stone_1_albedo.png-b38e364d30b4eb4b7c7bfbc56a76a295.stex" ]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 115 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/stone_dungeon_1_albedo.png-3d06924ddcf0b0f2b0aed1d017c2379c.stex" path="res://.import/stone_dungeon_1_albedo.png-d602f0463a9a529a6bf8adf39ac0bd92.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/stone_dungeon_1_albedo.png" source_file="res://data/voxel_libraries/textures/stone_dungeon_1_albedo.png"
dest_files=[ "res://.import/stone_dungeon_1_albedo.png-3d06924ddcf0b0f2b0aed1d017c2379c.stex" ] dest_files=[ "res://.import/stone_dungeon_1_albedo.png-d602f0463a9a529a6bf8adf39ac0bd92.stex" ]
[params] [params]

View File

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/test_brick_albedo.png-f24e6b9c0f0ab0573a8291a4f3ce9092.stex" path="res://.import/test_brick_albedo.png-734188ca3004d74cf5b69df355e94544.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://data/voxel_textures/test_brick_albedo.png" source_file="res://data/voxel_libraries/textures/test_brick_albedo.png"
dest_files=[ "res://.import/test_brick_albedo.png-f24e6b9c0f0ab0573a8291a4f3ce9092.stex" ] dest_files=[ "res://.import/test_brick_albedo.png-734188ca3004d74cf5b69df355e94544.stex" ]
[params] [params]

View File

@ -4,7 +4,9 @@
[ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2] [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/FPSCounter.gd" type="Script" id=3]
[ext_resource path="res://voxelman/cubic_mesher/CubicVoxelWorld.tscn" type="PackedScene" id=4] [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]

View File

@ -4,7 +4,7 @@
[ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2] [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/FPSCounter.gd" type="Script" id=3]
[ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=4] [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] [ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=6]
@ -13,6 +13,8 @@
[sub_resource type="Environment" id=1] [sub_resource type="Environment" id=1]
ambient_light_color = Color( 1, 1, 1, 1 ) ambient_light_color = Color( 1, 1, 1, 1 )