Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-10 08:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.)

Browse Source
This commit is contained in:
Relintai 2020-04-26 11:12:20 +02:00
parent 42ab2960cc
commit b0874ebbb6
41 changed files with 63 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
game/data/models/Material_003.material
View File

Binary file not shown.

10
game/data/voxel_libraries/1_main_lib_merger_empty.tres → game/data/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres
View File

@ -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

0
game/data/voxel_libraries/merger_library_mat.tres → game/data/planets/test_planet/voxel_library/merger_library_mat.tres
View File

4
game/data/voxel_libraries/merger_prop_mat.tres → game/data/planets/test_planet/voxel_library/merger_prop_mat.tres
View File

@ -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]

4
game/data/voxel_libraries/surfaces/1_stone.tres → game/data/planets/test_planet/voxel_library/surfaces/1_stone.tres
View File

@ -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]

4
game/data/voxel_libraries/surfaces/2_test.tres → game/data/planets/test_planet/voxel_library/surfaces/2_test.tres
View File

@ -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]

4
game/data/voxel_libraries/surfaces/3_test2.tres → game/data/planets/test_planet/voxel_library/surfaces/3_test2.tres
View File

@ -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]

4
game/data/voxel_libraries/surfaces/4_dungeon_stone.tres → game/data/planets/test_planet/voxel_library/surfaces/4_dungeon_stone.tres
View File

@ -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]

0
game/data/voxel_libraries/surfaces/stone_2.ptex → game/data/planets/test_planet/voxel_library/surfaces/stone_2.ptex
View File

0
game/data/voxel_libraries/surfaces/stone_2_albedo.png.import → game/data/planets/test_planet/voxel_library/surfaces/stone_2_albedo.png.import
View File

0
game/data/voxel_libraries/textures/Ground03_col.png → game/data/planets/test_planet/voxel_library/textures/Ground03_col.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 203 KiB

After

Width:  |  Height:  |  Size: 203 KiB

6
game/data/voxel_libraries/textures/Ground03_col.png.import → game/data/planets/test_planet/voxel_library/textures/Ground03_col.png.import
View File

@ -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]

0
game/data/voxel_libraries/textures/Ground03_col2.png → game/data/planets/test_planet/voxel_library/textures/Ground03_col2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 KiB

After

Width:  |  Height:  |  Size: 245 KiB

6
game/data/voxel_libraries/textures/Ground03_col2.png.import → game/data/planets/test_planet/voxel_library/textures/Ground03_col2.png.import
View File

@ -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]

0
game/data/voxel_libraries/textures/Rock24_col.png → game/data/planets/test_planet/voxel_library/textures/Rock24_col.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 145 KiB

6
game/data/voxel_libraries/textures/grass_mossy_albedo.png.import → game/data/planets/test_planet/voxel_library/textures/Rock24_col.png.import
View File

@ -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]

0
game/data/voxel_libraries/textures/Rock24_col2.png → game/data/planets/test_planet/voxel_library/textures/Rock24_col2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 229 KiB

After

Width:  |  Height:  |  Size: 229 KiB

6
game/data/voxel_libraries/textures/Rock24_col2.png.import → game/data/planets/test_planet/voxel_library/textures/Rock24_col2.png.import
View File

@ -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]

0
game/data/voxel_libraries/textures/dirt.ptex → game/data/planets/test_planet/voxel_library/textures/dirt.ptex
View File

0
game/data/voxel_libraries/textures/dirt_albedo.png → game/data/planets/test_planet/voxel_library/textures/dirt_albedo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 116 KiB

6
game/data/voxel_libraries/textures/dirt_albedo.png.import → game/data/planets/test_planet/voxel_library/textures/dirt_albedo.png.import
View File

@ -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]

0
game/data/voxel_libraries/textures/grass.ptex → game/data/planets/test_planet/voxel_library/textures/grass.ptex
View File

0
game/data/voxel_libraries/textures/grass_mossy.ptex → game/data/planets/test_planet/voxel_library/textures/grass_mossy.ptex
View File

0
game/data/voxel_libraries/textures/grass_mossy_albedo.png → game/data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

6
game/data/voxel_libraries/textures/Rock24_col.png.import → game/data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png.import
View File

@ -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]

0
game/data/voxel_libraries/textures/stone_1.ptex → game/data/planets/test_planet/voxel_library/textures/stone_1.ptex
View File

0
game/data/voxel_libraries/textures/stone_1_albedo.png → game/data/planets/test_planet/voxel_library/textures/stone_1_albedo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

6
game/data/voxel_libraries/textures/stone_1_albedo.png.import → game/data/planets/test_planet/voxel_library/textures/stone_1_albedo.png.import
View File

@ -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]

0
game/data/voxel_libraries/textures/stone_1_readme.txt → game/data/planets/test_planet/voxel_library/textures/stone_1_readme.txt
View File

0
game/data/voxel_libraries/textures/stone_dungeon_1.ptex → game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1.ptex
View File

0
game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png → game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 115 KiB

6
game/data/voxel_libraries/textures/stone_dungeon_1_albedo.png.import → game/data/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png.import
View File

@ -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]

0
game/data/voxel_libraries/textures/test.png.import → game/data/planets/test_planet/voxel_library/textures/test.png.import
View File

0
game/data/voxel_libraries/textures/test_brick.ptex → game/data/planets/test_planet/voxel_library/textures/test_brick.ptex
View File

0
game/data/voxel_libraries/textures/test_brick_albedo.png → game/data/planets/test_planet/voxel_library/textures/test_brick_albedo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

6
game/data/voxel_libraries/textures/test_brick_albedo.png.import → game/data/planets/test_planet/voxel_library/textures/test_brick_albedo.png.import
View File

@ -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]

4
game/scenes/Menu.tscn
View File

@ -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

4
game/scenes/World.tscn
View File

@ -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

4
game/voxelman/TestScene.tscn
View File

@ -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]

4
game/voxelman/world/TVTestScene.tscn
View File

@ -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 )

4
game/voxelman/world/TVVoxelWorld.tscn
View File

@ -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