Relintai/props
1
0
Fork 0
mirror of https://github.com/Relintai/props.git synced 2025-03-10 18:23:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reset the meshes even if _prop_data is not valid.

Browse Source
This commit is contained in:
Relintai 2021-08-10 10:53:22 +02:00
parent 4ee6f2b033
commit 9320f0c3c4
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prop_instance_merger.cpp
View File

@ -387,6 +387,10 @@ void PropInstanceMerger::_build() {
_build_queued = false;
if (!_prop_data.is_valid()) {
if (_job.is_valid()) {
_job->reset_meshes();
}
_building = false;
return;
}

30
prop_instance_prop_job.cpp
View File

@ -194,6 +194,7 @@ void PropInstancePropJob::phase_prop() {
if (should_do()) {
if (_prop_mesh_datas.size() == 0) {
//reset_meshes();
set_complete(true); //So threadpool knows it's done
return;
}
@ -214,6 +215,8 @@ void PropInstancePropJob::phase_prop() {
}
if (get_prop_mesher()->get_vertex_count() == 0) {
//reset_meshes();
reset_stages();
set_complete(true); //So threadpool knows it's done
@ -301,13 +304,16 @@ void PropInstancePropJob::_physics_process(float delta) {
void PropInstancePropJob::_execute_phase() {
if (!_material_cache.is_valid()) {
ERR_PRINT("!PropInstancePropJob::_execute_phase(): _material_cache.is_valid()");
ERR_PRINT("!PropInstancePropJob::_execute_phase(): !_material_cache.is_valid()");
//reset_meshes();
set_complete(true); //So threadpool knows it's done
finished();
}
#ifdef MESH_DATA_RESOURCE_PRESENT
if (_prop_mesh_datas.size() == 0) {
//reset_meshes();
set_complete(true);
finished();
return;
@ -676,6 +682,28 @@ Array PropInstancePropJob::bake_mesh_array_uv(Array arr, Ref<Texture> tex, const
return arr;
}
void PropInstancePropJob::reset_meshes() {
if (!_prop_instace) {
return;
}
//we have meshes, clear
if (_prop_instace->mesh_get_num() != 0) {
int count = _prop_instace->mesh_get_num();
for (int i = 0; i < count; ++i) {
RID mesh_rid = _prop_instace->mesh_get(i);
if (VS::get_singleton()->mesh_get_surface_count(mesh_rid) > 0)
#if !GODOT4
VS::get_singleton()->mesh_remove_surface(mesh_rid, 0);
#else
VS::get_singleton()->mesh_clear(mesh_rid);
#endif
}
}
}
PropInstancePropJob::PropInstancePropJob() {
set_build_phase_type(BUILD_PHASE_TYPE_PHYSICS_PROCESS);

2
prop_instance_prop_job.h
View File

@ -79,6 +79,8 @@ public:
Array merge_mesh_array(Array arr) const;
Array bake_mesh_array_uv(Array arr, Ref<Texture> tex, float mul_color = 0.7) const;
void reset_meshes();
PropInstancePropJob();
~PropInstancePropJob();