From 989e82b33277d5f97e857d63521d1adb7f612f47 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 6 Oct 2020 12:29:16 +0200 Subject: [PATCH] Small cleanups. --- world/jobs/voxel_prop_job.cpp | 4 +--- world/jobs/voxel_terrarin_job.cpp | 27 --------------------------- world/jobs/voxel_terrarin_job.h | 1 - 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/world/jobs/voxel_prop_job.cpp b/world/jobs/voxel_prop_job.cpp index efbef57..f578acd 100644 --- a/world/jobs/voxel_prop_job.cpp +++ b/world/jobs/voxel_prop_job.cpp @@ -320,9 +320,7 @@ void VoxelPropJob::phase_prop() { } } - //next_phase(); - - return; + //next_phase() #endif next_job(); diff --git a/world/jobs/voxel_terrarin_job.cpp b/world/jobs/voxel_terrarin_job.cpp index 1600039..2013b05 100644 --- a/world/jobs/voxel_terrarin_job.cpp +++ b/world/jobs/voxel_terrarin_job.cpp @@ -252,27 +252,6 @@ void VoxelTerrarinJob::phase_physics_process() { void VoxelTerrarinJob::phase_terrarin_mesh() { Ref chunk = _chunk; - /* - if (should_do()) { - for (int i = 0; i < _meshers.size(); ++i) { - Ref mesher = _meshers.get(i); - - ERR_CONTINUE(!mesher.is_valid()); - - mesher->set_library(_chunk->get_library()); - } - - for (int i = 0; i < _liquid_meshers.size(); ++i) { - Ref mesher = _liquid_meshers.get(i); - - ERR_CONTINUE(!mesher.is_valid()); - - mesher->set_library(_chunk->get_library()); - } - - if (should_return()) - return; - }*/ if ((chunk->get_build_flags() & VoxelChunkDefault::BUILD_FLAG_USE_LIGHTING) != 0) { int starti = 0; @@ -597,12 +576,6 @@ void VoxelTerrarinJob::phase_finalize() { next_job(); } -void VoxelTerrarinJob::phase_finalize_physics_process() { - // add physics meshes - - next_job(); -} - void VoxelTerrarinJob::_execute_phase() { ERR_FAIL_COND(!_chunk.is_valid()); diff --git a/world/jobs/voxel_terrarin_job.h b/world/jobs/voxel_terrarin_job.h index 60e74b6..96e8e85 100644 --- a/world/jobs/voxel_terrarin_job.h +++ b/world/jobs/voxel_terrarin_job.h @@ -51,7 +51,6 @@ public: void phase_physics_proces(); void phase_terrarin_mesh(); void phase_finalize(); - void phase_finalize_physics_process(); void phase_physics_process(); void _execute_phase();