From 70a141db69ed9de490f5391a5085e19ac8f64f4b Mon Sep 17 00:00:00 2001 From: Luigi Malomo Date: Mon, 7 May 2018 20:24:39 +0200 Subject: [PATCH] indent and spelling fix --- vcg/complex/algorithms/curve_on_manifold.h | 79 +++++++++++----------- vcg/complex/algorithms/point_sampling.h | 2 +- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h index 1789b841..1bc35938 100644 --- a/vcg/complex/algorithms/curve_on_manifold.h +++ b/vcg/complex/algorithms/curve_on_manifold.h @@ -184,47 +184,50 @@ public: * */ - bool TagFaceEdgeSelWithPolyLine(MeshType &poly,bool markFlag=true) - { - if(markFlag) tri::UpdateFlags::FaceClearFaceEdgeS(base); - tri::UpdateTopology::VertexFace(base); - tri::UpdateTopology::FaceFace(base); - - for(EdgeIterator ei=poly.edge.begin(); ei!=poly.edge.end();++ei) - { - CoordType ip0,ip1; - FaceType *f0 = GetClosestFaceIP(ei->cP(0),ip0); - FaceType *f1 = GetClosestFaceIP(ei->cP(1),ip1); - - if(BarycentricSnap(ip0) && BarycentricSnap(ip1)) - { - VertexPointer v0 = FindVertexSnap(f0,ip0); - VertexPointer v1 = FindVertexSnap(f1,ip1); +bool TagFaceEdgeSelWithPolyLine(MeshType &poly,bool markFlag=true) +{ + if (markFlag) + tri::UpdateFlags::FaceClearFaceEdgeS(base); - if(v0==0 || v1==0) return false; - if(v0==v1) return false; + tri::UpdateTopology::VertexFace(base); + tri::UpdateTopology::FaceFace(base); - FacePointer ff0,ff1; - int e0,e1; - bool ret=face::FindSharedFaces(v0,v1,ff0,ff1,e0,e1); - if(ret){ - assert(ret); - assert(ff0->V(e0)==v0 || ff0->V(e0)==v1); - ff0->SetFaceEdgeS(e0); - ff1->SetFaceEdgeS(e1); - } - else { - return false; - } - } - else { - return false; - } - } - return true; - } + for(EdgeIterator ei=poly.edge.begin(); ei!=poly.edge.end();++ei) + { + CoordType ip0,ip1; + FaceType *f0 = GetClosestFaceIP(ei->cP(0),ip0); + FaceType *f1 = GetClosestFaceIP(ei->cP(1),ip1); + + if(BarycentricSnap(ip0) && BarycentricSnap(ip1)) + { + VertexPointer v0 = FindVertexSnap(f0,ip0); + VertexPointer v1 = FindVertexSnap(f1,ip1); + + if(v0==0 || v1==0) + return false; + if(v0==v1) + return false; + + FacePointer ff0,ff1; + int e0,e1; + bool ret=face::FindSharedFaces(v0,v1,ff0,ff1,e0,e1); + if(ret) + { + assert(ret); + assert(ff0->V(e0)==v0 || ff0->V(e0)==v1); + ff0->SetFaceEdgeS(e0); + ff1->SetFaceEdgeS(e1); + } else { + return false; + } + } + else { + return false; + } + } + return true; +} - ScalarType MinDistOnEdge(CoordType samplePnt, EdgeGrid &edgeGrid, MeshType &poly, CoordType &closestPoint) { ScalarType polyDist; diff --git a/vcg/complex/algorithms/point_sampling.h b/vcg/complex/algorithms/point_sampling.h index a0712c9e..6d610c5d 100644 --- a/vcg/complex/algorithms/point_sampling.h +++ b/vcg/complex/algorithms/point_sampling.h @@ -759,7 +759,7 @@ static void VertexUniform(MeshType & m, VertexSampler &ps, int sampleNum) /// /// It assumes that the mesh is 1-manifold. /// each connected component is sampled in a independent way. -/// For each component of lenght we place on it floor(L/radius)+1 samples. +/// For each component of length we place on it floor(L/radius)+1 samples. /// (if conservative argument is false we place ceil(L/radius)+1 samples) /// static void EdgeMeshUniform(MeshType &m, VertexSampler &ps, float radius, bool conservative = true)