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

refactored a bit the code and cleaned some commented function

This commit is contained in:
nico 2017-02-24 18:21:21 +01:00
parent ec20f3307e
commit 73a89349da
1 changed files with 235 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

325
vcg/complex/algorithms/polygonal_algorithms.h
View File

@ -75,74 +75,46 @@ class PolygonalAlgorithm
typedef typename PolyMeshType::VertexType VertexType; typedef typename PolyMeshType::VertexType VertexType;
typedef typename PolyMeshType::CoordType CoordType; typedef typename PolyMeshType::CoordType CoordType;
typedef typename PolyMeshType::ScalarType ScalarType; typedef typename PolyMeshType::ScalarType ScalarType;
typedef typename vcg::face::Pos<FaceType> PosType;
public:
static bool CollapseBorderSmallEdgesStep(PolyMeshType &poly_m, static bool CollapseEdges(PolyMeshType &poly_m,
const ScalarType edge_limit) const std::vector<PosType> &CollapsePos,
const std::vector<CoordType> &InterpPos)
{ {
bool collapsed=false;
//update topology
vcg::tri::UpdateTopology<PolyMeshType>::FaceFace(poly_m);
//update border vertices
//UpdateBorderVertexFromPFFAdj(poly_m);
vcg::tri::UpdateFlags<PolyMeshType>::VertexBorderFromFaceAdj(poly_m);
//get border edges
std::vector<std::vector<bool> > IsBorder;
//BorderEdgeFromPFFAdj(poly_m,IsBorder);
vcg::tri::UpdateFlags<PolyMeshType>::VertexBorderFromFaceAdj(poly_m);
//deselect all vertices
vcg::tri::UpdateFlags<PolyMeshType>::VertexClearS(poly_m);
//this set how to remap the vertices after deletion //this set how to remap the vertices after deletion
std::map<VertexType*,VertexType*> VertexRemap; std::map<VertexType*,VertexType*> VertexRemap;
vcg::tri::UpdateFlags<PolyMeshType>::VertexClearS(poly_m);
bool collapsed=false;
//go over all faces and check the ones needed to be deleted //go over all faces and check the ones needed to be deleted
for (size_t i=0;i<poly_m.face.size();i++) for (size_t i=0;i<CollapsePos.size();i++)
{ {
int NumV=poly_m.face[i].VN(); FaceType *currF=CollapsePos[i].F();
for (size_t j=0;j<NumV;j++) int IndexE=CollapsePos[i].E();
{ size_t NumV=currF->VN();
VertexType *v0=poly_m.face[i].V(j); VertexType *v0=currF->V(IndexE);
VertexType *v1=poly_m.face[i].V((j+1)%NumV); VertexType *v1=currF->V((IndexE+1)%NumV);
assert(v0!=v1);
bool IsBV0=v0->IsB(); //safety check
bool IsBV1=v1->IsB(); assert(v0!=v1);
//in these cases is not possible to collapse if (v0->IsS())continue;
if ((!IsBV0)&&(!IsBV1))continue; if (v1->IsS())continue;
if ((!IsBorder[i][j])&&(IsBV0)&&(IsBV1))continue;
if (v0->IsS())continue;
if (v1->IsS())continue;
assert((IsBV0)||(IsBV1)); //put on the same position
CoordType pos0=v0->P(); v0->P()=InterpPos[i];
CoordType pos1=v1->P(); v1->P()=InterpPos[i];
ScalarType currL=(pos0-pos1).Norm();
if (currL>edge_limit)continue;
//then collapse the point //select the the two vertices
CoordType InterpPos; v0->SetS();
if ((IsBV0)&&(!IsBV1))InterpPos=pos0; v1->SetS();
if ((!IsBV0)&&(IsBV1))InterpPos=pos1;
if ((IsBV0)&&(IsBV1))InterpPos=(pos0+pos1)/2.0;
//put on the same position //set the remap
v0->P()=InterpPos; VertexRemap[v1]=v0;
v1->P()=InterpPos;
//select the the two vertices collapsed=true;
v0->SetS();
v1->SetS();
//set the remap
VertexRemap[v1]=v0;
collapsed=true;
}
} }
//then remap vertices //then remap vertices
@ -186,8 +158,181 @@ class PolygonalAlgorithm
poly_m.face[i].V(j)=FaceV[j]; poly_m.face[i].V(j)=FaceV[j];
} }
//remove unreferenced vertices
vcg::tri::Clean<PolyMeshType>::RemoveUnreferencedVertex(poly_m);
//and compact them
vcg::tri::Allocator<PolyMeshType>::CompactEveryVector(poly_m);
return collapsed; return collapsed;
} }
private:
// static bool CollapseBorderSmallEdgesStep(PolyMeshType &poly_m,
// const ScalarType edge_limit)
// {
// bool collapsed=false;
// //update topology
// vcg::tri::UpdateTopology<PolyMeshType>::FaceFace(poly_m);
// //update border vertices
// //UpdateBorderVertexFromPFFAdj(poly_m);
// vcg::tri::UpdateFlags<PolyMeshType>::VertexBorderFromFaceAdj(poly_m);
// //get border edges
// std::vector<std::vector<bool> > IsBorder;
// //BorderEdgeFromPFFAdj(poly_m,IsBorder);
// vcg::tri::UpdateFlags<PolyMeshType>::VertexBorderFromFaceAdj(poly_m);
// //deselect all vertices
// vcg::tri::UpdateFlags<PolyMeshType>::VertexClearS(poly_m);
// //this set how to remap the vertices after deletion
// std::map<VertexType*,VertexType*> VertexRemap;
// //go over all faces and check the ones needed to be deleted
// for (size_t i=0;i<poly_m.face.size();i++)
// {
// int NumV=poly_m.face[i].VN();
// for (size_t j=0;j<NumV;j++)
// {
// VertexType *v0=poly_m.face[i].V(j);
// VertexType *v1=poly_m.face[i].V((j+1)%NumV);
// assert(v0!=v1);
// bool IsBV0=v0->IsB();
// bool IsBV1=v1->IsB();
// //in these cases is not possible to collapse
// if ((!IsBV0)&&(!IsBV1))continue;
// //if ((!IsBorder[i][j])&&(IsBV0)&&(IsBV1))continue;
// bool IsBorderE=poly_m.face[i].FFp(j);
// if ((IsBorderE)&&(IsBV0)&&(IsBV1))continue;
// if (v0->IsS())continue;
// if (v1->IsS())continue;
// assert((IsBV0)||(IsBV1));
// CoordType pos0=v0->P();
// CoordType pos1=v1->P();
// ScalarType currL=(pos0-pos1).Norm();
// if (currL>edge_limit)continue;
// //then collapse the point
// CoordType InterpPos;
// if ((IsBV0)&&(!IsBV1))InterpPos=pos0;
// if ((!IsBV0)&&(IsBV1))InterpPos=pos1;
// if ((IsBV0)&&(IsBV1))InterpPos=(pos0+pos1)/2.0;
// //put on the same position
// v0->P()=InterpPos;
// v1->P()=InterpPos;
// //select the the two vertices
// v0->SetS();
// v1->SetS();
// //set the remap
// VertexRemap[v1]=v0;
// collapsed=true;
// }
// }
// //then remap vertices
// for (size_t i=0;i<poly_m.face.size();i++)
// {
// int NumV=poly_m.face[i].VN();
// for (int j=0;j<NumV;j++)
// {
// //get the two vertices of the edge
// VertexType *v0=poly_m.face[i].V(j);
// //see if it must substituted or not
// if (VertexRemap.count(v0)==0)continue;
// //in that case remap to the new one
// VertexType *newV=VertexRemap[v0];
// //assign new vertex
// poly_m.face[i].V(j)=newV;
// }
// }
// //then re-elaborate the face
// for (size_t i=0;i<poly_m.face.size();i++)
// {
// //get vertices of the face
// int NumV=poly_m.face[i].VN();
// std::vector<VertexType*> FaceV;
// for (int j=0;j<NumV;j++)
// {
// VertexType *v0=poly_m.face[i].V(j);
// VertexType *v1=poly_m.face[i].V((j+1)%NumV);
// if(v0==v1)continue;
// FaceV.push_back(v0);
// }
// //then deallocate face
// if ((int)FaceV.size()==NumV)continue;
// //otherwise deallocate and set new vertices
// poly_m.face[i].Dealloc();
// poly_m.face[i].Alloc(FaceV.size());
// for (size_t j=0;j<FaceV.size();j++)
// poly_m.face[i].V(j)=FaceV[j];
// }
// return collapsed;
// }
static bool CollapseBorderSmallEdgesStep(PolyMeshType &poly_m,
const ScalarType edge_limit)
{
bool collapsed=false;
//update topology
vcg::tri::UpdateTopology<PolyMeshType>::FaceFace(poly_m);
//update border vertices
vcg::tri::UpdateFlags<PolyMeshType>::VertexBorderFromFaceAdj(poly_m);
std::vector<PosType> CollapsePos;
std::vector<CoordType> InterpPos;
//go over all faces and check the ones needed to be deleted
for (size_t i=0;i<poly_m.face.size();i++)
{
int NumV=poly_m.face[i].VN();
for (size_t j=0;j<NumV;j++)
{
VertexType *v0=poly_m.face[i].V(j);
VertexType *v1=poly_m.face[i].V((j+1)%NumV);
assert(v0!=v1);
bool IsBV0=v0->IsB();
bool IsBV1=v1->IsB();
//in these cases is not possible to collapse
if ((!IsBV0)&&(!IsBV1))continue;
bool IsBorderE=poly_m.face[i].FFp(j);
if ((IsBorderE)&&(IsBV0)&&(IsBV1))continue;
assert((IsBV0)||(IsBV1));
CoordType pos0=v0->P();
CoordType pos1=v1->P();
ScalarType currL=(pos0-pos1).Norm();
if (currL>edge_limit)continue;
//then collapse the point
CoordType CurrInterpPos;
if ((IsBV0)&&(!IsBV1))CurrInterpPos=pos0;
if ((!IsBV0)&&(IsBV1))CurrInterpPos=pos1;
if ((IsBV0)&&(IsBV1))CurrInterpPos=(pos0+pos1)/2.0;
CollapsePos.push_back(PosType(&poly_m.face[i],j));
InterpPos.push_back(CurrInterpPos);
}
}
return CollapseEdges(poly_m,CollapsePos,InterpPos);
}
static void LaplacianPos(PolyMeshType &poly_m,std::vector<CoordType> &AvVert) static void LaplacianPos(PolyMeshType &poly_m,std::vector<CoordType> &AvVert)
{ {
@ -266,45 +411,45 @@ public:
UpdateNormalByFitting(poly_m.face[i]); UpdateNormalByFitting(poly_m.face[i]);
} }
// ///METTERE SOTTO TOPOLOGY? // ///METTERE SOTTO TOPOLOGY?
// static void BorderEdgeFromPFFAdj(FaceType &F,std::vector<bool> &IsBorder) // static void BorderEdgeFromPFFAdj(FaceType &F,std::vector<bool> &IsBorder)
// { // {
// IsBorder.resize(F.VN(),false); // IsBorder.resize(F.VN(),false);
// for (int j=0;j<F.VN();j++) // for (int j=0;j<F.VN();j++)
// IsBorder[j]=(F.FFp(j)==&F); // IsBorder[j]=(F.FFp(j)==&F);
// } // }
// static void BorderEdgeFromPFFAdj(PolyMeshType &poly_m, // static void BorderEdgeFromPFFAdj(PolyMeshType &poly_m,
// std::vector<std::vector<bool> > &IsBorder) // std::vector<std::vector<bool> > &IsBorder)
// { // {
// IsBorder.resize(poly_m.face.size()); // IsBorder.resize(poly_m.face.size());
// for (size_t i=0;i<poly_m.face.size();i++) // for (size_t i=0;i<poly_m.face.size();i++)
// { // {
// if (poly_m.face[i].IsD())continue; // if (poly_m.face[i].IsD())continue;
// BorderEdgeFromPFFAdj(poly_m.face[i],IsBorder[i]); // BorderEdgeFromPFFAdj(poly_m.face[i],IsBorder[i]);
// } // }
// } // }
// static void UpdateBorderVertexFromPFFAdj(PolyMeshType &poly_m) // static void UpdateBorderVertexFromPFFAdj(PolyMeshType &poly_m)
// { // {
// //get per edge border flag // //get per edge border flag
// std::vector<std::vector<bool> > IsBorderE; // std::vector<std::vector<bool> > IsBorderE;
// BorderEdgeFromPFFAdj(poly_m,IsBorderE); // BorderEdgeFromPFFAdj(poly_m,IsBorderE);
// //then update per vertex // //then update per vertex
// vcg::tri::UpdateFlags<PolyMeshType>::VertexClearB(poly_m); // vcg::tri::UpdateFlags<PolyMeshType>::VertexClearB(poly_m);
// for (size_t i=0;i<poly_m.face.size();i++) // for (size_t i=0;i<poly_m.face.size();i++)
// { // {
// if (poly_m.face[i].IsD())continue; // if (poly_m.face[i].IsD())continue;
// for (int j=0;j<poly_m.face[i].VN();j++) // for (int j=0;j<poly_m.face[i].VN();j++)
// { // {
// if (!IsBorderE[i][j])continue; // if (!IsBorderE[i][j])continue;
// poly_m.face[i].V0(j)->SetB(); // poly_m.face[i].V0(j)->SetB();
// poly_m.face[i].V1(j)->SetB(); // poly_m.face[i].V1(j)->SetB();
// } // }
// } // }
// } // }
enum PolyQualityType{QAngle,QPlanar,QTemplate}; enum PolyQualityType{QAngle,QPlanar,QTemplate};