From 29177a4f833ebcb983ab464be2e91d2216867b8f Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 21 Aug 2020 20:18:16 +0200 Subject: [PATCH] Update voxelman to get the mesher channel customizations. Added an another mesher to TVVoxelChunk, it's using the alt type and isolevel channels (if they are not allocated it won't do anything). --- HEADS | 2 +- game/voxelman/world/TVVoxelChunk.gd | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/HEADS b/HEADS index 7db2623c..93c82127 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "36b746d90393299b81ecb991f4aa94a8d742fd11", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "2b17341ac2b22d766d6f90426f161f04d9ddc599"}, "entity_spell_system": {"master": "0ddd4908fd3af76a50b2ddd0b112236bebed57f7"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "49212524753bb0d5a9fa03d328ee366062fa194c"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "8426e2c976e9f9cb82bca636c0ec6e79ad7b3bcb"}, "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": "36b746d90393299b81ecb991f4aa94a8d742fd11", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "2b17341ac2b22d766d6f90426f161f04d9ddc599"}, "entity_spell_system": {"master": "0ddd4908fd3af76a50b2ddd0b112236bebed57f7"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "142809d0cbce0c26926137dd64d1adeb9407bed9"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "8426e2c976e9f9cb82bca636c0ec6e79ad7b3bcb"}, "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 87b22243..42508133 100644 --- a/game/voxelman/world/TVVoxelChunk.gd +++ b/game/voxelman/world/TVVoxelChunk.gd @@ -48,6 +48,7 @@ func _create_meshers(): prop_mesher.build_flags = build_flags prop_mesher.texture_scale = 3 + var mesher : TVVoxelMesher = TVVoxelMesher.new() mesher.base_light_value = 0.45 mesher.ao_strength = 0.2 @@ -56,9 +57,20 @@ func _create_meshers(): 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) - - #add_mesher(VoxelMesherCubic.new()) + + var cmesher : VoxelMesherCubic = VoxelMesherCubic.new() + 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 + cmesher.texture_scale = 3 + cmesher.channel_index_type = VoxelChunkDefault.DEFAULT_CHANNEL_ALT_TYPE + cmesher.channel_index_isolevel = VoxelChunkDefault.DEFAULT_CHANNEL_ALT_ISOLEVEL + add_mesher(cmesher) _prop_texture_packer = TexturePacker.new() _prop_texture_packer.max_atlas_size = 1024