Changeset 541 for cpp/frams

Timestamp:

07/26/16 18:52:32 (8 years ago)

Author:

oriona

Message:

Division by 0.0 for a single ellipsoid fixed [closes #42]. Sampling the same point twice fixed.

File:

• cpp/frams/model/geometry/meshbuilder.cpp (modified) (2 diffs)

cpp/frams/model/geometry/meshbuilder.cpp

@@ -594 +594 @@
 {
         GeometryUtils::getNextEllipseSegmentationPoint(d, edge.z, edge.x, area.z, area.x);
-                
+
         if ((area.z > limit.z) || (area.y > limit.y * sqrt(1.0 - (area.z*area.z) / (scale.z*scale.z))))
         {
                 GeometryUtils::getNextEllipseSegmentationPoint(d, scale.y, scale.x, edge.y, edge.x);
-                edge.z = scale.z * sqrt(1.0 - (edge.y*edge.y) / (scale.y*scale.y));
-                double denom=sqrt(edge.x*edge.x + edge.z*edge.z);
-                limit.z = denom==0 ? 99999999 : edge.z*edge.z / denom; //temporary fix FIXME http://www.framsticks.com/trac/framsticks/ticket/42
-                area = Pt3D(edge.x, edge.y, 0.0);
-                
                 if (edge.y > limit.y)
                 {
                         initializePhase(Phase(phase+1));
+                }
+
+                else
+                {
+                        edge.z = scale.z * sqrt(1.0 - (edge.y * edge.y) / (scale.y * scale.y));
+                        limit.z = edge.z * edge.z / sqrt(edge.x * edge.x + edge.z * edge.z);
+                        area = Pt3D(edge.x, edge.y, 0.0);
                 }
         }
@@ -804 +806 @@
         edge.setDensity(density);
         edge.initialize(lowerBoundary, lowerBoundary + length);
-        
+        
+        Pt3D dummy_point;
+        edge.tryGetNext(dummy_point); //increment iterator to start from the second point
+
         area.setDensity(density);
         area.initialize(lowerBoundary, lowerBoundary + width);