makerjs 0.17.4 → 0.17.6

package/dist/browser.maker.js

@@ -39,7 +39,7 @@ and limitations under the License.
  *   author: Dan Marshall / Microsoft Corporation
  *   maintainers: Dan Marshall <danmar@microsoft.com>
  *   homepage: https://maker.js.org
- *   version: 0.17.4
+ *   version: 0.17.6
  *
  * browserify:
  *   license: MIT (http://opensource.org/licenses/MIT)
@@ -2356,7 +2356,7 @@ var MakerJs;
             var captions = [];
             function tryAddCaption(m, offset, layer) {
                 if (m.caption) {
-                    captions.push({ text: m.caption.text, anchor: MakerJs.path.clone(m.caption.anchor, offset), layer: (m.caption.anchor.layer || layer) });
+                    captions.push({ text: m.caption.text, anchor: MakerJs.path.clone(m.caption.anchor, MakerJs.point.add(m.origin, offset)), layer: (m.caption.anchor.layer || layer) });
                 }
             }
             tryAddCaption(modelContext, modelContext.origin, modelContext.layer);
@@ -4104,8 +4104,21 @@ var MakerJs;
                 //lines are both vertical, see if x are the same
                 return MakerJs.round(slopeA.line.origin[0] - slopeB.line.origin[0]) == 0;
             }
-            //lines are parallel, but not vertical, see if y-intercept is the same
-            return MakerJs.round(slopeA.yIntercept - slopeB.yIntercept, .00001) == 0;
+            //lines are parallel, but not vertical
+            //create array of slopes
+            var slopes = [slopeA, slopeB];
+            //get angle of each line
+            var angles = slopes.map(function (s) { return MakerJs.angle.toDegrees(Math.atan(s.slope)); });
+            //create an array of each line cloned
+            var lines = slopes.map(function (s) { return MakerJs.path.clone(s.line); });
+            //use the first line as the rotation origin
+            var origin = lines[0].origin;
+            //rotate each line to flat
+            lines.forEach(function (l, i) { return MakerJs.path.rotate(l, -angles[i], origin); });
+            //get average y-intercept of each line
+            var averageYs = lines.map(function (l) { return (l.origin[1] + l.end[1]) / 2; });
+            //see if y-intercept is the same
+            return MakerJs.round(averageYs[0] - averageYs[1], .00001) == 0;
         }
         measure.isSlopeEqual = isSlopeEqual;
         /**
@@ -10305,6 +10318,6 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.17.4";
+MakerJs.version = "0.17.6";
 
 },{"clone":2,"graham_scan":3,"kdbush":4}]},{},[]);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Maker.js 0.17.4
+// Type definitions for Maker.js 0.17.6
 // Project: https://github.com/Microsoft/maker.js
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

package/dist/index.js

@@ -1939,7 +1939,7 @@ var MakerJs;
             var captions = [];
             function tryAddCaption(m, offset, layer) {
                 if (m.caption) {
-                    captions.push({ text: m.caption.text, anchor: MakerJs.path.clone(m.caption.anchor, offset), layer: (m.caption.anchor.layer || layer) });
+                    captions.push({ text: m.caption.text, anchor: MakerJs.path.clone(m.caption.anchor, MakerJs.point.add(m.origin, offset)), layer: (m.caption.anchor.layer || layer) });
                 }
             }
             tryAddCaption(modelContext, modelContext.origin, modelContext.layer);
@@ -3687,8 +3687,21 @@ var MakerJs;
                 //lines are both vertical, see if x are the same
                 return MakerJs.round(slopeA.line.origin[0] - slopeB.line.origin[0]) == 0;
             }
-            //lines are parallel, but not vertical, see if y-intercept is the same
-            return MakerJs.round(slopeA.yIntercept - slopeB.yIntercept, .00001) == 0;
+            //lines are parallel, but not vertical
+            //create array of slopes
+            var slopes = [slopeA, slopeB];
+            //get angle of each line
+            var angles = slopes.map(function (s) { return MakerJs.angle.toDegrees(Math.atan(s.slope)); });
+            //create an array of each line cloned
+            var lines = slopes.map(function (s) { return MakerJs.path.clone(s.line); });
+            //use the first line as the rotation origin
+            var origin = lines[0].origin;
+            //rotate each line to flat
+            lines.forEach(function (l, i) { return MakerJs.path.rotate(l, -angles[i], origin); });
+            //get average y-intercept of each line
+            var averageYs = lines.map(function (l) { return (l.origin[1] + l.end[1]) / 2; });
+            //see if y-intercept is the same
+            return MakerJs.round(averageYs[0] - averageYs[1], .00001) == 0;
         }
         measure.isSlopeEqual = isSlopeEqual;
         /**
@@ -9888,5 +9901,5 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.17.4";
+MakerJs.version = "0.17.6";
 var Bezier = require('bezier-js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makerjs",
-  "version": "0.17.4",
+  "version": "0.17.6",
   "description": "Maker.js, a Microsoft Garage project, is a JavaScript library for creating and sharing modular line drawings for CNC and laser cutters.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",