From 02548015ead093f982ee5feb7fe5e5d1f72c8899 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 17 Apr 2021 16:03:14 +0200 Subject: [PATCH] Updated the engine and modules. TerraMesherBlocky now only supports having one mesher and one liquid mesher. --- HEADS | 2 +- game/tw/TerraWorldBlocky.gd | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/HEADS b/HEADS index f9de65b9..eb3f30e9 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "d91c1a60a4fdae76b33dff1df0736b1b5f52def9"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3bbe1138973bafe57638e569e87d28b6e0a0eb46"}, "ui_extensions": {"master": "f1ae14c1be0750f65c77ecaad037dbe1cfb28269"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "c712c4b30839400ba22e5a6b01f2a20fd9b311fa"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "2cb2d2e558e00e55c8995b19d59e3b7c654b5210"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "f4bc70c94e5042c2f8bc91b89bd5d476274f79cc"}, "mesh_utils": {"master": "9bd800489580680d4b778d78cc7b2449092caefd"}, "broken_seals_module": {"master": "4d8de70db8e48b283beb0b0537649e7e4f1b19e7"}, "thread_pool": {"master": "da4e049da09cb726a00f1edb1df935a2e8475902"}, "terraman": {"master": "149734433987b2f87a0a2b045e5295ec1ff6af22"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "701fa8a7796615d2fdd0c19931b50e020eb0a5ad"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3bbe1138973bafe57638e569e87d28b6e0a0eb46"}, "ui_extensions": {"master": "f1ae14c1be0750f65c77ecaad037dbe1cfb28269"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "c712c4b30839400ba22e5a6b01f2a20fd9b311fa"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "2cb2d2e558e00e55c8995b19d59e3b7c654b5210"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "f4bc70c94e5042c2f8bc91b89bd5d476274f79cc"}, "mesh_utils": {"master": "9bd800489580680d4b778d78cc7b2449092caefd"}, "broken_seals_module": {"master": "4d8de70db8e48b283beb0b0537649e7e4f1b19e7"}, "thread_pool": {"master": "da4e049da09cb726a00f1edb1df935a2e8475902"}, "terraman": {"master": "8741d8d646592ad2eea45b8313c47b54cf7e171e"}} \ No newline at end of file diff --git a/game/tw/TerraWorldBlocky.gd b/game/tw/TerraWorldBlocky.gd index 4b5a31fb..bf456325 100644 --- a/game/tw/TerraWorldBlocky.gd +++ b/game/tw/TerraWorldBlocky.gd @@ -227,23 +227,8 @@ func _create_chunk(x : int, z : int, pchunk : TerraChunk) -> TerraChunk: mesher.texture_scale = 3 mesher.channel_index_type = TerraChunkDefault.DEFAULT_CHANNEL_TYPE mesher.channel_index_isolevel = TerraChunkDefault.DEFAULT_CHANNEL_ISOLEVEL - tj.add_mesher(mesher) - - var cmesher : TerraMesherBlocky = TerraMesherBlocky.new() - cmesher.texture_scale = 3 - cmesher.base_light_value = 0.45 - cmesher.ao_strength = 0.2 - cmesher.voxel_scale = voxel_scale - cmesher.build_flags = build_flags - - if cmesher.build_flags & TerraChunkDefault.BUILD_FLAG_USE_LIGHTING != 0: - cmesher.build_flags = cmesher.build_flags ^ TerraChunkDefault.BUILD_FLAG_USE_LIGHTING - - cmesher.always_add_colors = true - - # cmesher.channel_index_type = TerraChunkDefault.DEFAULT_CHANNEL_TYPE - cmesher.channel_index_type = TerraChunkDefault.DEFAULT_CHANNEL_ALT_TYPE - tj.add_mesher(cmesher) +# mesher.lod_index = 3 + tj.set_mesher(mesher) pchunk.job_add(lj) pchunk.job_add(tj)