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

Use the new lod variant of the library's material getters wherever possible.

Browse Source
This commit is contained in:
Relintai 2021-08-01 16:33:17 +02:00
parent cc634fb760
commit 660ea8bf74
3 changed files with 29 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meshers/terra_mesher.cpp
View File

@ -291,7 +291,7 @@ void TerraMesher::build_mesh_into(RID mesh) {
VS::get_singleton()->mesh_add_surface_from_arrays(mesh, VisualServer::PRIMITIVE_TRIANGLES, arr); VS::get_singleton()->mesh_add_surface_from_arrays(mesh, VisualServer::PRIMITIVE_TRIANGLES, arr);
if (_material.is_valid()) if (_material.is_valid())
VS::get_singleton()->mesh_surface_set_material(mesh, 0, _library->material_get(0)->get_rid()); VS::get_singleton()->mesh_surface_set_material(mesh, 0, _library->material_lod_get(0)->get_rid());
} }
void TerraMesher::generate_normals(bool p_flip) { void TerraMesher::generate_normals(bool p_flip) {

24
world/jobs/terra_prop_job.cpp
View File

@ -226,8 +226,8 @@ void TerraPropJob::phase_prop() {
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 (chunk->get_library()->prop_material_get(0).is_valid()) if (chunk->get_library()->prop_material_lod_get(0).is_valid())
VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->prop_material_get(0)->get_rid()); VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->prop_material_lod_get(0)->get_rid());
if (should_return()) { if (should_return()) {
return; return;
@ -243,8 +243,8 @@ void TerraPropJob::phase_prop() {
VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 1), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 1), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
if (chunk->get_library()->prop_material_get(1).is_valid()) if (chunk->get_library()->prop_material_lod_get(1).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 1), 0, chunk->get_library()->prop_material_get(1)->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 1), 0, chunk->get_library()->prop_material_lod_get(1)->get_rid());
} }
if (should_return()) { if (should_return()) {
@ -259,8 +259,8 @@ void TerraPropJob::phase_prop() {
VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 2), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr2); VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 2), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr2);
if (chunk->get_library()->prop_material_get(2).is_valid()) if (chunk->get_library()->prop_material_lod_get(2).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 2), 0, chunk->get_library()->prop_material_get(2)->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 2), 0, chunk->get_library()->prop_material_lod_get(2)->get_rid());
} }
if (should_return()) { if (should_return()) {
return; return;
@ -269,8 +269,8 @@ void TerraPropJob::phase_prop() {
// if (should_do()) { // if (should_do()) {
if (chunk->get_lod_num() >= 3) { if (chunk->get_lod_num() >= 3) {
Ref<ShaderMaterial> mat = chunk->get_library()->prop_material_get(0); Ref<ShaderMaterial> mat = chunk->get_library()->prop_material_lod_get(0);
Ref<SpatialMaterial> spmat = chunk->get_library()->prop_material_get(0); Ref<SpatialMaterial> spmat = chunk->get_library()->prop_material_lod_get(0);
Ref<Texture> tex; Ref<Texture> tex;
if (mat.is_valid()) { if (mat.is_valid()) {
@ -285,8 +285,8 @@ void TerraPropJob::phase_prop() {
VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 3), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VisualServer::get_singleton()->mesh_add_surface_from_arrays(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 3), VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
if (chunk->get_library()->prop_material_get(3).is_valid()) if (chunk->get_library()->prop_material_lod_get(3).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 3), 0, chunk->get_library()->prop_material_get(3)->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_PROP, TerraChunkDefault::MESH_TYPE_INDEX_MESH, 3), 0, chunk->get_library()->prop_material_lod_get(3)->get_rid());
} }
} }
@ -306,10 +306,10 @@ void TerraPropJob::phase_prop() {
chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_TERRARIN, TerraChunkDefault::MESH_TYPE_INDEX_MESH, i), chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_TERRARIN, TerraChunkDefault::MESH_TYPE_INDEX_MESH, i),
VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
if (chunk->get_library()->prop_material_get(i).is_valid()) if (chunk->get_library()->prop_material_lod_get(i).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material( VisualServer::get_singleton()->mesh_surface_set_material(
chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_TERRARIN, TerraChunkDefault::MESH_TYPE_INDEX_MESH, i), 0, chunk->mesh_rid_get_index(TerraChunkDefault::MESH_INDEX_TERRARIN, TerraChunkDefault::MESH_TYPE_INDEX_MESH, i), 0,
chunk->get_library()->prop_material_get(i)->get_rid()); chunk->get_library()->prop_material_lod_get(i)->get_rid());
} }
} }

