From 130b2f823ac8752511c5c70644203ba59b5c7988 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Sat, 15 Sep 2018 11:01:51 -0400 Subject: [PATCH] i am an idiot --- analysis/Minkowski.cpp | 2 +- analysis/decl.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/analysis/Minkowski.cpp b/analysis/Minkowski.cpp index d2ff0fec..350edfd3 100644 --- a/analysis/Minkowski.cpp +++ b/analysis/Minkowski.cpp @@ -206,7 +206,7 @@ void Minkowski::ComputeScalar(const DoubleArray Field, const double isovalue) a1 = object.EdgeAngle(e1); a2 = object.EdgeAngle(e2); a3 = object.EdgeAngle(e3); - Ji += 0.16666666666666*(a1*s1+a2*s2+a3*s3); + Ji += (a1*s1+a2*s2+a3*s3); //if (0.08333333333333*(a1*s1+a2*s2+a3*s3) < 0.f){ //double intcurv=0.08333333333333*(a1*s1+a2*s2+a3*s3); //double surfarea=sqrt(s*(s-s1)*(s-s2)*(s-s3)); diff --git a/analysis/decl.cpp b/analysis/decl.cpp index ec4200c4..a0b3f03b 100644 --- a/analysis/decl.cpp +++ b/analysis/decl.cpp @@ -385,7 +385,7 @@ double DECL::EdgeAngle(int edge) V.x = nx/length; V.y = ny/length; V.z = nz/length; dotprod = U.x*V.x + U.y*V.y + U.z*V.z; if (dotprod < 0.f){ - printf("negative dot product on face\n"); + //printf("negative dot product on face\n"); dotprod=-dotprod; V.x = -V.x; V.y = -V.y; V.z = -V.z; } @@ -423,8 +423,7 @@ double DECL::EdgeAngle(int edge) // concave angle = -angle; } - - printf("angle=%f,dot=%f (Edge=%i, twin=%i): P={%f, %f, %f}, Q={%f, %f, %f} U={%f, %f, %f}, V={%f, %f, %f}\n",angle,dotprod,edge,halfedge.twin(edge),P.x,P.y,P.z,Q.x,Q.y,Q.z,U.x,U.y,U.z,V.x,V.y,V.z); + //printf("angle=%f,dot=%f (Edge=%i, twin=%i): P={%f, %f, %f}, Q={%f, %f, %f} U={%f, %f, %f}, V={%f, %f, %f}\n",angle,dotprod,edge,halfedge.twin(edge),P.x,P.y,P.z,Q.x,Q.y,Q.z,U.x,U.y,U.z,V.x,V.y,V.z); return angle; }