Add pointMatchingDistance parameter to bezier seed functions

Author: danmarshall

packages/maker.js/src/core/chain.ts

@@ -235,7 +235,7 @@
         var beziers: IWalkModel[];
         if (opts.unifyBeziers) {
             beziers = getBezierModels(modelContext);
-            swapBezierPathsWithSeeds(beziers, true);
+            swapBezierPathsWithSeeds(beziers, true, opts.pointMatchingDistance);
         }
 
         walk(modelContext, walkOptions);
@@ -280,7 +280,7 @@
         }
 
         if (beziers) {
-            swapBezierPathsWithSeeds(beziers, false);
+            swapBezierPathsWithSeeds(beziers, false, opts.pointMatchingDistance);
         }
 
         if (opts.byLayers) {
@@ -398,7 +398,7 @@
     /**
      * @private
      */
-    function swapBezierPathsWithSeeds(beziers: IWalkModel[], swap: boolean) {
+    function swapBezierPathsWithSeeds(beziers: IWalkModel[], swap: boolean, pointMatchingDistance: number) {
         const tempKey = 'tempPaths';
         const tempLayerKey = 'tempLayer';
 
@@ -414,7 +414,7 @@
                 }
 
                 //use seeds as path, hide the arc paths from findChains()
-                var bezierPartsByLayer = models.BezierCurve.getBezierSeeds(b, { byLayers: true });
+                var bezierPartsByLayer = models.BezierCurve.getBezierSeeds(b, { byLayers: true, pointMatchingDistance });
 
                 for (var layer in bezierPartsByLayer) {
                     var bezierSeeds = bezierPartsByLayer[layer];
@@ -436,15 +436,15 @@
                 //revert the above
 
                 if (tempKey in b) {
-                    b.paths = b[tempKey];
+                    b.paths = b[tempKey] as IPathMap;
                     delete b[tempKey];
                 }
 
                 if (tempLayerKey in b) {
                     if (b[tempLayerKey] == undefined) {
                         delete (b as IModel).layer;
                     } else {
-                        (b as IModel).layer = b[tempLayerKey];
+                        (b as IModel).layer = b[tempLayerKey] as string;
                     }
                     delete b[tempLayerKey];
                 }

packages/maker.js/src/core/model.ts

@@ -475,7 +475,7 @@ namespace MakerJs.model {
 
         if (modelToDistort.type === models.BezierCurve.typeName) {
             const b = modelToDistort as models.BezierCurve;
-            const bezierPartsByLayer = models.BezierCurve.getBezierSeeds(b, { byLayers: true });
+            const bezierPartsByLayer = models.BezierCurve.getBezierSeeds(b, { byLayers: true, pointMatchingDistance: bezierAccuracy });
             for (let layer in bezierPartsByLayer) {
                 let pathArray = bezierPartsByLayer[layer]
                 pathArray.forEach((p, i) => {

packages/maker.js/src/models/BezierCurve.ts

@@ -245,7 +245,7 @@
     /**
      * @private
      */
-    function getActualBezierRange(curve: BezierCurve, arc: IPathArcInBezierCurve, endpoints: IPoint[], offset: IPoint): IBezierRange {
+    function getActualBezierRange(curve: BezierCurve, arc: IPathArcInBezierCurve, endpoints: IPoint[], offset: IPoint, pointMatchingDistance: number): IBezierRange {
         var b = getScratch(curve.seed);
         var tPoints = [arc.bezierData.startT, arc.bezierData.endT].map(t => new TPoint(b, t, offset));
         var ends = endpoints.slice();
@@ -255,7 +255,7 @@
         if (endpointDistancetoStart[0] > endpointDistancetoStart[1]) ends.reverse();
 
         for (var i = 2; i--;) {
-            if (!measure.isPointEqual(ends[i], tPoints[i].point)) {
+            if (!measure.isPointEqual(ends[i], tPoints[i].point, pointMatchingDistance)) {
                 return null;
             }
         }
@@ -273,15 +273,15 @@
     /**
      * @private
      */
-    function getChainBezierRange(curve: BezierCurve, c: IChain, layer: string, addToLayer: IAddToLayer): IBezierRange {
+    function getChainBezierRange(curve: BezierCurve, c: IChain, layer: string, addToLayer: IAddToLayer, pointMatchingDistance: number): IBezierRange {
 
         var endLinks = [c.links[0], c.links[c.links.length - 1]];
         if ((endLinks[0].walkedPath.pathContext as IPathArcInBezierCurve).bezierData.startT > (endLinks[1].walkedPath.pathContext as IPathArcInBezierCurve).bezierData.startT) {
             chain.reverse(c);
             endLinks.reverse();
         }
 
-        var actualBezierRanges = endLinks.map(endLink => getActualBezierRange(curve, endLink.walkedPath.pathContext as IPathArcInBezierCurve, endLink.endPoints, endLink.walkedPath.offset));
+        var actualBezierRanges = endLinks.map(endLink => getActualBezierRange(curve, endLink.walkedPath.pathContext as IPathArcInBezierCurve, endLink.endPoints, endLink.walkedPath.offset, pointMatchingDistance));
 
         var result: IBezierRange = {
             startT: actualBezierRanges[0] ? actualBezierRanges[0].startT : null,
@@ -523,7 +523,7 @@
             model.findChains(curve, function (chains: IChain[], loose: IWalkPath[], layer: string) {
 
                 chains.forEach(c => {
-                    var range = getChainBezierRange(curve, c, layer, addToLayer);
+                    var range = getChainBezierRange(curve, c, layer, addToLayer, options.pointMatchingDistance);
                     if (range) {
                         var b = getScratch(curve.seed);
                         var piece = b.split(range.startT, range.endT);
@@ -538,7 +538,7 @@
                         //bezier is linear
                         return addToLayer(wp.pathContext, layer, true);
                     }
-                    var range = getActualBezierRange(curve, wp.pathContext as IPathArcInBezierCurve, point.fromPathEnds(wp.pathContext), wp.offset);
+                    var range = getActualBezierRange(curve, wp.pathContext as IPathArcInBezierCurve, point.fromPathEnds(wp.pathContext), wp.offset, options.pointMatchingDistance);
                     if (range) {
                         var b = getScratch(curve.seed);
                         var piece = b.split(range.startT, range.endT);