Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2024-11-20 10:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add back the next_phase call into the new jobs.

Browse Source
This commit is contained in:
Relintai 2020-10-02 14:53:45 +02:00
parent 3f04002453
commit 43bb7dfa66
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/jobs/voxel_light_job.cpp
View File

@ -36,6 +36,7 @@ void VoxelLightJob::phase_light() {
bool gr = (chunk->get_build_flags() & VoxelChunkDefault::BUILD_FLAG_AUTO_GENERATE_RAO) != 0;
if (!gr && (chunk->get_build_flags() & VoxelChunkDefault::BUILD_FLAG_USE_LIGHTING) == 0) {
next_phase();
return;
}
@ -63,6 +64,7 @@ void VoxelLightJob::phase_light() {
}
reset_stages();
next_phase();
}
void VoxelLightJob::_execute() {

8
world/jobs/voxel_prop_job.cpp
View File

@ -55,13 +55,13 @@ void VoxelPropJob::phase_prop() {
Ref<VoxelChunkDefault> chunk = _chunk;
if (!get_prop_mesher().is_valid()) {
//next_phase();
next_phase();
return;
}
if (should_do()) {
if (chunk->get_mesh_data_resource_count() == 0) {
//next_phase();
next_phase();
return;
}
@ -74,7 +74,7 @@ void VoxelPropJob::phase_prop() {
if (get_prop_mesher()->get_vertex_count() == 0) {
reset_stages();
//next_phase();
next_phase();
return;
}
@ -262,7 +262,7 @@ void VoxelPropJob::phase_prop() {
}
}
//next_phase();
next_phase();
return;
#endif

11
world/jobs/voxel_terrarin_job.cpp
View File

@ -92,6 +92,8 @@ void VoxelTerrarinJob::phase_setup() {
mesher->set_library(_chunk->get_library());
mesher->reset();
}
next_phase();
}
void VoxelTerrarinJob::phase_terrarin_mesh_setup() {
@ -140,12 +142,15 @@ void VoxelTerrarinJob::phase_terrarin_mesh_setup() {
if (has_meta("tms_lm")) {
remove_meta("tms_lm");
}
next_phase();
}
void VoxelTerrarinJob::phase_collider() {
Ref<VoxelChunkDefault> chunk = _chunk;
if ((chunk->get_build_flags() & VoxelChunkDefault::BUILD_FLAG_CREATE_COLLIDER) == 0) {
next_phase();
return;
}
@ -199,11 +204,11 @@ void VoxelTerrarinJob::phase_collider() {
}
if (temp_arr_collider.size() == 0 && temp_arr_collider_liquid.size() == 0) {
next_phase();
return;
}
//set_active_build_phase_type(BUILD_PHASE_TYPE_PHYSICS_PROCESS);
//return;
set_build_phase_type(BUILD_PHASE_TYPE_PHYSICS_PROCESS);
}
void VoxelTerrarinJob::phase_terrarin_mesh() {
@ -341,6 +346,7 @@ void VoxelTerrarinJob::phase_terrarin_mesh() {
}
reset_stages();
next_phase();
return;
}
@ -540,6 +546,7 @@ void VoxelTerrarinJob::phase_terrarin_mesh() {
}
reset_stages();
next_phase();
}
void VoxelTerrarinJob::phase_finalize() {