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

fixed compile issues on win

This commit is contained in:
Luigi Malomo 2017-09-21 12:19:08 +02:00
parent ef0be79493
commit e7add6c9b0
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vcg/complex/algorithms/curve_on_manifold.h
View File

@ -182,7 +182,8 @@ public:
tri::UpdateFlags<MeshType>::FaceSetF(base); tri::UpdateFlags<MeshType>::FaceSetF(base);
tri::UpdateTopology<MeshType>::VertexFace(base); tri::UpdateTopology<MeshType>::VertexFace(base);
tri::UpdateTopology<MeshType>::FaceFace(base); tri::UpdateTopology<MeshType>::FaceFace(base);
bool ret = true;
for(EdgeIterator ei=poly.edge.begin(); ei!=poly.edge.end();++ei) for(EdgeIterator ei=poly.edge.begin(); ei!=poly.edge.end();++ei)
{ {
CoordType ip0,ip1; CoordType ip0,ip1;
@ -196,21 +197,19 @@ public:
assert(v1>0 && v0>0 && v0!=v1); assert(v1>0 && v0>0 && v0!=v1);
FacePointer ff0,ff1; FacePointer ff0,ff1;
int e0,e1; int e0,e1;
bool ret=face::FindSharedFaces<FaceType>(v0,v1,ff0,ff1,e0,e1); ret &= face::FindSharedFaces<FaceType>(v0,v1,ff0,ff1,e0,e1);
if(ret){ if(ret) {
assert(ret);
assert(ff0->V(e0)==v0 || ff0->V(e0)==v1); assert(ff0->V(e0)==v0 || ff0->V(e0)==v1);
ff0->ClearF(e0); ff0->ClearF(e0);
ff1->ClearF(e1); ff1->ClearF(e1);
}
else {
} }
} }
else { else
{
assert(0); assert(0);
} }
} }
return ret;
} }
ScalarType MinDistOnEdge(CoordType samplePnt, EdgeGrid &edgeGrid, MeshType &poly, CoordType &closestPoint) ScalarType MinDistOnEdge(CoordType samplePnt, EdgeGrid &edgeGrid, MeshType &poly, CoordType &closestPoint)
@ -595,7 +594,7 @@ public:
printf("SimplifyMidFace %5i -> %5i %i mid %i ve \n",startVn,poly.vn,midFaceCollapseCnt,vertexEdgeCollapseCnt); printf("SimplifyMidFace %5i -> %5i %i mid %i ve \n",startVn,poly.vn,midFaceCollapseCnt,vertexEdgeCollapseCnt);
} }
void Simplify( MeshType &poly) void Simplify(MeshType &poly)
{ {
int startEn = poly.en; int startEn = poly.en;
Distribution<ScalarType> hist; Distribution<ScalarType> hist;
@ -608,8 +607,8 @@ public:
{ {
std::vector<VertexPointer> starVecVp; std::vector<VertexPointer> starVecVp;
edge::VVStarVE(&(poly.vert[i]),starVecVp); edge::VVStarVE(&(poly.vert[i]),starVecVp);
if( (starVecVp.size()==2) && (!poly.vert[i].IsS())) if ((starVecVp.size()==2) && (!poly.vert[i].IsS()))
{ {
ScalarType newSegLen = Distance(starVecVp[0]->P(), starVecVp[1]->P()); ScalarType newSegLen = Distance(starVecVp[0]->P(), starVecVp[1]->P());
Segment3Type seg(starVecVp[0]->P(),starVecVp[1]->P()); Segment3Type seg(starVecVp[0]->P(),starVecVp[1]->P());
ScalarType segDist; ScalarType segDist;

2
vcg/complex/algorithms/stat.h
View File

@ -296,7 +296,7 @@ public:
{ {
if(!(*ei).IsD()) if(!(*ei).IsD())
{ {
h.Add(Distance<float>((*ei).V(0)->P(),(*ei).V(1)->P())); h.Add(Distance<ScalarType>((*ei).V(0)->P(),(*ei).V(1)->P()));
} }
} }
} }