charles.gueunet/vtk
charles.gueunet
/
vtk
mirror of https://gitlab.kitware.com/charles.gueunet/vtk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge topic '18719-vtkPlyReaderFix' 

c54f9b1e58 Fix Issue #18719: vtkPLYReader Bug For Face Textured PLYs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Mathieu Westphal <mathieu.westphal@kitware.com>
Acked-by: Dan Lipsa <dan.lipsa@kitware.com>
Merge-request: !9714
This commit is contained in:
Mathieu Westphal 2022-11-29 15:50:28 +00:00 committed by Kitware Robot
parent 08c4b0ad52 c54f9b1e58
commit f37f9e676d
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IO/PLY/Testing/CMakeLists.txt
View File

@ -1,5 +1,6 @@
vtk_module_test_data(
Data/Armadillo.ply
Data/FaceTexturedWithReusedTCoords.ply
Data/PointCloud.ply
Data/bunny.ply
Data/squareTextured.ply

4
IO/PLY/Testing/Cxx/CMakeLists.txt
View File

@ -15,4 +15,8 @@ vtk_add_test_cxx(vtkIOPLYCxxTests tests
TestPLYReaderTextureUVFaces,TestPLYReaderTextureUV.cxx squareTexturedFaces.ply
two_vtk_logos_stacked.png
)
vtk_add_test_cxx(vtkIOPLYCxxTests tests
TestPLYReaderFaceTexturedWithReusedTCoord,TestPLYReaderTextureUV.cxx FaceTexturedWithReusedTCoords.ply
vtk.png
)
vtk_test_cxx_executable(vtkIOPLYCxxTests tests)

1
IO/PLY/Testing/Data/Baseline/TestPLYReaderFaceTexturedWithReusedTCoord.png.sha512 Normal file
View File

@ -0,0 +1 @@
5e33790e9793fc4403c03e331dbb78d36b81053ff1d2df9b75203fdff5962f47b5b6a760b27698fce5eeaa0c34b2e8d685c4427a0d5a4755b9809abe5934ecef

32
IO/PLY/vtkPLYReader.cxx
View File

@ -560,27 +560,25 @@ int vtkPLYReader::RequestData(vtkInformation* vtkNotUsed(request),
else
{
size_t sameTexIndex = 0;
if (pointIds[ti].size() > 1)
double first[3];
output->GetPoint(vtkVerts[k], first);
for (; sameTexIndex < pointIds[ti].size(); ++sameTexIndex)
{
double first[3];
output->GetPoint(vtkVerts[k], first);
for (; sameTexIndex < pointIds[ti].size(); ++sameTexIndex)
double second[3];
output->GetPoint(pointIds[ti][sameTexIndex], second);
if (FuzzyEqual(first, second, this->FaceTextureTolerance))
{
double second[3];
output->GetPoint(pointIds[ti][sameTexIndex], second);
if (FuzzyEqual(first, second, this->FaceTextureTolerance))
{
break;
}
}
if (sameTexIndex == pointIds[ti].size())
{
// newly seen point for this texture coordinate
vtkIdType dp = duplicateCellPoint(output, cell, k);
texCoordsPoints->SetTuple2(dp, newTex[0], newTex[1]);
pointIds[ti].push_back(dp);
break;
}
}
if (sameTexIndex == pointIds[ti].size())
{
// newly seen point for this texture coordinate
vtkIdType dp = duplicateCellPoint(output, cell, k);
texCoordsPoints->SetTuple2(dp, newTex[0], newTex[1]);
pointIds[ti].push_back(dp);
}
// texture coordinate already seen before, use the vertex
// associated with these texture coordinates

1
Testing/Data/FaceTexturedWithReusedTCoords.ply.sha512 Normal file
View File

@ -0,0 +1 @@
d6cf1cf267ce056887444ea5325abee7957b283480471d64a0e28f88dbd9d7e8dc7559a65324b213596206b02ae3b8b33287a048a2e31f7252d0e1dc6e6e7b5b