lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-13 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use wedge text coordinates to support multi texturing

Browse Source
This commit is contained in:
Mike Baran 2022-01-19 15:36:07 -05:00
parent 22bdd2b7a0
commit 4ed4d97295
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/meshlabplugins/io_gltf/gltf_loader.cpp
View File

@ -405,7 +405,10 @@ void loadMeshPrimitive(
cb(progress.progress(), "Loading vertex texcoords");
res = loadAttribute(m, ivp, model, p, TEXCOORD_0, textureImg);
if (res)
{
mask |= vcg::tri::io::Mask::IOM_VERTTEXCOORD;
mask |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD;
}
progress.increment();
@ -569,6 +572,7 @@ void populateAttr(
break;
case TEXCOORD_0:
m.enable(vcg::tri::io::Mask::IOM_VERTTEXCOORD);
m.enable(vcg::tri::io::Mask::IOM_WEDGTEXCOORD);
populateVTextCoords(ivp, array, number, textID); break;
break;
case INDICES:
@ -647,18 +651,26 @@ void populateTriangles(
CMeshO::FaceIterator fi =
vcg::tri::Allocator<CMeshO>::AddFaces(m.cm, triNumber);
for (unsigned int i = 0; i < triNumber*3; i+=3, ++fi) {
fi->V(0) = ivp[triArray[i]];
fi->V(1) = ivp[triArray[i+1]];
fi->V(2) = ivp[triArray[i+2]];
for (int j = 0; j < 3; ++j) {
fi->V(j) = ivp[triArray[i+j]];
fi->WT(j).u() = fi->V(j)->T().u();
fi->WT(j).v() = fi->V(j)->T().v();
fi->WT(j).n() = fi->V(j)->T().N();
}
}
}
else {
CMeshO::FaceIterator fi =
vcg::tri::Allocator<CMeshO>::AddFaces(m.cm, ivp.size()/3);
for (unsigned int i = 0; i < ivp.size(); i+=3, ++fi) {
fi->V(0) = ivp[i];
fi->V(1) = ivp[i+1];
fi->V(2) = ivp[i+2];
for (int j = 0; j < 3; ++j) {
fi->V(j) = ivp[i+j];
fi->WT(j).u() = fi->V(j)->T().u();
fi->WT(j).v() = fi->V(j)->T().v();
fi->WT(j).n() = fi->V(j)->T().N();
}
}
}
}