diff --git a/world/blocky/voxel_world_blocky.cpp b/world/blocky/voxel_world_blocky.cpp index af12dd6..80b6b0a 100644 --- a/world/blocky/voxel_world_blocky.cpp +++ b/world/blocky/voxel_world_blocky.cpp @@ -31,6 +31,10 @@ SOFTWARE. #include "../jobs/voxel_prop_job.h" #include "../jobs/voxel_terrain_job.h" +#ifdef MESH_UTILS_PRESENT +#include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" +#endif + Ref VoxelWorldBlocky::_create_chunk(int x, int y, int z, Ref chunk) { if (!chunk.is_valid()) { chunk = Ref(memnew(VoxelChunkBlocky)); @@ -62,6 +66,9 @@ Ref VoxelWorldBlocky::_create_chunk(int x, int y, int z, Ref fqms; + fqms.instance(); + s->set_fqms(fqms); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_simplification_step_ratio(0.8); s->set_simplification_agressiveness(7); @@ -91,7 +98,6 @@ Ref VoxelWorldBlocky::_create_chunk(int x, int y, int z, Refset_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); #ifdef MESH_UTILS_PRESENT - Ref fqms; fqms.instance(); s->set_fqms(fqms); s->set_simplification_steps(2); diff --git a/world/cubic/voxel_world_cubic.cpp b/world/cubic/voxel_world_cubic.cpp index ee12bc1..e48d034 100644 --- a/world/cubic/voxel_world_cubic.cpp +++ b/world/cubic/voxel_world_cubic.cpp @@ -29,6 +29,10 @@ SOFTWARE. #include "../jobs/voxel_prop_job.h" #include "../jobs/voxel_terrain_job.h" +#ifdef MESH_UTILS_PRESENT +#include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" +#endif + Ref VoxelWorldCubic::_create_chunk(int x, int y, int z, Ref chunk) { if (!chunk.is_valid()) { chunk = Ref(memnew(VoxelChunkCubic)); @@ -60,6 +64,9 @@ Ref VoxelWorldCubic::_create_chunk(int x, int y, int z, Ref fqms; + fqms.instance(); + s->set_fqms(fqms); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_simplification_step_ratio(0.8); s->set_simplification_agressiveness(7); @@ -92,7 +99,6 @@ Ref VoxelWorldCubic::_create_chunk(int x, int y, int z, Refset_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); #ifdef MESH_UTILS_PRESENT - Ref fqms; fqms.instance(); s->set_fqms(fqms); s->set_simplification_steps(2); diff --git a/world/default/voxel_world_default.cpp b/world/default/voxel_world_default.cpp index be69f68..a8692ff 100644 --- a/world/default/voxel_world_default.cpp +++ b/world/default/voxel_world_default.cpp @@ -31,6 +31,10 @@ SOFTWARE. #include "../jobs/voxel_prop_job.h" #include "../jobs/voxel_terrain_job.h" +#ifdef MESH_UTILS_PRESENT +#include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" +#endif + _FORCE_INLINE_ int VoxelWorldDefault::get_build_flags() const { return _build_flags; } @@ -207,6 +211,9 @@ Ref VoxelWorldDefault::_create_chunk(int x, int y, int z, Ref fqms; + fqms.instance(); + s->set_fqms(fqms); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_simplification_step_ratio(0.8); s->set_simplification_agressiveness(7); @@ -236,7 +243,6 @@ Ref VoxelWorldDefault::_create_chunk(int x, int y, int z, Refset_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); #ifdef MESH_UTILS_PRESENT - Ref fqms; fqms.instance(); s->set_fqms(fqms); s->set_simplification_steps(2); diff --git a/world/marching_cubes/voxel_world_marching_cubes.cpp b/world/marching_cubes/voxel_world_marching_cubes.cpp index 35a98bc..2f95a8d 100644 --- a/world/marching_cubes/voxel_world_marching_cubes.cpp +++ b/world/marching_cubes/voxel_world_marching_cubes.cpp @@ -29,6 +29,10 @@ SOFTWARE. #include "../jobs/voxel_prop_job.h" #include "../jobs/voxel_terrain_job.h" +#ifdef MESH_UTILS_PRESENT +#include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" +#endif + Ref VoxelWorldMarchingCubes::_create_chunk(int x, int y, int z, Ref chunk) { if (!chunk.is_valid()) { chunk = Ref(memnew(VoxelChunkMarchingCubes)); @@ -60,6 +64,9 @@ Ref VoxelWorldMarchingCubes::_create_chunk(int x, int y, int z, Ref< #ifdef MESH_UTILS_PRESENT s.instance(); + Ref fqms; + fqms.instance(); + s->set_fqms(fqms); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_simplification_step_ratio(0.8); s->set_simplification_agressiveness(7); @@ -93,7 +100,6 @@ Ref VoxelWorldMarchingCubes::_create_chunk(int x, int y, int z, Ref< s.instance(); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); #ifdef MESH_UTILS_PRESENT - Ref fqms; fqms.instance(); s->set_fqms(fqms); s->set_simplification_steps(2);