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

Update Voxelman and the mesh_utils module. Now lods over 4 is supported for terrarins.

Browse Source
This commit is contained in:
Relintai 2020-10-20 17:07:05 +02:00
parent 9a07052455
commit c18ecacd5a
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "52cd322c8859ce9eba64e0c9e4819417783c3086"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "a714e81db38457c80d37fe9d77956684d6c932d8"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}} {"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "52cd322c8859ce9eba64e0c9e4819417783c3086"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "6e68267bd070e9affed8cf8dc24e9308d3154ada"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "ab36f527d77a76fd525687dd4b92d8f22810d5c9"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}

4
game/modules/core/materials/1_standard_material.tres
View File

File diff suppressed because one or more lines are too long

2
game/modules/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres
View File

@ -10,7 +10,7 @@
[ext_resource path="res://modules/core/materials/10_standard_vman_mdr_material.tres" type="Material" id=8] [ext_resource path="res://modules/core/materials/10_standard_vman_mdr_material.tres" type="Material" id=8]
[resource] [resource]
materials = [ ExtResource( 4 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 7 ) ] materials = [ ExtResource( 4 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 7 ) ]
prop_materials = [ ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ) ] prop_materials = [ ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ) ]
texture_flags = 1 texture_flags = 1
voxel_surfaces = [ ExtResource( 3 ), ExtResource( 1 ), ExtResource( 5 ), ExtResource( 2 ) ] voxel_surfaces = [ ExtResource( 3 ), ExtResource( 1 ), ExtResource( 5 ), ExtResource( 2 ) ]

1
game/scenes/World.tscn
View File

@ -70,6 +70,7 @@ voxel_scale = 2.0
chunk_spawn_range = 6 chunk_spawn_range = 6
build_flags = 511 build_flags = 511
lod_update_interval = 2.0 lod_update_interval = 2.0
num_lods = 8
script = ExtResource( 8 ) script = ExtResource( 8 )
spawn_height = 3 spawn_height = 3
test_prop = ExtResource( 4 ) test_prop = ExtResource( 4 )

3
game/voxelman/world/TVVoxelWorld.gd
View File

@ -249,8 +249,7 @@ func _create_chunk(x : int, y : int, z : int, pchunk : VoxelChunk) -> VoxelChunk
pchunk.add_job(lj) pchunk.add_job(lj)
pchunk.add_job(tj) pchunk.add_job(tj)
pchunk.add_job(pj) pchunk.add_job(pj)
return ._create_chunk(x, y, z, pchunk) return ._create_chunk(x, y, z, pchunk)
func spawn(start_x : int, start_y : int, start_z : int) -> void: func spawn(start_x : int, start_y : int, start_z : int) -> void: