Relintai/props
1
0
Fork 0
mirror of https://github.com/Relintai/props.git synced 2025-02-04 16:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set up job steps in PropInstanceMerger.

Browse Source
This commit is contained in:
Relintai 2021-08-10 10:13:16 +02:00
parent 33cc53c881
commit 0d4d55278f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
prop_instance_merger.cpp
View File

@ -48,6 +48,7 @@ typedef class RenderingServer VS;
#include "./props/prop_data_light.h" #include "./props/prop_data_light.h"
#include "./props/prop_data_prop.h" #include "./props/prop_data_prop.h"
#include "./props/prop_data_scene.h" #include "./props/prop_data_scene.h"
#include "jobs/prop_mesher_job_step.h"
#include "material_cache/prop_material_cache.h" #include "material_cache/prop_material_cache.h"
#if TEXTURE_PACKER_PRESENT #if TEXTURE_PACKER_PRESENT
@ -401,8 +402,23 @@ void PropInstanceMerger::_build() {
} }
if (!_job.is_valid()) { if (!_job.is_valid()) {
//todo this should probably be in a virtual method, lik ein Terraman or Voxelman
_job = Ref<PropInstanceJob>(memnew(PropInstancePropJob())); _job = Ref<PropInstanceJob>(memnew(PropInstancePropJob()));
_job->set_prop_instace(this); _job->set_prop_instace(this);
Ref<PropMesherJobStep> js;
js.instance();
js->set_job_type(PropMesherJobStep::TYPE_NORMAL);
_job->add_jobs_step(js);
js.instance();
js->set_job_type(PropMesherJobStep::TYPE_MERGE_VERTS);
_job->add_jobs_step(js);
js.instance();
js->set_job_type(PropMesherJobStep::TYPE_BAKE_TEXTURE);
_job->add_jobs_step(js);
} }
if (!is_inside_tree()) { if (!is_inside_tree()) {