Zylann
/
godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Request saving of generated blocks if the option is enabled in VoxelStream

master
Marc Gilleron 2021-01-17 22:22:10 +00:00
parent a3bad1af64
commit 3a0ebc73a7
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
server/voxel_server.cpp
View File

@ -81,9 +81,13 @@ VoxelServer::~VoxelServer() {
void VoxelServer::wait_and_clear_all_tasks(bool warn) {
_streaming_thread_pool.wait_for_all_tasks();
_meshing_thread_pool.wait_for_all_tasks();
_generation_thread_pool.wait_for_all_tasks();
// Wait a second time because the generation pool can generate streaming requests
_streaming_thread_pool.wait_for_all_tasks();
_meshing_thread_pool.wait_for_all_tasks();
_streaming_thread_pool.dequeue_completed_tasks([warn](IVoxelTask *task) {
if (warn) {
WARN_PRINT("Streaming tasks remain on module cleanup, "
@ -324,6 +328,29 @@ void VoxelServer::request_block_generate_from_data_request(BlockDataRequest *src
_generation_thread_pool.enqueue(rp);
}
void VoxelServer::request_block_save_from_generate_request(BlockGenerateRequest *src) {
// This can be called from another thread
PRINT_VERBOSE(String("Requesting save of generator output for block {0} lod {1}")
.format(varray(src->position.to_vec3(), src->lod)));
ERR_FAIL_COND(src->voxels.is_null());
BlockDataRequest r;
r.voxels = src->voxels->duplicate(true);
r.volume_id = src->volume_id;
r.position = src->position;
r.lod = src->lod;
r.type = BlockDataRequest::TYPE_SAVE;
r.block_size = src->block_size;
r.stream_dependency = src->stream_dependency;
// No priority data, saving doesnt need sorting
BlockDataRequest *rp = memnew(BlockDataRequest(r));
_streaming_thread_pool.enqueue(rp);
}
void VoxelServer::remove_volume(uint32_t volume_id) {
{
Volume &volume = _world.volumes.get(volume_id);
@ -657,7 +684,13 @@ void VoxelServer::BlockGenerateRequest::run(VoxelTaskContext ctx) {
VoxelBlockRequest r{ voxels, origin_in_voxels, lod };
generator->generate_block(r);
// TODO Request save if the option is enabled
if (stream_dependency->valid) {
Ref<VoxelStream> stream = stream_dependency->stream;
if (stream.is_valid() && stream->get_save_generator_output()) {
VoxelServer::get_singleton()->request_block_save_from_generate_request(this);
}
}
has_run = true;
}

2
server/voxel_server.h
View File

@ -160,8 +160,10 @@ public:
private:
class BlockDataRequest;
class BlockGenerateRequest;
void request_block_generate_from_data_request(BlockDataRequest *src);
void request_block_save_from_generate_request(BlockGenerateRequest *src);
Dictionary _b_get_stats();