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

Now merge_mesh_array and bake_mesh_array_uv will work properly even if the supplied arrays don't have all the expected channels.

Browse Source
This commit is contained in:
Relintai 2020-04-22 12:20:33 +02:00
parent a306f8cf91
commit a34ceedf6a
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
world/voxel_chunk.cpp
View File

@ -562,6 +562,10 @@ Array VoxelChunk::merge_mesh_array(Array arr) const {
PoolColorArray colors = arr[VisualServer::ARRAY_COLOR]; PoolColorArray colors = arr[VisualServer::ARRAY_COLOR];
PoolIntArray indices = arr[VisualServer::ARRAY_INDEX]; PoolIntArray indices = arr[VisualServer::ARRAY_INDEX];
bool has_normals = normals.size() > 0;
bool has_uvs = uvs.size() > 0;
bool has_colors = colors.size() > 0;
int i = 0; int i = 0;
while (i < verts.size()) { while (i < verts.size()) {
Vector3 v = verts[i]; Vector3 v = verts[i];
@ -579,9 +583,13 @@ Array VoxelChunk::merge_mesh_array(Array arr) const {
int remk = rem - k; int remk = rem - k;
verts.remove(remk); verts.remove(remk);
normals.remove(remk);
uvs.remove(remk); if (has_normals)
colors.remove(remk); normals.remove(remk);
if (has_uvs)
uvs.remove(remk);
if (has_colors)
colors.remove(remk);
for (int j = 0; j < indices.size(); ++j) { for (int j = 0; j < indices.size(); ++j) {
int indx = indices[j]; int indx = indices[j];
@ -597,9 +605,14 @@ Array VoxelChunk::merge_mesh_array(Array arr) const {
} }
arr[VisualServer::ARRAY_VERTEX] = verts; arr[VisualServer::ARRAY_VERTEX] = verts;
arr[VisualServer::ARRAY_NORMAL] = normals;
arr[VisualServer::ARRAY_TEX_UV] = uvs; if (has_normals)
arr[VisualServer::ARRAY_COLOR] = colors; arr[VisualServer::ARRAY_NORMAL] = normals;
if (has_uvs)
arr[VisualServer::ARRAY_TEX_UV] = uvs;
if (has_colors)
arr[VisualServer::ARRAY_COLOR] = colors;
arr[VisualServer::ARRAY_INDEX] = indices; arr[VisualServer::ARRAY_INDEX] = indices;
return arr; return arr;
@ -617,6 +630,9 @@ Array VoxelChunk::bake_mesh_array_uv(Array arr, Ref<Texture> tex, const float mu
PoolVector2Array uvs = arr[VisualServer::ARRAY_TEX_UV]; PoolVector2Array uvs = arr[VisualServer::ARRAY_TEX_UV];
PoolColorArray colors = arr[VisualServer::ARRAY_COLOR]; PoolColorArray colors = arr[VisualServer::ARRAY_COLOR];
if (colors.size() < uvs.size())
colors.resize(uvs.size());
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
img->lock(); img->lock();
#endif #endif