Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-04-17 21:06:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Same change to BUILD_PHASE_MESH_DATA_RESOURCES aswell.

Browse Source
This commit is contained in:
Relintai 2020-08-04 15:36:03 +02:00
parent 6af711322d
commit d8cf2af059
1 changed files with 118 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
world/default/voxel_chunk_default.cpp
View File

@ -1658,16 +1658,16 @@ void VoxelChunkDefault::_build_phase(int phase) {
} }
} }
if (_job->should_do()) { // if (_job->should_do()) {
VS::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VS::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
if (_library->get_liquid_material(0).is_valid()) if (_library->get_liquid_material(0).is_valid())
VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, _library->get_liquid_material(0)->get_rid()); VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, _library->get_liquid_material(0)->get_rid());
if (_job->should_return()) { // if (_job->should_return()) {
return; // return;
} // }
} //}
} }
if (_job->has_meta("bptm_ulm")) { if (_job->has_meta("bptm_ulm")) {
@ -1699,6 +1699,7 @@ void VoxelChunkDefault::_build_phase(int phase) {
return; return;
} }
if (_job->should_do()) {
if (get_mesh_data_resource_count() == 0) { if (get_mesh_data_resource_count() == 0) {
next_phase(); next_phase();
return; return;
@ -1709,19 +1710,39 @@ void VoxelChunkDefault::_build_phase(int phase) {
} }
if (get_prop_mesher()->get_vertex_count() == 0) { if (get_prop_mesher()->get_vertex_count() == 0) {
_job->reset_stages();
next_phase(); next_phase();
return; return;
} }
if (_job->should_return()) {
return;
}
}
if (_job->should_do()) {
if ((_build_flags & VoxelChunkDefault::BUILD_FLAG_USE_LIGHTING) != 0) { if ((_build_flags & VoxelChunkDefault::BUILD_FLAG_USE_LIGHTING) != 0) {
get_prop_mesher()->bake_colors(this); get_prop_mesher()->bake_colors(this);
} }
if (get_prop_mesher()->get_vertex_count() != 0) { if (_job->should_return()) {
RID mesh_rid = get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 0); return;
}
}
if (get_prop_mesher()->get_vertex_count() != 0) {
if (_job->should_do()) {
temp_mesh_arr = get_prop_mesher()->build_mesh(); temp_mesh_arr = get_prop_mesher()->build_mesh();
if (_job->should_return()) {
return;
}
}
RID mesh_rid = get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 0);
if (_job->should_do()) {
if (mesh_rid == RID()) { if (mesh_rid == RID()) {
if ((_build_flags & BUILD_FLAG_CREATE_LODS) != 0) if ((_build_flags & BUILD_FLAG_CREATE_LODS) != 0)
create_meshes(MESH_INDEX_PROP, _lod_num + 1); create_meshes(MESH_INDEX_PROP, _lod_num + 1);
@ -1738,12 +1759,26 @@ void VoxelChunkDefault::_build_phase(int phase) {
VS::get_singleton()->mesh_clear(mesh_rid); VS::get_singleton()->mesh_clear(mesh_rid);
#endif #endif
if (_job->should_return()) {
return;
}
}
if (_job->should_do()) {
VS::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VS::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
if (_library->get_prop_material(0).is_valid()) if (_library->get_prop_material(0).is_valid())
VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, _library->get_prop_material(0)->get_rid()); VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, _library->get_prop_material(0)->get_rid());
if (_job->should_return()) {
return;
}
}
if ((_build_flags & BUILD_FLAG_CREATE_LODS) != 0) { if ((_build_flags & BUILD_FLAG_CREATE_LODS) != 0) {
if (_job->should_do()) {
if (_lod_num >= 1) { if (_lod_num >= 1) {
//for lod 1 just remove uv2 //for lod 1 just remove uv2
temp_mesh_arr[VisualServer::ARRAY_TEX_UV2] = Variant(); temp_mesh_arr[VisualServer::ARRAY_TEX_UV2] = Variant();
@ -1754,15 +1789,27 @@ void VoxelChunkDefault::_build_phase(int phase) {
VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 1), 0, get_library()->get_prop_material(1)->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 1), 0, get_library()->get_prop_material(1)->get_rid());
} }
if (_job->should_return()) {
return;
}
}
if (_job->should_do()) {
if (_lod_num >= 2) { if (_lod_num >= 2) {
Array temp_mesh_arr2 = merge_mesh_array(temp_mesh_arr); Array temp_mesh_arr2 = merge_mesh_array(temp_mesh_arr);
temp_mesh_arr = temp_mesh_arr2;
VisualServer::get_singleton()->mesh_add_surface_from_arrays(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 2), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr2); VisualServer::get_singleton()->mesh_add_surface_from_arrays(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 2), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr2);
if (get_library()->get_prop_material(2).is_valid()) if (get_library()->get_prop_material(2).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 2), 0, get_library()->get_prop_material(2)->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, 2), 0, get_library()->get_prop_material(2)->get_rid());
} }
if (_job->should_return()) {
return;
}
}
// if (_job->should_do()) {
if (_lod_num >= 3) { if (_lod_num >= 3) {
Ref<ShaderMaterial> mat = get_library()->get_prop_material(0); Ref<ShaderMaterial> mat = get_library()->get_prop_material(0);
Ref<SpatialMaterial> spmat = get_library()->get_prop_material(0); Ref<SpatialMaterial> spmat = get_library()->get_prop_material(0);
@ -1785,7 +1832,13 @@ void VoxelChunkDefault::_build_phase(int phase) {
} }
} }
// if (_job->should_return()) {
// return;
// }
// }
/* /*
if (_job->should_do()) {
if (_lod_num > 4) { if (_lod_num > 4) {
Ref<FastQuadraticMeshSimplifier> fqms; Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance(); fqms.instance();
@ -1806,6 +1859,10 @@ void VoxelChunkDefault::_build_phase(int phase) {
VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, i), 0, get_library()->get_material(i)->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(get_mesh_rid_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH, i), 0, get_library()->get_material(i)->get_rid());
} }
} }
if (_job->should_return()) {
return;
}
}
*/ */
} }
} }