From 3e687befd0dfebb9e5a99c3807824a77389d386a Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 6 Oct 2020 00:09:25 +0200 Subject: [PATCH] Update Voxelman to the latest. --- HEADS | 2 +- game/voxelman/world/TVVoxelChunk.gd | 31 ++++++++++++++++------------ game/voxelman/world/TVVoxelMesher.gd | 1 + game/voxelman/world/TVVoxelWorld.gd | 3 +-- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/HEADS b/HEADS index 42a50cfa..b9ae409c 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "4162df439727fad01b0d1240df69f59ba97ed422", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "cdc8b7830daf3341871be1c9b38eceeed947f4a1"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "6f8e54879bcab6c628c761b545f6df4cd7534a07"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}} \ No newline at end of file +{"engine": {"3.2": "4162df439727fad01b0d1240df69f59ba97ed422", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "cdc8b7830daf3341871be1c9b38eceeed947f4a1"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "8c06a778f2dafbfb88196428da8d275da84f5158"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}} \ No newline at end of file diff --git a/game/voxelman/world/TVVoxelChunk.gd b/game/voxelman/world/TVVoxelChunk.gd index a34fe952..717401bf 100644 --- a/game/voxelman/world/TVVoxelChunk.gd +++ b/game/voxelman/world/TVVoxelChunk.gd @@ -39,52 +39,57 @@ var _prop_mesh_rid : RID func _create_meshers(): - prop_mesher = TVVoxelMesher.new() + var tj : VoxelTerrarinJob = VoxelTerrarinJob.new() + var lj : VoxelLightJob = VoxelLightJob.new() + var pj : VoxelPropJob = VoxelPropJob.new() + + var prop_mesher = TVVoxelMesher.new() prop_mesher.base_light_value = 0.45 prop_mesher.ao_strength = 0.2 prop_mesher.uv_margin = Rect2(0.017, 0.017, 1 - 0.034, 1 - 0.034) - prop_mesher.lod_size = lod_size prop_mesher.voxel_scale = voxel_scale prop_mesher.build_flags = build_flags prop_mesher.texture_scale = 3 + pj.set_prop_mesher(prop_mesher); var mesher : TVVoxelMesher = TVVoxelMesher.new() mesher.base_light_value = 0.45 mesher.ao_strength = 0.2 mesher.uv_margin = Rect2(0.017, 0.017, 1 - 0.034, 1 - 0.034) - mesher.lod_size = lod_size mesher.voxel_scale = voxel_scale mesher.build_flags = build_flags mesher.texture_scale = 3 mesher.channel_index_type = VoxelChunkDefault.DEFAULT_CHANNEL_TYPE mesher.channel_index_isolevel = VoxelChunkDefault.DEFAULT_CHANNEL_ISOLEVEL - add_mesher(mesher) - - + tj.add_mesher(mesher) + + var cmesher : VoxelMesherBlocky = VoxelMesherBlocky.new() cmesher.texture_scale = 3 cmesher.base_light_value = 0.45 cmesher.ao_strength = 0.2 - cmesher.lod_size = lod_size cmesher.voxel_scale = voxel_scale cmesher.build_flags = build_flags - + if cmesher.build_flags & VoxelChunkDefault.BUILD_FLAG_USE_LIGHTING != 0: cmesher.build_flags = cmesher.build_flags ^ VoxelChunkDefault.BUILD_FLAG_USE_LIGHTING - + cmesher.always_add_colors = true - + # cmesher.channel_index_type = VoxelChunkDefault.DEFAULT_CHANNEL_TYPE cmesher.channel_index_type = VoxelChunkDefault.DEFAULT_CHANNEL_ALT_TYPE - add_mesher(cmesher) - + tj.add_mesher(cmesher) + _prop_texture_packer = TexturePacker.new() _prop_texture_packer.max_atlas_size = 1024 _prop_texture_packer.margin = 1 _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); #func _build_phase(phase): # if phase == VoxelChunkDefault.BUILD_PHASE_SETUP: diff --git a/game/voxelman/world/TVVoxelMesher.gd b/game/voxelman/world/TVVoxelMesher.gd index 5311de14..b76d105d 100644 --- a/game/voxelman/world/TVVoxelMesher.gd +++ b/game/voxelman/world/TVVoxelMesher.gd @@ -144,6 +144,7 @@ func get_voxel_type(chunk : VoxelChunk, x : int, y : int, z : int, size : int = func n_add_chunk(chunk : VoxelChunk) -> void: chunk.generate_ao() + var lod_size : int = 1 var x_size : int = chunk.get_size_x() var y_size : int = chunk.get_size_y() var z_size : int = chunk.get_size_z() diff --git a/game/voxelman/world/TVVoxelWorld.gd b/game/voxelman/world/TVVoxelWorld.gd index 8b7d1af9..62f43557 100644 --- a/game/voxelman/world/TVVoxelWorld.gd +++ b/game/voxelman/world/TVVoxelWorld.gd @@ -205,8 +205,7 @@ func _create_chunk(x : int, y : int, z : int, pchunk : VoxelChunk) -> VoxelChunk var chunk : VoxelChunk = TVVoxelChunk.new() #chunk.meshing_create_collider = false - - chunk.lod_size = 1 + # print("added " + str(Vector3(x, y, z))) return ._create_chunk(x, y, z, chunk)