Merge pull request #62 from Microsoft/dev

Dev

Author: danmarshall

index.js

@@ -3013,10 +3013,11 @@ var MakerJs;
             var depth = 0;
             var depthModel;
             var opts = {
-                extrusion: 1
+                extrusion: 1,
+                accuracy: .0001
             };
             MakerJs.extendObject(opts, options);
-            var loops = MakerJs.model.findLoops(modelToExport);
+            var loops = MakerJs.model.findLoops(modelToExport, options.accuracy);
             while (depthModel = loops.models[depth]) {
                 var union = '';
                 for (var modelId in depthModel.models) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "makerjs",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Maker.js, a Microsoft Garage project, is a JavaScript library for creating and sharing modular line drawings for CNC and laser cutters.",
   "main": "index.js",
   "scripts": {

src/core/openjscad.ts

@@ -151,12 +151,13 @@ module MakerJs.exporter {
         var depthModel: IModel;
 
         var opts: IOpenJsCadOptions = {
-            extrusion: 1
+            extrusion: 1,
+            accuracy: .0001
         };
 
         extendObject(opts, options);
 
-        var loops = model.findLoops(modelToExport);
+        var loops = model.findLoops(modelToExport, options.accuracy);
 
         while (depthModel = loops.models[depth]) {
             var union = '';
@@ -210,6 +211,11 @@ module MakerJs.exporter {
          * Optional size of curve facets.
          */
         facetSize?: number;
+
+        /**
+         * Optional accuracy of points.
+         */
+        accuracy?: number
     }
 }
 

target/js/browser.maker.js

@@ -3014,10 +3014,11 @@ var MakerJs;
             var depth = 0;
             var depthModel;
             var opts = {
-                extrusion: 1
+                extrusion: 1,
+                accuracy: .0001
             };
             MakerJs.extendObject(opts, options);
-            var loops = MakerJs.model.findLoops(modelToExport);
+            var loops = MakerJs.model.findLoops(modelToExport, options.accuracy);
             while (depthModel = loops.models[depth]) {
                 var union = '';
                 for (var modelId in depthModel.models) {

target/js/node.maker.js

@@ -3013,10 +3013,11 @@ var MakerJs;
             var depth = 0;
             var depthModel;
             var opts = {
-                extrusion: 1
+                extrusion: 1,
+                accuracy: .0001
             };
             MakerJs.extendObject(opts, options);
-            var loops = MakerJs.model.findLoops(modelToExport);
+            var loops = MakerJs.model.findLoops(modelToExport, options.accuracy);
             while (depthModel = loops.models[depth]) {
                 var union = '';
                 for (var modelId in depthModel.models) {

target/ts/makerjs.d.ts

@@ -1135,6 +1135,10 @@ declare module MakerJs.exporter {
          * Optional size of curve facets.
          */
         facetSize?: number;
+        /**
+         * Optional accuracy of points.
+         */
+        accuracy?: number;
     }
 }
 declare module MakerJs.exporter {