makerjs 0.18.0 → 0.18.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser.maker.js +8 -7
- package/dist/index.d.ts +1 -1
- package/dist/index.js +7 -6
- package/package.json +1 -1
package/dist/browser.maker.js
CHANGED
|
@@ -39,7 +39,7 @@ and limitations under the License.
|
|
|
39
39
|
* author: Dan Marshall / Microsoft Corporation
|
|
40
40
|
* maintainers: Dan Marshall <danmar@microsoft.com>
|
|
41
41
|
* homepage: https://maker.js.org
|
|
42
|
-
* version: 0.18.
|
|
42
|
+
* version: 0.18.1
|
|
43
43
|
*
|
|
44
44
|
* browserify:
|
|
45
45
|
* license: MIT (http://opensource.org/licenses/MIT)
|
|
@@ -2009,6 +2009,7 @@ var MakerJs;
|
|
|
2009
2009
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
2010
2010
|
args[_i] = arguments[_i];
|
|
2011
2011
|
}
|
|
2012
|
+
var _a, _b;
|
|
2012
2013
|
function getSpan(origin) {
|
|
2013
2014
|
var startAngle = MakerJs.angle.ofPointInDegrees(origin, args[clockwise ? 1 : 0]);
|
|
2014
2015
|
var endAngle = MakerJs.angle.ofPointInDegrees(origin, args[clockwise ? 0 : 1]);
|
|
@@ -2039,10 +2040,10 @@ var MakerJs;
|
|
|
2039
2040
|
}
|
|
2040
2041
|
else {
|
|
2041
2042
|
//find the 2 potential origins
|
|
2042
|
-
var
|
|
2043
|
+
var intersectionPoints = (_b = (_a = MakerJs.path.intersection(new Circle(pointA, this.radius), new Circle(pointB, this.radius))) === null || _a === void 0 ? void 0 : _a.intersectionPoints) !== null && _b !== void 0 ? _b : [pointA, pointB];
|
|
2043
2044
|
var spans = [];
|
|
2044
|
-
for (var i =
|
|
2045
|
-
span = getSpan(
|
|
2045
|
+
for (var i = intersectionPoints.length; i--;) {
|
|
2046
|
+
span = getSpan(intersectionPoints[i]);
|
|
2046
2047
|
//insert sorted by size ascending
|
|
2047
2048
|
if (spans.length == 0 || span.size > spans[0].size) {
|
|
2048
2049
|
spans.push(span);
|
|
@@ -2069,8 +2070,8 @@ var MakerJs;
|
|
|
2069
2070
|
//from 3 points
|
|
2070
2071
|
Circle.apply(this, args);
|
|
2071
2072
|
var angles = [];
|
|
2072
|
-
for (var
|
|
2073
|
-
angles.push(MakerJs.angle.ofPointInDegrees(this.origin, args[
|
|
2073
|
+
for (var i_1 = 0; i_1 < 3; i_1++) {
|
|
2074
|
+
angles.push(MakerJs.angle.ofPointInDegrees(this.origin, args[i_1]));
|
|
2074
2075
|
}
|
|
2075
2076
|
this.startAngle = angles[0];
|
|
2076
2077
|
this.endAngle = angles[2];
|
|
@@ -10302,6 +10303,6 @@ var MakerJs;
|
|
|
10302
10303
|
];
|
|
10303
10304
|
})(models = MakerJs.models || (MakerJs.models = {}));
|
|
10304
10305
|
})(MakerJs || (MakerJs = {}));
|
|
10305
|
-
MakerJs.version = "0.18.
|
|
10306
|
+
MakerJs.version = "0.18.1";
|
|
10306
10307
|
|
|
10307
10308
|
},{"clone":2,"graham_scan":3,"kdbush":4}]},{},[]);
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -1592,6 +1592,7 @@ var MakerJs;
|
|
|
1592
1592
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
1593
1593
|
args[_i] = arguments[_i];
|
|
1594
1594
|
}
|
|
1595
|
+
var _a, _b;
|
|
1595
1596
|
function getSpan(origin) {
|
|
1596
1597
|
var startAngle = MakerJs.angle.ofPointInDegrees(origin, args[clockwise ? 1 : 0]);
|
|
1597
1598
|
var endAngle = MakerJs.angle.ofPointInDegrees(origin, args[clockwise ? 0 : 1]);
|
|
@@ -1622,10 +1623,10 @@ var MakerJs;
|
|
|
1622
1623
|
}
|
|
1623
1624
|
else {
|
|
1624
1625
|
//find the 2 potential origins
|
|
1625
|
-
var
|
|
1626
|
+
var intersectionPoints = (_b = (_a = MakerJs.path.intersection(new Circle(pointA, this.radius), new Circle(pointB, this.radius))) === null || _a === void 0 ? void 0 : _a.intersectionPoints) !== null && _b !== void 0 ? _b : [pointA, pointB];
|
|
1626
1627
|
var spans = [];
|
|
1627
|
-
for (var i =
|
|
1628
|
-
span = getSpan(
|
|
1628
|
+
for (var i = intersectionPoints.length; i--;) {
|
|
1629
|
+
span = getSpan(intersectionPoints[i]);
|
|
1629
1630
|
//insert sorted by size ascending
|
|
1630
1631
|
if (spans.length == 0 || span.size > spans[0].size) {
|
|
1631
1632
|
spans.push(span);
|
|
@@ -1652,8 +1653,8 @@ var MakerJs;
|
|
|
1652
1653
|
//from 3 points
|
|
1653
1654
|
Circle.apply(this, args);
|
|
1654
1655
|
var angles = [];
|
|
1655
|
-
for (var
|
|
1656
|
-
angles.push(MakerJs.angle.ofPointInDegrees(this.origin, args[
|
|
1656
|
+
for (var i_1 = 0; i_1 < 3; i_1++) {
|
|
1657
|
+
angles.push(MakerJs.angle.ofPointInDegrees(this.origin, args[i_1]));
|
|
1657
1658
|
}
|
|
1658
1659
|
this.startAngle = angles[0];
|
|
1659
1660
|
this.endAngle = angles[2];
|
|
@@ -9885,5 +9886,5 @@ var MakerJs;
|
|
|
9885
9886
|
];
|
|
9886
9887
|
})(models = MakerJs.models || (MakerJs.models = {}));
|
|
9887
9888
|
})(MakerJs || (MakerJs = {}));
|
|
9888
|
-
MakerJs.version = "0.18.
|
|
9889
|
+
MakerJs.version = "0.18.1";
|
|
9889
9890
|
var Bezier = require('bezier-js');
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "makerjs",
|
|
3
|
-
"version": "0.18.
|
|
3
|
+
"version": "0.18.1",
|
|
4
4
|
"description": "Maker.js, a Microsoft Garage project, is a JavaScript library for creating and sharing modular line drawings for CNC and laser cutters.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|