lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

some changes to the distance function

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2008-02-15 14:34:33 +00:00
parent af460a9358
commit d1167df034
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/meshlabplugins/editsegment/cutting.h
View File

@ -142,12 +142,12 @@ namespace vcg {
//k = k1 * cos^2(@) + k2 * sin^2(@); @ = angle between T1 and direction P->Q projected onto the plane N
kpq = ((*TDCurvPtr)[*p].k1 * cos) + ((*TDCurvPtr)[*p].k2 * (1 - cos));
if (kpq < 0)
kpq = powf(e,fabs(kpq)) -1;
if (kpq < 0)
//kpq = powf(e,fabs(kpq)) -1;
//kpq = powf(kpq,2);
kpq = powf(e,sqrt(fabs(kpq))) -1;
dist = (p->P() - q->P()).Norm() + (_normalWeight * (p->N() - q->N()).Norm()) + (_curvatureWeight * kpq);
assert(dist>=0.0f);
return dist;
}
@ -169,10 +169,10 @@ namespace vcg {
assert(tempV->P() != v->P());
if (tempV->IMark() == U) {
dist = ImprovedIsophoticDist(v, tempV);
if (dist < min_dist) {
if (dist <= min_dist) {
min_dist = dist;
nearestV = tempV;
}
}
}
} while(tempV != firstV);
@ -185,10 +185,10 @@ namespace vcg {
case iB: tempTriplet.m = B; break;
default : tempTriplet.m = (MarkType)v->IMark(); break;
}
Q.push(tempTriplet);
if (file) file << "Inserzione: d=" << tempTriplet.d << std::endl;
} else {
if (file) file << "Nessun Elemento Inserito" << std::endl;
}
}
@ -293,6 +293,7 @@ namespace vcg {
//Q.pop();
tempTriplet = Q.pop();
//controlla se il vertice estratto è ancora valido o se è stato già marchiato in precedenza
if (tempTriplet.v->IMark() == U) {
tempTriplet.v->IMark() = tempTriplet.m;
--vertex_to_go;
@ -524,7 +525,7 @@ namespace vcg {
for (vi = mesh->vert.begin(); vi != mesh->vert.end(); ++vi) {
vi->IMark() = U;
vi->C() = Color4b::White;
vi->C() = Color4b::LightGray;
vi->Q() = 0.0f;
}

2
src/meshlabplugins/editsegment/editsegment.cpp
View File

@ -389,7 +389,7 @@ void EditSegment::Decorate(QAction * ac, MeshModel & m, GLArea * gla) {
} else if (mouse_button_pressed==Qt::MidButton) {
meshCut->Mark(*vi, U);
(*vi)->C()
= toVcgColor(Qt::white);
= toVcgColor(Qt::lightGray);
}
}