diff --git a/HEADS b/HEADS index 4f1d4f36..4e019d97 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "7ccb146a55edc41a9dd14c10efb8dc8f4b87f14e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "d063f8da2816e9e016112a2cc9a22a61c1f43d92"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "dfa2b527e6496322d81f9a34048f4ac6019e08f7"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e4cf48e227ccd4b7a3194f218b32b52fe415ab5a"}, "broken_seals_module": {"master": "74722edc82ff099f1ed87a4d45fc00312c482edc"}} \ No newline at end of file +{"engine": {"3.2": "7ccb146a55edc41a9dd14c10efb8dc8f4b87f14e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "d063f8da2816e9e016112a2cc9a22a61c1f43d92"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "7c93cc8f52a60746aa43c0a78631baecbabfe6dc"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e4cf48e227ccd4b7a3194f218b32b52fe415ab5a"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}} \ No newline at end of file diff --git a/game/modules/planets/test_planet/biomes/simple_biome.gd b/game/modules/planets/test_planet/biomes/simple_biome.gd index 34a5e30f..25ab51e2 100644 --- a/game/modules/planets/test_planet/biomes/simple_biome.gd +++ b/game/modules/planets/test_planet/biomes/simple_biome.gd @@ -1,4 +1,4 @@ -extends Biome +extends BiomeBase # Copyright (c) 2019-2020 Péter Magyar # @@ -23,7 +23,14 @@ extends Biome func _generate_chunk(chunk: VoxelChunk, spawn_mobs: bool) -> void: # var chunk : VoxelChunk = chunk.get_chunk() - generate_terrarin(chunk, spawn_mobs) +# generate_terrarin(chunk, spawn_mobs) + + generate_simple_terrarin(chunk, spawn_mobs) + + if not Engine.editor_hint and chunk.position_y == 0 and spawn_mobs: + ESS.entity_spawner.spawn_mob(0, randi() % 3, Vector3(chunk.position_x * chunk.size_x * chunk.voxel_scale + chunk.size_x / 2,\ + (chunk.position_y + 1) * chunk.size_y * chunk.voxel_scale, \ + chunk.position_z * chunk.size_z * chunk.voxel_scale + chunk.size_z / 2)) func generate_terrarin(chunk : VoxelChunk, spawn_mobs: bool) -> void: var noise : OpenSimplexNoise = OpenSimplexNoise.new() diff --git a/game/voxelman/world/TVVoxelWorld.gd b/game/voxelman/world/TVVoxelWorld.gd index 32c28207..c350a53b 100644 --- a/game/voxelman/world/TVVoxelWorld.gd +++ b/game/voxelman/world/TVVoxelWorld.gd @@ -87,6 +87,8 @@ func _process(delta): remove_chunk_index(i) i -= 1 count -= 1 + else: + update_lods() # else: # var dx : int = abs(ppx - c.position_x) # var dy : int = abs(ppy - c.position_y) @@ -132,7 +134,7 @@ func _process(delta): func _generation_finished(): if not Engine.editor_hint: max_frame_chunk_build_steps = _max_frame_chunk_build_temp - + initial_generation = false # for i in range(get_chunk_count()):