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 the new prop job setup to all 4 (3) VoxelWorlds.

Browse Source
This commit is contained in:
Relintai 2022-02-09 13:34:24 +01:00
parent 08be795296
commit 9ee54a48c4
4 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
world/blocky/voxel_world_blocky.cpp
View File

@ -76,6 +76,28 @@ Ref<VoxelChunk> VoxelWorldBlocky::_create_chunk(int x, int y, int z, Ref<VoxelCh
pj.INSTANCE(); pj.INSTANCE();
pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherBlocky))); pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherBlocky)));
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT
Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance();
s->set_fqms(fqms);
s->set_simplification_steps(2);
#endif
pj->add_jobs_step(s);
chunk->job_add(lj); chunk->job_add(lj);
chunk->job_add(tj); chunk->job_add(tj);
chunk->job_add(pj); chunk->job_add(pj);

22
world/cubic/voxel_world_cubic.cpp
View File

@ -77,6 +77,28 @@ Ref<VoxelChunk> VoxelWorldCubic::_create_chunk(int x, int y, int z, Ref<VoxelChu
pj.INSTANCE(); pj.INSTANCE();
pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherCubic))); pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherCubic)));
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT
Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance();
s->set_fqms(fqms);
s->set_simplification_steps(2);
#endif
pj->add_jobs_step(s);
chunk->job_add(lj); chunk->job_add(lj);
chunk->job_add(tj); chunk->job_add(tj);
chunk->job_add(pj); chunk->job_add(pj);

22
world/default/voxel_world_default.cpp
View File

@ -221,6 +221,28 @@ Ref<VoxelChunk> VoxelWorldDefault::_create_chunk(int x, int y, int z, Ref<VoxelC
pj.instance(); pj.instance();
pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherDefault))); pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherDefault)));
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT
Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance();
s->set_fqms(fqms);
s->set_simplification_steps(2);
#endif
pj->add_jobs_step(s);
// Order matters! // Order matters!
chunk->job_add(lj); chunk->job_add(lj);
chunk->job_add(tj); chunk->job_add(tj);

22
world/marching_cubes/voxel_world_marching_cubes.cpp
View File

@ -78,6 +78,28 @@ Ref<VoxelChunk> VoxelWorldMarchingCubes::_create_chunk(int x, int y, int z, Ref<
pj.INSTANCE(); pj.INSTANCE();
pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherMarchingCubes))); pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherMarchingCubes)));
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s);
s.instance();
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT
Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance();
s->set_fqms(fqms);
s->set_simplification_steps(2);
#endif
pj->add_jobs_step(s);
chunk->job_add(lj); chunk->job_add(lj);
chunk->job_add(tj); chunk->job_add(tj);
chunk->job_add(pj); chunk->job_add(pj);