From 590238216c4d0cf3ec1b7f9faba926ad7f91478b Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Mon, 6 Apr 2020 14:40:14 +0200
Subject: [PATCH] Update Voxelman to the latest.

---
 HEADS                               | 2 +-
 game/scenes/Menu.tscn               | 4 ++--
 game/scenes/World.tscn              | 4 ++--
 game/voxelman/world/TVVoxelChunk.gd | 1 +
 game/voxelman/world/TVVoxelWorld.gd | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/HEADS b/HEADS
index 8e324596..af993ced 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "da4eb7101d986af0ba6a15efaaed3dee77370d80", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "b03cbf18f7ecb26aca7a823ad680403620bde845"}, "entity_spell_system": {"master": "dc0c6d224b7ee3683267596efedde8184ac335e4"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "d717c9886b7e245b78eb3c19bcb53008ac5fc58c"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "ea3b34d972fb5f76474daabd7c1e192419811348"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "45efc21f3e8af941d96b53d54f82572a6644fef7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dc598c59322185032835f964db069964244e58bc"}, "props": {"master": "e1f43af57110a2ac518b883012fb7e6d3eb8d120"}}
\ No newline at end of file
+{"engine": {"3.2": "da4eb7101d986af0ba6a15efaaed3dee77370d80", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "b03cbf18f7ecb26aca7a823ad680403620bde845"}, "entity_spell_system": {"master": "dc0c6d224b7ee3683267596efedde8184ac335e4"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "81dc8bcb36999bfd3cdaf84732cb911a788912d3"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "ea3b34d972fb5f76474daabd7c1e192419811348"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "45efc21f3e8af941d96b53d54f82572a6644fef7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dc598c59322185032835f964db069964244e58bc"}, "props": {"master": "e1f43af57110a2ac518b883012fb7e6d3eb8d120"}}
\ No newline at end of file
diff --git a/game/scenes/Menu.tscn b/game/scenes/Menu.tscn
index 1c2caefb..76bb53a9 100644
--- a/game/scenes/Menu.tscn
+++ b/game/scenes/Menu.tscn
@@ -558,10 +558,9 @@ transform = Transform( 1, 1.49012e-08, 0, 0, 0.990268, -0.139173, -2.98023e-08,
 transform = Transform( 0.907555, -0.0761572, 0.41297, 0.0262364, 0.99178, 0.12524, -0.419113, -0.102827, 0.902093, 0.752064, 1.69463, 3.15021 )
 current = true
 
-[node name="World" type="VoxelWorld" parent="." groups=[
+[node name="World" type="VoxelWorldDefault" parent="." groups=[
 "save",
 ]]
-data_margin_start = 1
 data_margin_end = 2
 use_threads = false
 max_concurrent_generations = 1
@@ -569,6 +568,7 @@ library = ExtResource( 17 )
 level_generator = SubResource( 1 )
 voxel_scale = 1.6
 chunk_spawn_range = 1
+build_flags = 511
 script = ExtResource( 16 )
 show_loading_screen = false
 generate_on_ready = true
diff --git a/game/scenes/World.tscn b/game/scenes/World.tscn
index cecdd953..f75966d1 100644
--- a/game/scenes/World.tscn
+++ b/game/scenes/World.tscn
@@ -52,16 +52,16 @@ glow_strength = 1.1
 glow_bloom = 0.1
 glow_hdr_luminance_cap = 1.0
 
-[node name="World" type="VoxelWorld" groups=[
+[node name="World" type="VoxelWorldDefault" groups=[
 "save",
 ]]
-data_margin_start = 1
 data_margin_end = 2
 max_concurrent_generations = 4
 max_frame_chunk_build_steps = 4
 library = ExtResource( 2 )
 level_generator = SubResource( 1 )
 voxel_scale = 3.0
+build_flags = 511
 script = ExtResource( 8 )
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
diff --git a/game/voxelman/world/TVVoxelChunk.gd b/game/voxelman/world/TVVoxelChunk.gd
index bd5aa9b7..4be297ef 100644
--- a/game/voxelman/world/TVVoxelChunk.gd
+++ b/game/voxelman/world/TVVoxelChunk.gd
@@ -37,6 +37,7 @@ func _create_meshers():
 	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
 	add_mesher(mesher)
 	
 	#add_mesher(VoxelMesherCubic.new())
diff --git a/game/voxelman/world/TVVoxelWorld.gd b/game/voxelman/world/TVVoxelWorld.gd
index cca3ae29..ee487a18 100644
--- a/game/voxelman/world/TVVoxelWorld.gd
+++ b/game/voxelman/world/TVVoxelWorld.gd
@@ -1,5 +1,5 @@
 tool
-extends VoxelWorld
+extends VoxelWorldDefault
 
 # Copyright Péter Magyar relintai@gmail.com
 # MIT License, might be merged into the Voxelman engine module