Update Voxelman. Now VoxelChunk can also store VoxelStructures, and method renames.

This commit is contained in:
Relintai 2020-10-26 18:31:57 +01:00
parent fa079cd120
commit f3d5a4d88d
3 changed files with 8 additions and 8 deletions

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": "73112979062acd6e58e4cd3faa2bef26442b274c"}, "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": "bc0d2f6debd23fe7112f2aab21efb66414eb4670"}}
{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "52cd322c8859ce9eba64e0c9e4819417783c3086"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "1d1fdf5c561ca806579a18bf5cec434e80c30e87"}, "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": "bc0d2f6debd23fe7112f2aab21efb66414eb4670"}}

View File

@ -93,9 +93,9 @@ func _create_meshers():
_prop_texture_packer.background_color = Color(0, 0, 0, 1)
_prop_texture_packer.texture_flags = Texture.FLAG_MIPMAPS
add_job(lj)
add_job(tj)
add_job(pj)
job_add(lj)
job_add(tj)
job_add(pj)
#func _build_phase(phase):
# if phase == VoxelChunkDefault.BUILD_PHASE_SETUP:

View File

@ -205,7 +205,7 @@ func _create_chunk(x : int, y : int, z : int, pchunk : VoxelChunk) -> VoxelChunk
if !pchunk:
pchunk = TVVoxelChunk.new()
if pchunk.get_job_count() == 0:
if pchunk.job_get_count() == 0:
var tj : VoxelTerrarinJob = VoxelTerrarinJob.new()
var lj : VoxelLightJob = VoxelLightJob.new()
var pj : VoxelPropJob = VoxelPropJob.new()
@ -247,9 +247,9 @@ func _create_chunk(x : int, y : int, z : int, pchunk : VoxelChunk) -> VoxelChunk
cmesher.channel_index_type = VoxelChunkDefault.DEFAULT_CHANNEL_ALT_TYPE
tj.add_mesher(cmesher)
pchunk.add_job(lj)
pchunk.add_job(tj)
pchunk.add_job(pj)
pchunk.job_add(lj)
pchunk.job_add(tj)
pchunk.job_add(pj)
return ._create_chunk(x, y, z, pchunk)