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

Update curvature_fitting.h 

updated curvature local, added callback
This commit is contained in:
Paolo Cignoni 2021-10-14 23:02:13 +02:00
parent 3bb6cfc71a
commit cdd0a520a9
1 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
vcg/complex/algorithms/update/curvature_fitting.h
View File

@ -619,9 +619,8 @@ class Quadric
static void updateCurvatureLocal (MeshType & mesh, float radiusSphere) static void updateCurvatureLocal (MeshType & mesh, float radiusSphere, vcg::CallBackPos * cb = NULL)
{ {
bool verbose = false;
bool projectionPlaneCheck = true; bool projectionPlaneCheck = true;
int vertexesPerFit = 0; int vertexesPerFit = 0;
@ -631,24 +630,16 @@ class Quadric
{ {
std::vector<VertexType*> vv; std::vector<VertexType*> vv;
std::vector<VertexType*> vvtmp; std::vector<VertexType*> vvtmp;
if (cb && ((i%1024)==00)) {
(*cb)(int(100.0f * (float)i / (float)mesh.vn),"Vertices Analysis");
}
int count; int count;
if (verbose && !((count = (vi - mesh.vert.begin())) % 1000))
printf ("vertex %d of %d\n",count,mesh.vert.size());
// if (kRing != 0)
// expandRing (&*vi, kRing, 5, &vv);
// else
expandSphereLocal (mesh, &*vi, radiusSphere, 5, &vv); expandSphereLocal (mesh, &*vi, radiusSphere, 5, &vv);
assert (vv.size() >= 5); assert (vv.size() >= 5);
CoordType ppn; CoordType ppn;
// if (averageNormalMode)
// //ppn = (*vi).N();
getAverageNormal (&*vi, vv, &ppn); getAverageNormal (&*vi, vv, &ppn);
// else
// getProjPlaneNormal (&*vi, vv, &ppn);
if (projectionPlaneCheck) if (projectionPlaneCheck)
{ {
@ -659,33 +650,12 @@ class Quadric
} }
vvtmp.clear(); vvtmp.clear();
// if (montecarloMaxVertexNum)
// {
// //printf ("P: %d\n", vv.size());
// vvtmp.reserve (vv.size ());
// //printf ("TP: %d\n", vvtmp.size());
// applyMontecarlo (montecarloMaxVertexNum, vv, &vvtmp);
// //printf ("TD: %d\n", vvtmp.size());
// vv = vvtmp;
// //printf ("D: %d\n", vv.size());
// //printf ("\n");
// }
assert (vv.size() >= 5); assert (vv.size() >= 5);
std::vector<CoordType> ref; std::vector<CoordType> ref;
computeReferenceFramesLocal (&*vi, ppn, &ref); computeReferenceFramesLocal (&*vi, ppn, &ref);
/*
printf ("%lf %lf %lf - %lf %lf %lf - %lf %lf %lf\n",
ref[0][0], ref[0][1], ref[0][2],
ref[1][0], ref[1][1], ref[1][2],
ref[2][0], ref[2][1], ref[2][2]);
*/
vertexesPerFit += vv.size(); vertexesPerFit += vv.size();
//printf ("size: %d\n", vv.size());
QuadricLocal q; QuadricLocal q;
fitQuadricLocal (&*vi, ref, vv, &q); fitQuadricLocal (&*vi, ref, vv, &q);
@ -694,9 +664,7 @@ class Quadric
} }
//if (verbose) if (cb)
//printf ("average vertex num in each fit: %f, total %d, vn %d\n", ((float) vertexesPerFit) / mesh.vn, vertexesPerFit, mesh.vn);
if (verbose)
printf ("average vertex num in each fit: %f\n", ((float) vertexesPerFit) / mesh.vn); printf ("average vertex num in each fit: %f\n", ((float) vertexesPerFit) / mesh.vn);
} }