Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-04-15 21:06:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

add_chunk will error out now if a chunk is already owned by an another world. Also smaller improvements to set_chunks and the exit tree notification.

Browse Source
This commit is contained in:
Relintai 2020-04-22 15:57:00 +02:00
parent a2a9c1f714
commit af0c4d6586
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
world/voxel_world.cpp
View File

@ -260,6 +260,7 @@ void VoxelWorld::set_voxel_structures(const Vector<Variant> &structures) {
void VoxelWorld::add_chunk(Ref<VoxelChunk> chunk, const int x, const int y, const int z) { void VoxelWorld::add_chunk(Ref<VoxelChunk> chunk, const int x, const int y, const int z) {
ERR_FAIL_COND(!chunk.is_valid()); ERR_FAIL_COND(!chunk.is_valid());
ERR_FAIL_COND_MSG(chunk->get_voxel_world() != NULL && chunk->get_voxel_world() != this, "Chunk is already owned by an another world!");
IntPos pos(x, y, z); IntPos pos(x, y, z);
@ -484,31 +485,38 @@ Vector<Variant> VoxelWorld::get_chunks() {
void VoxelWorld::set_chunks(const Vector<Variant> &chunks) { void VoxelWorld::set_chunks(const Vector<Variant> &chunks) {
for (int i = 0; i < _chunks_vector.size(); ++i) { if (is_inside_tree()) {
Ref<VoxelChunk> chunk = Ref<VoxelChunk>(_chunks_vector[i]); for (int i = 0; i < _chunks_vector.size(); ++i) {
Ref<VoxelChunk> chunk = Ref<VoxelChunk>(_chunks_vector[i]);
if (chunks.find(chunk) == -1) { if (chunks.find(chunk) == -1) {
remove_chunk_index(i); remove_chunk_index(i);
_generation_queue.erase(chunk); _generation_queue.erase(chunk);
_generating.erase(chunk); _generating.erase(chunk);
--i; --i;
} }
}
for (int i = 0; i < chunks.size(); ++i) {
Ref<VoxelChunk> chunk = Ref<VoxelChunk>(chunks[i]);
if (!chunk.is_valid())
continue;
if (_chunks_vector.find(chunk) != -1) {
continue;
} }
if (chunk->get_voxel_world() != NULL && chunk->get_voxel_world() != this) //add the difference
continue; for (int i = 0; i < chunks.size(); ++i) {
Ref<VoxelChunk> chunk = Ref<VoxelChunk>(chunks[i]);
add_chunk(chunk, chunk->get_position_x(), chunk->get_position_y(), chunk->get_position_z()); if (!chunk.is_valid())
continue;
if (_chunks_vector.find(chunk) != -1)
continue;
add_chunk(chunk, chunk->get_position_x(), chunk->get_position_y(), chunk->get_position_z());
}
} else {
_chunks_vector.clear();
for (int i = 0; i < chunks.size(); ++i) {
Ref<VoxelChunk> chunk = Ref<VoxelChunk>(chunks[i]);
_chunks_vector.push_back(chunk);
}
} }
} }
@ -876,7 +884,10 @@ void VoxelWorld::_notification(int p_what) {
Ref<VoxelChunk> chunk = _chunks_vector[i]; Ref<VoxelChunk> chunk = _chunks_vector[i];
if (chunk.is_valid()) { if (chunk.is_valid()) {
chunk->exit_tree(); if (chunk->get_voxel_world() == this) {
chunk->exit_tree();
chunk->set_voxel_world(NULL);
}
} }
} }