Relintai/mesh_utils
1
0
Fork 0
mirror of https://github.com/Relintai/mesh_utils.git synced 2024-11-12 10:25:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only assign back a specific array if it was originally available.

Browse Source
This commit is contained in:
Relintai 2021-08-10 18:07:07 +02:00
parent 29c5cc9a75
commit aa47e344fd
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
mesh_utils.cpp
View File

@ -86,12 +86,19 @@ Array MeshUtils::merge_mesh_array(Array arr) const {
}
arr[VisualServer::ARRAY_VERTEX] = verts;
arr[VisualServer::ARRAY_NORMAL] = normals;
arr[VisualServer::ARRAY_TEX_UV] = uvs;
arr[VisualServer::ARRAY_COLOR] = colors;
arr[VisualServer::ARRAY_INDEX] = indices;
arr[VisualServer::ARRAY_BONES] = bones;
arr[VisualServer::ARRAY_WEIGHTS] = weights;
if (normals.size() > 0)
arr[VisualServer::ARRAY_NORMAL] = normals;
if (uvs.size() > 0)
arr[VisualServer::ARRAY_TEX_UV] = uvs;
if (colors.size() > 0)
arr[VisualServer::ARRAY_COLOR] = colors;
if (indices.size() > 0)
arr[VisualServer::ARRAY_INDEX] = indices;
if (bones.size() > 0)
arr[VisualServer::ARRAY_BONES] = bones;
if (weights.size() > 0)
arr[VisualServer::ARRAY_WEIGHTS] = weights;
return arr;
}
@ -264,12 +271,19 @@ Array MeshUtils::remove_doubles(Array arr) const {
}
arr[VisualServer::ARRAY_VERTEX] = verts;
arr[VisualServer::ARRAY_NORMAL] = normals;
arr[VisualServer::ARRAY_TEX_UV] = uvs;
arr[VisualServer::ARRAY_COLOR] = colors;
arr[VisualServer::ARRAY_INDEX] = indices;
arr[VisualServer::ARRAY_BONES] = bones;
arr[VisualServer::ARRAY_WEIGHTS] = weights;
if (normals.size() > 0)
arr[VisualServer::ARRAY_NORMAL] = normals;
if (uvs.size() > 0)
arr[VisualServer::ARRAY_TEX_UV] = uvs;
if (colors.size() > 0)
arr[VisualServer::ARRAY_COLOR] = colors;
if (indices.size() > 0)
arr[VisualServer::ARRAY_INDEX] = indices;
if (bones.size() > 0)
arr[VisualServer::ARRAY_BONES] = bones;
if (weights.size() > 0)
arr[VisualServer::ARRAY_WEIGHTS] = weights;
return arr;
}
@ -405,12 +419,19 @@ Array MeshUtils::remove_doubles_interpolate_normals(Array arr) const {
}
arr[VisualServer::ARRAY_VERTEX] = verts;
arr[VisualServer::ARRAY_NORMAL] = normals;
arr[VisualServer::ARRAY_TEX_UV] = uvs;
arr[VisualServer::ARRAY_COLOR] = colors;
arr[VisualServer::ARRAY_INDEX] = indices;
arr[VisualServer::ARRAY_BONES] = bones;
arr[VisualServer::ARRAY_WEIGHTS] = weights;
if (normals.size() > 0)
arr[VisualServer::ARRAY_NORMAL] = normals;
if (uvs.size() > 0)
arr[VisualServer::ARRAY_TEX_UV] = uvs;
if (colors.size() > 0)
arr[VisualServer::ARRAY_COLOR] = colors;
if (indices.size() > 0)
arr[VisualServer::ARRAY_INDEX] = indices;
if (bones.size() > 0)
arr[VisualServer::ARRAY_BONES] = bones;
if (weights.size() > 0)
arr[VisualServer::ARRAY_WEIGHTS] = weights;
return arr;
}