diff --git a/HEADS b/HEADS index b74cce53..9aaea3b7 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "52cd322c8859ce9eba64e0c9e4819417783c3086"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "1d1fdf5c561ca806579a18bf5cec434e80c30e87"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "ab36f527d77a76fd525687dd4b92d8f22810d5c9"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "bc0d2f6debd23fe7112f2aab21efb66414eb4670"}} \ No newline at end of file +{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "52cd322c8859ce9eba64e0c9e4819417783c3086"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "f4ba38ecd0e73d9bc9e5de6c0297df773c534fe8"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "ab36f527d77a76fd525687dd4b92d8f22810d5c9"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "bc0d2f6debd23fe7112f2aab21efb66414eb4670"}} \ No newline at end of file diff --git a/game/voxelman/world/TVVoxelWorld.gd b/game/voxelman/world/TVVoxelWorld.gd index 4f3c0b04..d8c8f197 100644 --- a/game/voxelman/world/TVVoxelWorld.gd +++ b/game/voxelman/world/TVVoxelWorld.gd @@ -112,16 +112,16 @@ func _process(delta): cpos.y = ppy cpos.z = ppz - var count : int = get_chunk_count() + var count : int = chunk_get_count() var i : int = 0 while i < count: - var c : VoxelChunk = get_chunk_index(i) + var c : VoxelChunk = chunk_get_index(i) var l : float = (Vector2(cpos.x, cpos.z) - Vector2(c.position_x, c.position_z)).length() if l > chunk_spawn_range + 3: # print("despawn " + str(Vector3(c.position_x, c.position_y, c.position_z))) - remove_chunk_index(i) + chunk_remove_index(i) i -= 1 count -= 1 # else: @@ -152,9 +152,9 @@ func _process(delta): continue for y in range(-1 + cpos.y, spawn_height + cpos.y): - if not has_chunk(x, y, z): + if not chunk_has(x, y, z): # print("spawn " + str(Vector3(x, y, z))) - create_chunk(x, y, z) + chunk_create(x, y, z) update_lods() @@ -194,7 +194,7 @@ func _generation_finished(): func get_chunk_lod_level(x : int, y : int, z : int, default : int) -> int: # var key : String = str(x) + "," + str(y) + "," + str(z) - var ch : VoxelChunk = get_chunk(x, y, z) + var ch : VoxelChunk = chunk_get(x, y, z) if ch == null: return default @@ -269,7 +269,7 @@ func spawn(start_x : int, start_y : int, start_z : int) -> void: continue for y in range(-1 + start_y, spawn_height + start_y): - create_chunk(x, y, z) + chunk_create(x, y, z) # add_prop(Transform().translated(Vector3(0, 2, 0)), test_prop) @@ -301,7 +301,7 @@ func create_light(x : int, y : int, z : int, size : int, color : Color) -> void: light.size = size light.set_world_position(x, y, z) - add_light(light) + light_add(light) func setup_client_seed(pseed : int) -> void: