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

Better phase cleanups in PropJob.

Browse Source
This commit is contained in:
Relintai 2021-08-07 15:03:35 +02:00
parent f62b605d9a
commit 8362eaf58e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
world/jobs/terra_prop_job.cpp
View File

@ -141,6 +141,7 @@ void TerraPropJob::phase_prop() {
if (should_do()) { if (should_do()) {
if (chunk->mesh_data_resource_get_count() == 0) { if (chunk->mesh_data_resource_get_count() == 0) {
reset_stages();
set_complete(true); //So threadpool knows it's done set_complete(true); //So threadpool knows it's done
next_job(); next_job();
return; return;
@ -153,7 +154,7 @@ void TerraPropJob::phase_prop() {
} }
if (get_prop_mesher()->get_vertex_count() == 0) { if (get_prop_mesher()->get_vertex_count() == 0) {
//reset_stages(); reset_stages();
set_complete(true); //So threadpool knows it's done set_complete(true); //So threadpool knows it's done
next_job(); next_job();
@ -207,14 +208,11 @@ void TerraPropJob::phase_prop() {
} }
} }
} }
if (should_return()) {
return;
}
} }
#endif #endif
reset_stages();
next_phase(); next_phase();
} }
@ -281,7 +279,9 @@ void TerraPropJob::phase_steps() {
if (_prop_mesher->get_vertex_count() == 0) { if (_prop_mesher->get_vertex_count() == 0) {
reset_stages(); reset_stages();
next_phase(); //next_phase();
set_complete(true); //So threadpool knows it's done
next_job();
return; return;
} }
@ -412,7 +412,6 @@ void TerraPropJob::step_type_normal() {
if (lmat.is_valid()) { if (lmat.is_valid()) {
VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, lmat->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, lmat->get_rid());
} }
++_current_mesh; ++_current_mesh;
} }