diff --git a/assets/stls/stapler/zAxis.stl b/assets/stls/stapler/zAxis.stl old mode 100755 new mode 100644 index 574ada5b5537e7a7e55785583bae60ab9583b937..748d2be589d4c18d7531175dc337614a93964e30 Binary files a/assets/stls/stapler/zAxis.stl and b/assets/stls/stapler/zAxis.stl differ diff --git a/assets/stls/stapler/zAxisDual.stl b/assets/stls/stapler/zAxisDual.stl deleted file mode 100644 index ac5bb03fc8bc63d2191cb81db94fad2698d5f5ea..0000000000000000000000000000000000000000 Binary files a/assets/stls/stapler/zAxisDual.stl and /dev/null differ diff --git a/assets/stls/stapler/zAxisOrig.stl b/assets/stls/stapler/zAxisOrig.stl new file mode 100755 index 0000000000000000000000000000000000000000..574ada5b5537e7a7e55785583bae60ab9583b937 Binary files /dev/null and b/assets/stls/stapler/zAxisOrig.stl differ diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js index c1f0c04ec4a6b1c1aa6baddd9f43e8b6012e6733..a7906d528ef565260941726e58c7159ad547db9b 100644 --- a/js/cam/assemblers/Assembler.js +++ b/js/cam/assemblers/Assembler.js @@ -68,7 +68,7 @@ define(['underscore', 'appState', 'lattice', 'stlLoader', 'threeModel', 'cam', ' } if (json.scale) geometry.applyMatrix(new THREE.Matrix4().makeScale(json.scale, json.scale, json.scale)); - geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-21, -0.63, 0));//todo get rid of these + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-21, -0.63, -1.28));//todo get rid of these // geometry.applyMatrix(new THREE.Matrix4().makeRotationZ(Math.PI/2)); return geometry; } @@ -249,7 +249,6 @@ define(['underscore', 'appState', 'lattice', 'stlLoader', 'threeModel', 'cam', ' if (position.x === null && position.y === null) return speed; var deltaX = position.x-startingPos.x; var deltaY = position.y-startingPos.y; - console.log(deltaX + " " + deltaY); var totalDistance = Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2)); if (totalDistance == 0) return speed; speed.x = Math.abs(deltaX/totalDistance*speed.x); diff --git a/js/cam/assemblers/AssemblerPost.js b/js/cam/assemblers/AssemblerPost.js index 79dea6aa600fa033c19784b2e3fbf2dc114d9269..56c3421acd7ff6898d684caa80d89588d05cc65d 100644 --- a/js/cam/assemblers/AssemblerPost.js +++ b/js/cam/assemblers/AssemblerPost.js @@ -91,10 +91,11 @@ define(['underscore', 'appState', 'lattice', 'cam'], function(_, appState, latti if (material == "brass") data += exporter.addLine("M3"); else if (material == "fiberGlass") data += exporter.addLine("M4"); - data += exporter.addComment(JSON.stringify(index)); data += exporter.addLine("G4", ["P" + context.stockWait]); data += exporter.addLine("M5"); + data += exporter.addComment(JSON.stringify(index));//leave this, tells sim to show cell + data += exporter.moveZ(position.z - context.zPreload, settings);//need this line? data += exporter.moveZ(position.z + settings.safeHeight, settings); diff --git a/js/cam/assemblers/StockComponent.js b/js/cam/assemblers/StockComponent.js index 0bb9539efe5c2a0f9603c1abbd719f0551c7f9da..fd71a0e148bc709085a027a45e8b6605b9239c40 100644 --- a/js/cam/assemblers/StockComponent.js +++ b/js/cam/assemblers/StockComponent.js @@ -51,7 +51,6 @@ define(['underscore', 'cam', 'three', 'component', 'lattice', 'threeModel'], StockComponent.prototype.show = function(){ this.cell.show(); - console.log(this.cell); }; StockComponent.prototype.hide = function(){