From 84668b4153cdb06e72af47ca2cd6b5ec70c1ec75 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Wed, 26 Feb 2020 01:16:19 +0100
Subject: [PATCH] Grab the latest Voxelman, and small amounts of test code.

---
 HEADS                               |  2 +-
 game/scenes/Menu.tscn               |  2 --
 game/voxelman/world/TVVoxelWorld.gd | 20 ++++++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/HEADS b/HEADS
index 7f8c80fa..d53b2f50 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "c5c0f2cddd74c849017fa5138bc6ebdeb76dcd80"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "5b32345181338f06a7751c924af2b57807ba99cd"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}
\ No newline at end of file
+{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "c5c0f2cddd74c849017fa5138bc6ebdeb76dcd80"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "3e98b8e01ca1d4ea87d6a0f796217c2842f00e22"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}
\ No newline at end of file
diff --git a/game/scenes/Menu.tscn b/game/scenes/Menu.tscn
index d4d1cac1..666c6bdd 100644
--- a/game/scenes/Menu.tscn
+++ b/game/scenes/Menu.tscn
@@ -571,8 +571,6 @@ level_generator = SubResource( 1 )
 voxel_scale = 1.6
 chunk_spawn_range = 1
 script = ExtResource( 16 )
-meshes = [  ]
-editor_generate = false
 show_loading_screen = false
 generate_on_ready = true
 
diff --git a/game/voxelman/world/TVVoxelWorld.gd b/game/voxelman/world/TVVoxelWorld.gd
index 98878368..86b666f3 100644
--- a/game/voxelman/world/TVVoxelWorld.gd
+++ b/game/voxelman/world/TVVoxelWorld.gd
@@ -39,7 +39,19 @@ var _editor_generate : bool
 var _player_file_name : String
 var _player : Entity
 
-func _ready():
+func _enter_tree():
+#	for ch in get_children():
+#		if ch is VoxelChunk:
+#			var c : VoxelChunk = ch as VoxelChunk
+#
+#			c.set_voxel_world(self)
+#			c.set_library(library)
+#			c.set_size(c.size_x, c.size_y, c.size_z, c.margin_start, c.margin_end)
+#			add_chunk(c, c.position_x, c.position_y, c.position_z)
+#			c.build_deferred()
+			
+	
+	
 	if generate_on_ready and not Engine.is_editor_hint():
 		
 		if level_generator != null:
@@ -136,9 +148,9 @@ func set_editor_generate(value : bool) -> void:
 		
 		level_generator.setup(self, current_seed, false, library)
 		spawn()
-	else:
-		spawned = false
-		clear()
+#	else:
+#		spawned = false
+#		clear()
 		
 	_editor_generate = value