manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minimal refactoring of mesh intersection

This commit is contained in:
Paolo Cignoni 2017-04-05 07:40:17 +02:00
parent 95d88a7af9
commit d4293c7d78
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vcg/complex/algorithms/intersection.h
View File

@ -138,8 +138,8 @@ bool IntersectionPlaneMeshOld(TriMeshType & m,
*/ */
template < typename TriMeshType, typename EdgeMeshType, class ScalarType > template < typename TriMeshType, typename EdgeMeshType, class ScalarType >
bool IntersectionPlaneMesh(TriMeshType & m, bool IntersectionPlaneMesh(TriMeshType & m,
Plane3<ScalarType> pl, Plane3<ScalarType> pl,
EdgeMeshType & em) EdgeMeshType & em)
{ {
std::vector<Point3<ScalarType> > ptVec; std::vector<Point3<ScalarType> > ptVec;
std::vector<Point3<ScalarType> > nmVec; std::vector<Point3<ScalarType> > nmVec;
@ -147,9 +147,8 @@ bool IntersectionPlaneMesh(TriMeshType & m,
typename TriMeshType::template PerVertexAttributeHandle < ScalarType > qH = typename TriMeshType::template PerVertexAttributeHandle < ScalarType > qH =
tri::Allocator<TriMeshType> :: template AddPerVertexAttribute < ScalarType >(m,"TemporaryPlaneDistance"); tri::Allocator<TriMeshType> :: template AddPerVertexAttribute < ScalarType >(m,"TemporaryPlaneDistance");
typename TriMeshType::VertexIterator vi; for(auto vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD())
for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) qH[vi] = SignedDistancePlanePoint(pl,(*vi).cP());
qH[vi] =SignedDistancePlanePoint(pl,(*vi).cP());
for(size_t i=0;i<m.face.size();i++) for(size_t i=0;i<m.face.size();i++)
if(!m.face[i].IsD()) if(!m.face[i].IsD())
@ -174,11 +173,11 @@ bool IntersectionPlaneMesh(TriMeshType & m,
Point3<ScalarType> nn =(n0*fabs(q1) + n1*fabs(q0))/fabs(q0-q1); Point3<ScalarType> nn =(n0*fabs(q1) + n1*fabs(q0))/fabs(q0-q1);
nmVec.push_back(nn); nmVec.push_back(nn);
} }
if (qH[m.face[i].V(j)] == 0) if (qH[m.face[i].V(j)] == 0)
{ {
ptVec.push_back(m.face[i].V(j)->cP()); ptVec.push_back(m.face[i].V(j)->cP());
nmVec.push_back(m.face[i].V(j)->cN()); nmVec.push_back(m.face[i].V(j)->cN());
} }
} }
if(ptVec.size()>=2) if(ptVec.size()>=2)
{ {