Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-30 12:59:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Went through mdr ed's code for bad poolvector assigns, hopefully fixed all of them.

Browse Source
This commit is contained in:
Relintai 2022-04-14 14:06:15 +02:00
parent 386f52d84b
commit 3406a11f5c
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mesh_data_resource/editor/mdi_gizmo.cpp
View File

@ -1218,7 +1218,7 @@ void MDIGizmo::extrude() {
// set back
for (int ic = 0; ic < found_verts.size(); ++ic) {
new_verts[found_verts[ic]] = vavg;
new_verts.set(found_verts[ic], vavg);
}
}

29
modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.cpp
View File

@ -1088,23 +1088,23 @@ Array MDREDMeshUtils::generate_normals_arrs(Array arrays) {
if (nc[i0] == 0) {
nc.set(i0, 1);
normals[i0] = n;
normals.set(i0, n);
} else {
normals[i0] = normals[i0].linear_interpolate(n, 0.5).normalized();
normals.set(i0, normals[i0].linear_interpolate(n, 0.5).normalized());
}
if (nc[i1] == 0) {
nc.set(i1, 1);
normals[i1] = n;
normals.set(i1, n);
} else {
normals[i1] = normals[i1].linear_interpolate(n, 0.5).normalized();
normals.set(i1, normals[i1].linear_interpolate(n, 0.5).normalized());
}
if (nc[i2] == 0) {
nc.set(i2, 1);
normals[i2] = n;
normals.set(i2, n);
} else {
normals[i2] = normals[i2].linear_interpolate(n, 0.5).normalized();
normals.set(i2, normals[i2].linear_interpolate(n, 0.5).normalized());
}
}
@ -1157,23 +1157,23 @@ void MDREDMeshUtils::generate_normals_mdr(Ref<MeshDataResource> mdr) {
if (nc[i0] == 0) {
nc.set(i0, 1);
normals[i0] = n;
normals.set(i0, n);
} else {
normals[i0] = normals[i0].linear_interpolate(n, 0.5).normalized();
normals.set(i0, normals[i0].linear_interpolate(n, 0.5).normalized());
}
if (nc[i1] == 0) {
nc.set(i1, 1);
normals[i1] = n;
normals.set(i1, n);
} else {
normals[i1] = normals[i1].linear_interpolate(n, 0.5).normalized();
normals.set(i1, normals[i1].linear_interpolate(n, 0.5).normalized());
}
if (nc[i2] == 0) {
nc.set(i2, 1);
normals[i2] = n;
normals.set(i2, n);
} else {
normals[i2] = normals[i2].linear_interpolate(n, 0.5).normalized();
normals.set(i2, normals[i2].linear_interpolate(n, 0.5).normalized());
}
}
@ -1873,14 +1873,14 @@ void MDREDMeshUtils::apply_seam_old(Ref<MeshDataResource> mdr) {
indices.push_back(new_vert_size);
indices.push_back(new_vert_size + 1);
indices.push_back(i2);
} else if ( edge_int_tri_index == 1) {
} else if (edge_int_tri_index == 1) {
duplicate_verts_indices.push_back(i1);
duplicate_verts_indices.push_back(i2);
indices.push_back(i0);
indices.push_back(new_vert_size);
indices.push_back(new_vert_size + 1);
} else if ( edge_int_tri_index == 2) {
} else if (edge_int_tri_index == 2) {
duplicate_verts_indices.push_back(i0);
duplicate_verts_indices.push_back(i2);
@ -1948,7 +1948,6 @@ Array MDREDMeshUtils::seam_apply_duplicate_vertices(Array arrays, const PoolIntA
weights = arrays[ArrayMesh::ARRAY_WEIGHTS];
}
PoolIntArray::Read dvir = duplicate_verts_indices.read();
for (int i = 0; i < duplicate_verts_indices.size(); ++i) {
int index = dvir[i];