50
world/jobs/terra_terrarin_job.cpp
View File

@ -351,8 +351,8 @@ void TerraTerrarinJob::phase_terrarin_mesh() {
// if (should_do()) { // if (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 (chunk->get_library()->liquid_material_get(0).is_valid()) if (chunk->get_library()->liquid_material_lod_get(0).is_valid())
VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->liquid_material_get(0)->get_rid()); VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->liquid_material_lod_get(0)->get_rid());
// if (should_return()) { // if (should_return()) {
// return; // return;
@ -444,11 +444,8 @@ void TerraTerrarinJob::step_type_normal() {
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);
int matnum = chunk->get_library()->material_get_num(); if (chunk->get_library()->material_lod_get(_current_mesh).is_valid())
int mindex = matnum <= _current_mesh ? matnum - 1 : _current_mesh; VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_lod_get(_current_mesh)->get_rid());
if (chunk->get_library()->material_get(mindex).is_valid())
VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_get(mindex)->get_rid());
++_current_mesh; ++_current_mesh;
} }
@ -479,11 +476,8 @@ void TerraTerrarinJob::step_type_normal_lod() {
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);
int matnum = chunk->get_library()->material_get_num(); if (chunk->get_library()->material_lod_get(_current_mesh).is_valid())
int mindex = matnum <= _current_mesh ? matnum - 1 : _current_mesh; VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_lod_get(_current_mesh)->get_rid());
if (chunk->get_library()->material_get(mindex).is_valid())
VS::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_get(mindex)->get_rid());
++_current_mesh; ++_current_mesh;
} }
@ -498,11 +492,8 @@ void TerraTerrarinJob::step_type_drop_uv2() {
VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
int matnum = chunk->get_library()->material_get_num(); if (chunk->get_library()->material_lod_get(_current_mesh).is_valid())
int mindex = matnum <= _current_mesh ? matnum - 1 : _current_mesh; VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_lod_get(_current_mesh)->get_rid());
if (chunk->get_library()->material_get(mindex).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_get(mindex)->get_rid());
++_current_mesh; ++_current_mesh;
} }
@ -517,11 +508,8 @@ void TerraTerrarinJob::step_type_merge_verts() {
VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
int matnum = chunk->get_library()->material_get_num(); if (chunk->get_library()->material_lod_get(_current_mesh).is_valid())
int mindex = matnum <= _current_mesh ? matnum - 1 : _current_mesh; VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_lod_get(_current_mesh)->get_rid());
if (chunk->get_library()->material_get(mindex).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_get(mindex)->get_rid());
++_current_mesh; ++_current_mesh;
} }
@ -529,8 +517,8 @@ void TerraTerrarinJob::step_type_merge_verts() {
void TerraTerrarinJob::step_type_bake_texture() { void TerraTerrarinJob::step_type_bake_texture() {
Ref<TerraChunkDefault> chunk = _chunk; Ref<TerraChunkDefault> chunk = _chunk;
Ref<ShaderMaterial> mat = chunk->get_library()->material_get(0); Ref<ShaderMaterial> mat = chunk->get_library()->material_lod_get(0);
Ref<SpatialMaterial> spmat = chunk->get_library()->material_get(0); Ref<SpatialMaterial> spmat = chunk->get_library()->material_lod_get(0);
Ref<Texture> tex; Ref<Texture> tex;
if (mat.is_valid()) { if (mat.is_valid()) {
@ -547,11 +535,8 @@ void TerraTerrarinJob::step_type_bake_texture() {
VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
int matnum = chunk->get_library()->material_get_num(); if (chunk->get_library()->material_lod_get(_current_mesh).is_valid())
int mindex = matnum <= _current_mesh ? matnum - 1 : _current_mesh; VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_lod_get(_current_mesh)->get_rid());
if (chunk->get_library()->material_get(mindex).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_get(mindex)->get_rid());
} }
++_current_mesh; ++_current_mesh;
@ -577,11 +562,8 @@ void TerraTerrarinJob::step_type_simplify_mesh() {
VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr); VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, temp_mesh_arr);
int matnum = chunk->get_library()->material_get_num(); if (chunk->get_library()->material_lod_get(_current_mesh).is_valid())
int mindex = matnum <= _current_mesh ? matnum - 1 : _current_mesh; VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_lod_get(_current_mesh)->get_rid());
if (chunk->get_library()->material_get(mindex).is_valid())
VisualServer::get_singleton()->mesh_surface_set_material(mesh_rid, 0, chunk->get_library()->material_get(mindex)->get_rid());
++_current_mesh; ++_current_mesh;
} }