[Amibe] Fix QEMDecimateHalfEdge metric support

AnalyticMetric.getTargetSize return the size not the square of the size.
jeromerobert · Jan 31, 2019 · d16f6b6 · d16f6b6
1 parent 915d8df
commit d16f6b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/amibe/python/remesh.py b/amibe/python/remesh.py
@@ -294,7 +294,7 @@ def __remesh(options):
     if point_metric:
         point_metric.scaling = sqrt(2)
         algo.analyticMetric = point_metric
-        algo.toleranceFactor = 0.2
+        algo.toleranceFactor = 0.3
     algo.compute()
 
     #3
@@ -394,7 +394,7 @@ def __remesh(options):
     if point_metric:
         point_metric.scaling = sqrt(2)
         algo.analyticMetric = point_metric
-        algo.toleranceFactor = 0.2
+        algo.toleranceFactor = 0.3
     algo.compute()
 
     #12

diff --git a/amibe/src/org/jcae/mesh/amibe/algos3d/QEMDecimateHalfEdge.java b/amibe/src/org/jcae/mesh/amibe/algos3d/QEMDecimateHalfEdge.java
@@ -244,7 +244,7 @@ private double scaleAreaWithTolerance(Triangle t, double area) {
 			Vertex v = t.getV0();
 			double m = analyticMetric.getTargetSize(v.getX(), v.getY(),
 				v.getZ(), t.getGroupId());
-			return area / toleranceFactor / m;
+			return area / toleranceFactor / m / m;
 		} else if(tolerance > 0)
 			return area / tolerance;
 		else