diff --git a/src/meshlabplugins/editsegment/curvaturetensor.h b/src/meshlabplugins/editsegment/curvaturetensor.h index a33b0a946..699a5cafa 100644 --- a/src/meshlabplugins/editsegment/curvaturetensor.h +++ b/src/meshlabplugins/editsegment/curvaturetensor.h @@ -40,7 +40,7 @@ namespace vcg { *s = 0; } else { - if (abs(b)>abs(a)) { + if (fabs(b)>fabs(a)) { tao = -a/b; *s = 1.0/sqrt(1.0+tao*tao); *c = *s * tao; @@ -152,17 +152,17 @@ namespace vcg { //Mvi matrix ready for the vertex vi //calculate principal directions and curvature - Point3 Wvi; - Matrix33 Qvi; - Matrix33 QviT; - Matrix33 tempMatrix; + Point3d Wvi; + Matrix33d Qvi; + Matrix33d QviT; + Matrix33d tempMatrix; - Matrix33 A; - Point3 E1 = Point3(1,0,0); - Point3 Nvi = Point3( (double)(*vi).N()[0], (double)(*vi).N()[1], (double)(*vi).N()[2]); + Matrix33d A; + Point3d E1(1.0,0.0,0.0); + Point3d Nvi = Point3d::Construct((*vi).N()); Nvi.Normalize(); - Point3 E1nNvi = E1 - Nvi; - Point3 E1pNvi = E1 + Nvi; + Point3d E1nNvi = E1 - Nvi; + Point3d E1pNvi = E1 + Nvi; if (E1nNvi.Norm() > E1pNvi.Norm() ) Wvi = E1nNvi / E1nNvi.Norm(); else Wvi = E1pNvi / E1pNvi.Norm(); diff --git a/src/meshlabplugins/editsegment/cutting.h b/src/meshlabplugins/editsegment/cutting.h index 5b7aba790..3e2adddf6 100644 --- a/src/meshlabplugins/editsegment/cutting.h +++ b/src/meshlabplugins/editsegment/cutting.h @@ -75,7 +75,7 @@ namespace vcg { Matrix33 n_nMatrix; Point3 ViVj; Point3 Tij; - Point3 tempViVj = p->P() - q->P(); + Point3 tempViVj = p->P() - q->P(); Point3 n = Point3((double)p->N()[0], (double)p->N()[1], (double)p->N()[2]); n = n.Normalize(); n_nMatrix.ExternalProduct(n, n); diff --git a/src/meshlabplugins/editsegment/editsegment.pro b/src/meshlabplugins/editsegment/editsegment.pro index 704241979..eca524a24 100644 --- a/src/meshlabplugins/editsegment/editsegment.pro +++ b/src/meshlabplugins/editsegment/editsegment.pro @@ -1,19 +1,14 @@ TEMPLATE = lib CONFIG += plugin INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include -HEADERS = editsegment.h cutting.h curvaturetensor.h meshcutdialog.h ui_meshcutdialog.h +HEADERS = editsegment.h cutting.h curvaturetensor.h meshcutdialog.h SOURCES = editsegment.cpp ../../../../code/lib/glew/src/glew.c meshcutdialog.cpp TARGET = editsegment DESTDIR = ../../meshlab/plugins DEFINES += GLEW_STATIC QT += opengl #RESOURCES = meshlab.qrc -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} +FORMS+=meshcutdialog.ui contains(TEMPLATE,lib){ CONFIG(debug, debug|release){ unix{