@jwc/jscad-utils 4.8.1 → 4.8.3

package/dist/compat.js

@@ -43,8 +43,10 @@ function initJscadutils(_CSG, options = {}) {
 var jscadUtils = (function (exports, jsCadCSG, scadApi) {
   'use strict';
 
-  jsCadCSG = jsCadCSG && Object.prototype.hasOwnProperty.call(jsCadCSG, 'default') ? jsCadCSG['default'] : jsCadCSG;
-  scadApi = scadApi && Object.prototype.hasOwnProperty.call(scadApi, 'default') ? scadApi['default'] : scadApi;
+  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+  var jsCadCSG__default = /*#__PURE__*/_interopDefaultLegacy(jsCadCSG);
+  var scadApi__default = /*#__PURE__*/_interopDefaultLegacy(scadApi);
 
   var util = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -1013,13 +1015,13 @@ var jscadUtils = (function (exports, jsCadCSG, scadApi) {
     'default': init
   });
 
-  var CSG = jsCadCSG.CSG,
-      CAG = jsCadCSG.CAG;
-  var rectangular_extrude = scadApi.extrusions.rectangular_extrude;
-  var _scadApi$text = scadApi.text,
+  var CSG = jsCadCSG__default['default'].CSG,
+      CAG = jsCadCSG__default['default'].CAG;
+  var rectangular_extrude = scadApi__default['default'].extrusions.rectangular_extrude;
+  var _scadApi$text = scadApi__default['default'].text,
       vector_text = _scadApi$text.vector_text,
       vector_char = _scadApi$text.vector_char;
-  var union = scadApi.booleanOps.union;
+  var union = scadApi__default['default'].booleanOps.union;
   init(CSG);
 
   var debug = Debug('jscadUtils:group');
@@ -1632,8 +1634,8 @@ var jscadUtils = (function (exports, jsCadCSG, scadApi) {
    * has been depricated and what to use instead.
    * @function depreciated
    * @param  {string} method  The name of the method being depricated.
-   * @param  {boolean} error  Throws an error if called when true.
-   * @param  {string} message Instructions on what to use instead of the depricated method.
+   * @param  {boolean} [error]  Throws an error if called when true.
+   * @param  {string} [message] Instructions on what to use instead of the depricated method.
    */
 
   function depreciated(method, error, message) {
@@ -2335,12 +2337,12 @@ var jscadUtils = (function (exports, jsCadCSG, scadApi) {
     return object.stretchAtPlane(normal[axis], cutDelta, distance);
   }
   /**
-   * Takes two CSG polygons and createds a solid of `height`.
-   * Similar to `CSG.extrude`, excdept you can resize either
+   * Takes two CSG polygons and creates a solid of `height`.
+   * Similar to `CSG.extrude`, except you can resize either
    * polygon.
    * @param  {CAG} top    Top polygon
    * @param  {CAG} bottom Bottom polygon
-   * @param  {number} height heigth of solid
+   * @param  {number} height height of solid
    * @return {CSG}        generated solid
    */
 
@@ -2377,6 +2379,11 @@ var jscadUtils = (function (exports, jsCadCSG, scadApi) {
     return CSG.fromPolygons(polygons);
   }
   function slices2poly(slices, options, axis) {
+    debug$1('slices2poly', slices, options, axis);
+    options = Object.assign({
+      twistangle: 0,
+      twiststeps: 0
+    }, options);
     var twistangle = options && parseFloat(options.twistangle) || 0;
     var twiststeps = options && parseInt(options.twiststeps) || CSG.defaultResolution3D;
 
@@ -2389,6 +2396,7 @@ var jscadUtils = (function (exports, jsCadCSG, scadApi) {
 
     var first$1 = first(slices);
     var last$1 = last(slices);
+    debug$1('slices2poly first', first$1, first$1.offset, 'last', last$1);
     var up = first$1.offset[axis] > last$1.offset[axis]; // _toPlanePolygons only works in the 'z' axis.  It's hard coded
     // to create the poly using 'x' and 'y'.
 
@@ -2487,19 +2495,21 @@ var jscadUtils = (function (exports, jsCadCSG, scadApi) {
   function reShape(object, radius, orientation, options, slicer) {
     options = options || {};
     var b = object.getBounds();
-    var ar = Math.abs(radius);
+    var absoluteRadius = Math.abs(radius);
     var si = sliceParams(orientation, radius, b);
+    debug$1('reShape', absoluteRadius, si);
     if (si.axis !== 'z') throw new Error('reShape error: CAG._toPlanePolytons only uses the "z" axis.  You must use the "z" axis for now.');
     var cutplane = CSG.OrthoNormalBasis.GetCartesian(si.orthoNormalCartesian[0], si.orthoNormalCartesian[1]).translate(si.cutDelta);
     var slice = object.sectionCut(cutplane);
     var first = axisApply(si.axis, function () {
-      return si.positive ? 0 : ar;
+      return si.positive ? 0 : absoluteRadius;
     });
     var last = axisApply(si.axis, function () {
-      return si.positive ? ar : 0;
+      return si.positive ? absoluteRadius : 0;
     });
     var plane = si.positive ? cutplane.plane : cutplane.plane.flipped();
-    var slices = slicer(first, last, slice);
+    debug$1('reShape first/last', first, last);
+    var slices = slicer(first, last, slice, radius);
     var delta = slices2poly(slices, Object.assign(options, {
       si: si
     }), si.axis).color(options.color);
@@ -2975,23 +2985,27 @@ var jscadUtils = (function (exports, jsCadCSG, scadApi) {
     debug$3('Rabett', 'thickness', thickness, 'gap', gap, 'height', height, 'face', face);
     gap = gap || 0.25;
     var inside = thickness - gap;
-    var outside = -thickness + gap;
-    options.color = true;
-    var group = Group();
-    debug$3('Rabbet top height:', height, 'options:', options);
+    var outside = -thickness + gap; // options.color = true;
+
+    debug$3('inside', inside, 'outside', outside);
+    var group = Group(); // debug('Rabbet top height:', height, 'options:', options);
+
     var _box$bisect$parts = box.bisect('z', height, options).parts,
         top = _box$bisect$parts.positive,
-        lower2_3rd = _box$bisect$parts.negative;
-    debug$3('face', face, 'height', height);
-    var lowerBisectHeight = Math.sign(height) < 0 ? face * Math.sign(height) : height - face;
-    debug$3('Rabbet bottom height:', lowerBisectHeight, 'options:', options);
+        lower2_3rd = _box$bisect$parts.negative; // debug('face', face, 'height', height);
+
+    var lowerBisectHeight = Math.sign(height) < 0 ? face * Math.sign(height) : height - face; // debug('Rabbet bottom height:', lowerBisectHeight, 'options:', options);
+
     var _lower2_3rd$bisect$pa = lower2_3rd.bisect('z', lowerBisectHeight, options).parts,
         middle = _lower2_3rd$bisect$pa.positive,
         bottom = _lower2_3rd$bisect$pa.negative;
+    var middleTop = middle.color('yellow').subtract(middle.color('darkred').enlarge([outside, outside, 0]));
     group.add(top // .color('blue')
-    .union(middle.color('yellow').subtract(middle.color('darkred').enlarge([outside, outside, 0]))), 'top'); // group.add(middle.color('pink').enlarge([inside, inside, 0]), 'middle');
-
-    group.add(bottom.color('orange').union(middle.color('green').subtract(middle.color('red').enlarge([inside, inside, 0]))), 'bottom');
+    .union(middleTop), 'top');
+    var bottomOutline = middle.color('yellow').subtract(middle.color('orange').enlarge([outside, outside, 0])).enlarge([outside, outside, 0]);
+    group.add(bottomOutline, 'middle-top', true);
+    group.add(middle.color('green').subtract(middle.color('pink').enlarge([inside, inside, 0])), 'middle-bottom', true);
+    group.add(bottom.color('orange').union(middle.color('green').subtract(middle.color('red').enlarge([inside, inside, 0])).subtract(middleTop)), 'bottom');
     return group;
   }
   /**