asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

MeshDataTool::create_from_surface Fail on invalid index data

Browse source 
(cherry picked from commit 8e82cf8174)
This commit is contained in:
kleonc 2021-02-23 21:37:32 +01:00 committed by Rémi Verschelde
parent 82b31fe8e7
commit 80e4b2d02e
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
scene/resources/mesh_data_tool.cpp
View file

@ -52,6 +52,28 @@ Error MeshDataTool::create_from_surface(const Ref<ArrayMesh> &p_mesh, int p_surf
int vcount = varray.size(); int vcount = varray.size();
ERR_FAIL_COND_V(vcount == 0, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(vcount == 0, ERR_INVALID_PARAMETER);
PoolVector<int> indices;
if (arrays[Mesh::ARRAY_INDEX].get_type() != Variant::NIL) {
indices = arrays[Mesh::ARRAY_INDEX];
} else {
//make code simpler
indices.resize(vcount);
PoolVector<int>::Write iw = indices.write();
for (int i = 0; i < vcount; i++)
iw[i] = i;
}
int icount = indices.size();
PoolVector<int>::Read r = indices.read();
ERR_FAIL_COND_V(icount == 0, ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(icount % 3, ERR_INVALID_PARAMETER);
for (int i = 0; i < icount; i++) {
ERR_FAIL_INDEX_V(r[i], vcount, ERR_INVALID_PARAMETER);
}
clear(); clear();
format = p_mesh->surface_get_format(p_surface); format = p_mesh->surface_get_format(p_surface);
material = p_mesh->surface_get_material(p_surface); material = p_mesh->surface_get_material(p_surface);
@ -121,22 +143,6 @@ Error MeshDataTool::create_from_surface(const Ref<ArrayMesh> &p_mesh, int p_surf
vertices.write[i] = v; vertices.write[i] = v;
} }
PoolVector<int> indices;
if (arrays[Mesh::ARRAY_INDEX].get_type() != Variant::NIL) {
indices = arrays[Mesh::ARRAY_INDEX];
} else {
//make code simpler
indices.resize(vcount);
PoolVector<int>::Write iw = indices.write();
for (int i = 0; i < vcount; i++)
iw[i] = i;
}
int icount = indices.size();
PoolVector<int>::Read r = indices.read();
Map<Point2i, int> edge_indices; Map<Point2i, int> edge_indices;
for (int i = 0; i < icount; i += 3) { for (int i = 0; i < icount; i += 3) {