diff --git a/HEADS b/HEADS index efea1993..f6c72fba 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": "e64a663c59141f972345852f0bce613e3f13dd3a", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "69cde94cebeb977a4bcd128e82e65c4aef887622", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "2b369f5be8efc5fe0ef13da57afa46317c413f47", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "367b2318da45726710c27fd3ac1d23e8a5a8f1f7"} \ No newline at end of file +{"engine": "e64a663c59141f972345852f0bce613e3f13dd3a", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "68df038731b7bca1905ce09433c90d64650a3030", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "2b369f5be8efc5fe0ef13da57afa46317c413f47", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "367b2318da45726710c27fd3ac1d23e8a5a8f1f7"} \ No newline at end of file diff --git a/game/voxelman/cubic_mesher/CubicVoxelWorld.gd b/game/voxelman/cubic_mesher/CubicVoxelWorld.gd index 3ae40b25..b88185ce 100644 --- a/game/voxelman/cubic_mesher/CubicVoxelWorld.gd +++ b/game/voxelman/cubic_mesher/CubicVoxelWorld.gd @@ -58,7 +58,7 @@ func _process(delta : float) -> void: func generate_terrarin(chunk : VoxelChunk) -> void: var buffer : VoxelChunk = chunk.get_buffer() - buffer.create(int(size_x) + 3, int(size_y) + 3, int(size_z) + 3) + buffer.create(int(chunk_size_x) + 3, int(chunk_size_y) + 3, int(chunk_size_z) + 3) var noise : OpenSimplexNoise = OpenSimplexNoise.new() noise.seed = 10 @@ -72,8 +72,8 @@ func generate_terrarin(chunk : VoxelChunk) -> void: terr_noise.period = 20.0 terr_noise.persistence = 0.9 - for x in range(-1, size_x + 2): - for z in range(-1, size_z + 2): + for x in range(-1, chunk_size_x + 2): + for z in range(-1, chunk_size_z + 2): var val : float = noise.get_noise_2d(x + (chunk.position_x * chunk.size_x), z + (chunk.position_z * chunk.size_z)) val *= val val *= 100 @@ -132,7 +132,7 @@ func spawn_chunk(x : int, y : int, z : int, lod_size : int = 1) -> void: chunk.library = library chunk.voxel_scale = voxel_scale chunk.lod_size = lod_size - chunk.set_chunk_size(int(size_x), int(size_y), int(size_z)) + chunk.set_chunk_size(int(chunk_size_x), int(chunk_size_y), int(chunk_size_z)) chunk.create_mesher() chunk.mesher.base_light_value = 0.6 diff --git a/game/voxelman/transvoxel_mesher_gen_uv/TVGUVoxelWorld.gd b/game/voxelman/transvoxel_mesher_gen_uv/TVGUVoxelWorld.gd index 6d869efc..1cbfdef9 100644 --- a/game/voxelman/transvoxel_mesher_gen_uv/TVGUVoxelWorld.gd +++ b/game/voxelman/transvoxel_mesher_gen_uv/TVGUVoxelWorld.gd @@ -61,7 +61,7 @@ func _process(delta : float) -> void: func generate_terrarin(chunk : VoxelChunk) -> void: var buffer : VoxelChunk = chunk.get_buffer() - buffer.create(int(size_x) + 3, int(size_y) + 3, int(size_z) + 3) + buffer.create(int(chunk_size_x) + 3, int(chunk_size_y) + 3, int(chunk_size_z) + 3) var noise : OpenSimplexNoise = OpenSimplexNoise.new() noise.seed = 10 @@ -75,8 +75,8 @@ func generate_terrarin(chunk : VoxelChunk) -> void: terr_noise.period = 20.0 terr_noise.persistence = 0.9 - for x in range(-1, size_x + 2): - for z in range(-1, size_z + 2): + for x in range(-1, chunk_size_x + 2): + for z in range(-1, chunk_size_z + 2): var val : float = noise.get_noise_2d(x + (chunk.position_x * chunk.size_x), z + (chunk.position_z * chunk.size_z)) val *= val val *= 100 @@ -135,7 +135,7 @@ func spawn_chunk(x : int, y : int, z : int, lod_size : int = 1) -> void: chunk.library = library chunk.voxel_scale = voxel_scale chunk.lod_size = lod_size - chunk.set_chunk_size(int(size_x), int(size_y), int(size_z)) + chunk.set_chunk_size(int(chunk_size_x), int(chunk_size_y), int(chunk_size_z)) chunk.create_mesher() chunk.mesher.base_light_value = 0.6 diff --git a/game/voxelman/transvoxel_mesher_normal_uv/TVNUVoxelWorld.gd b/game/voxelman/transvoxel_mesher_normal_uv/TVNUVoxelWorld.gd index ae3b5081..e583ba34 100644 --- a/game/voxelman/transvoxel_mesher_normal_uv/TVNUVoxelWorld.gd +++ b/game/voxelman/transvoxel_mesher_normal_uv/TVNUVoxelWorld.gd @@ -60,7 +60,7 @@ func _process(delta : float) -> void: func generate_terrarin(chunk : VoxelChunk) -> void: var buffer : VoxelChunk = chunk.get_buffer() - buffer.create(int(size_x) + 3, int(size_y) + 3, int(size_z) + 3) + buffer.create(int(chunk_size_x) + 3, int(chunk_size_y) + 3, int(chunk_size_z) + 3) var noise : OpenSimplexNoise = OpenSimplexNoise.new() noise.seed = 10 @@ -74,8 +74,8 @@ func generate_terrarin(chunk : VoxelChunk) -> void: terr_noise.period = 20.0 terr_noise.persistence = 0.9 - for x in range(-1, size_x + 2): - for z in range(-1, size_z + 2): + for x in range(-1, chunk_size_x + 2): + for z in range(-1, chunk_size_z + 2): var val : float = noise.get_noise_2d(x + (chunk.position_x * chunk.size_x), z + (chunk.position_z * chunk.size_z)) val *= val val *= 100 @@ -134,7 +134,7 @@ func spawn_chunk(x : int, y : int, z : int, lod_size : int = 1) -> void: chunk.library = library chunk.voxel_scale = voxel_scale chunk.lod_size = lod_size - chunk.set_chunk_size(int(size_x), int(size_y), int(size_z)) + chunk.set_chunk_size(int(chunk_size_x), int(chunk_size_y), int(chunk_size_z)) chunk.create_mesher() chunk.mesher.base_light_value = 0.6