Skip to content

Commit f06219e

Browse files
committed
made default params to combine method
1 parent c99ef64 commit f06219e

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,10 @@ var MakerJs;
13341334
* @param farPoint Optional point of reference which is outside the bounds of both models.
13351335
*/
13361336
function combine(modelA, modelB, includeAInsideB, includeAOutsideB, includeBInsideA, includeBOutsideA, keepDuplicates, farPoint) {
1337+
if (includeAInsideB === void 0) { includeAInsideB = false; }
1338+
if (includeAOutsideB === void 0) { includeAOutsideB = true; }
1339+
if (includeBInsideA === void 0) { includeBInsideA = false; }
1340+
if (includeBOutsideA === void 0) { includeBOutsideA = true; }
13371341
if (keepDuplicates === void 0) { keepDuplicates = true; }
13381342
var pathsA = breakAllPathsAtIntersections(modelA, modelB, farPoint);
13391343
var pathsB = breakAllPathsAtIntersections(modelB, modelA, farPoint);

src/core/combine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ module MakerJs.model {
300300
* @param keepDuplicates Flag to include paths which are duplicate in both models.
301301
* @param farPoint Optional point of reference which is outside the bounds of both models.
302302
*/
303-
export function combine(modelA: IModel, modelB: IModel, includeAInsideB: boolean, includeAOutsideB: boolean, includeBInsideA: boolean, includeBOutsideA: boolean, keepDuplicates: boolean = true, farPoint?: IPoint) {
303+
export function combine(modelA: IModel, modelB: IModel, includeAInsideB: boolean = false, includeAOutsideB: boolean = true, includeBInsideA: boolean = false, includeBOutsideA: boolean = true, keepDuplicates: boolean = true, farPoint?: IPoint) {
304304

305305
var pathsA = breakAllPathsAtIntersections(modelA, modelB, farPoint);
306306
var pathsB = breakAllPathsAtIntersections(modelB, modelA, farPoint);

target/js/browser.maker.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,6 +1335,10 @@ var MakerJs;
13351335
* @param farPoint Optional point of reference which is outside the bounds of both models.
13361336
*/
13371337
function combine(modelA, modelB, includeAInsideB, includeAOutsideB, includeBInsideA, includeBOutsideA, keepDuplicates, farPoint) {
1338+
if (includeAInsideB === void 0) { includeAInsideB = false; }
1339+
if (includeAOutsideB === void 0) { includeAOutsideB = true; }
1340+
if (includeBInsideA === void 0) { includeBInsideA = false; }
1341+
if (includeBOutsideA === void 0) { includeBOutsideA = true; }
13381342
if (keepDuplicates === void 0) { keepDuplicates = true; }
13391343
var pathsA = breakAllPathsAtIntersections(modelA, modelB, farPoint);
13401344
var pathsB = breakAllPathsAtIntersections(modelB, modelA, farPoint);

target/js/node.maker.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,10 @@ var MakerJs;
13341334
* @param farPoint Optional point of reference which is outside the bounds of both models.
13351335
*/
13361336
function combine(modelA, modelB, includeAInsideB, includeAOutsideB, includeBInsideA, includeBOutsideA, keepDuplicates, farPoint) {
1337+
if (includeAInsideB === void 0) { includeAInsideB = false; }
1338+
if (includeAOutsideB === void 0) { includeAOutsideB = true; }
1339+
if (includeBInsideA === void 0) { includeBInsideA = false; }
1340+
if (includeBOutsideA === void 0) { includeBOutsideA = true; }
13371341
if (keepDuplicates === void 0) { keepDuplicates = true; }
13381342
var pathsA = breakAllPathsAtIntersections(modelA, modelB, farPoint);
13391343
var pathsB = breakAllPathsAtIntersections(modelB, modelA, farPoint);

target/ts/makerjs.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ declare module MakerJs.model {
793793
* @param keepDuplicates Flag to include paths which are duplicate in both models.
794794
* @param farPoint Optional point of reference which is outside the bounds of both models.
795795
*/
796-
function combine(modelA: IModel, modelB: IModel, includeAInsideB: boolean, includeAOutsideB: boolean, includeBInsideA: boolean, includeBOutsideA: boolean, keepDuplicates?: boolean, farPoint?: IPoint): void;
796+
function combine(modelA: IModel, modelB: IModel, includeAInsideB?: boolean, includeAOutsideB?: boolean, includeBInsideA?: boolean, includeBOutsideA?: boolean, keepDuplicates?: boolean, farPoint?: IPoint): void;
797797
}
798798
declare module MakerJs.units {
799799
/**

0 commit comments

Comments
 (0)