diff --git a/assets/stls/stapler/frame.stl b/assets/stls/stapler/frame.stl index 134d7a0d1d2fa0cc393a70ca7798c7d82b712256..ba0b12922d07f401475712047e85c6a8e3c4df3e 100755 Binary files a/assets/stls/stapler/frame.stl and b/assets/stls/stapler/frame.stl differ diff --git a/assets/stls/stapler/substrate.stl b/assets/stls/stapler/substrate.stl old mode 100644 new mode 100755 index 5427cd67663a32d98b47a973b6cdebcca9496b87..c291940d9b020c2c60aa95b848949d2a0dde1e3f Binary files a/assets/stls/stapler/substrate.stl and b/assets/stls/stapler/substrate.stl differ diff --git a/assets/stls/stapler/xAxis.stl b/assets/stls/stapler/xAxis.stl new file mode 100755 index 0000000000000000000000000000000000000000..ea6eb152815822b3bb48ea40a43dfd457817fe3b Binary files /dev/null and b/assets/stls/stapler/xAxis.stl differ diff --git a/assets/stls/stapler/xStage.stl b/assets/stls/stapler/xStage.stl deleted file mode 100755 index 90c3d6bb27bbf3dda91b8d57eafb6a86012eda4e..0000000000000000000000000000000000000000 Binary files a/assets/stls/stapler/xStage.stl and /dev/null differ diff --git a/assets/stls/stapler/yAxis.stl b/assets/stls/stapler/yAxis.stl new file mode 100755 index 0000000000000000000000000000000000000000..529310ecc882df840e9a211660dae661c66b2bc5 Binary files /dev/null and b/assets/stls/stapler/yAxis.stl differ diff --git a/assets/stls/stapler/yStage.stl b/assets/stls/stapler/yStage.stl deleted file mode 100755 index 9c527293c65098d633b259e9edffccacb6343585..0000000000000000000000000000000000000000 Binary files a/assets/stls/stapler/yStage.stl and /dev/null differ diff --git a/assets/stls/stapler/zAxis.stl b/assets/stls/stapler/zAxis.stl new file mode 100755 index 0000000000000000000000000000000000000000..574ada5b5537e7a7e55785583bae60ab9583b937 Binary files /dev/null and b/assets/stls/stapler/zAxis.stl differ diff --git a/assets/stls/stapler/zStageDual.stl b/assets/stls/stapler/zAxisDual.stl similarity index 100% rename from assets/stls/stapler/zStageDual.stl rename to assets/stls/stapler/zAxisDual.stl diff --git a/assets/stls/stapler/zStage.stl b/assets/stls/stapler/zStage.stl deleted file mode 100755 index e4ca82a6db696d837bbbb850a88519c476bf0391..0000000000000000000000000000000000000000 Binary files a/assets/stls/stapler/zStage.stl and /dev/null differ diff --git a/js/cam/assemblers/DualStaplerAssembler.js b/js/cam/assemblers/DualStaplerAssembler.js index 0613baa20fe07c475b3243c3b6e9f4a28f462de5..a0a9fb6be3fa533b83a599defc0dab57c8c33b0b 100644 --- a/js/cam/assemblers/DualStaplerAssembler.js +++ b/js/cam/assemblers/DualStaplerAssembler.js @@ -8,5 +8,5 @@ function DualStaplerAssembler(){ DualStaplerAssembler.prototype = Object.create(StaplerAssembler.prototype); DualStaplerAssembler.prototype._headSTLFile = function(){ - return "assets/stls/stapler/zStageDual.stl"; + return "assets/stls/stapler/zAxisDual.stl"; }; \ No newline at end of file diff --git a/js/cam/assemblers/StaplerAssembler.js b/js/cam/assemblers/StaplerAssembler.js index 96fa4ad66ea44982291800e6ce18bebe670c2226..1e9c5e785388842e6704b35d7a91eb5683cf1cef 100644 --- a/js/cam/assemblers/StaplerAssembler.js +++ b/js/cam/assemblers/StaplerAssembler.js @@ -30,12 +30,12 @@ StaplerAssembler.prototype._getTotalNumMeshes = function(){ StaplerAssembler.prototype._loadSTls = function(doAdd){ function geometryScale(geometry){ - geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0.125, -2.3883, 1.0348)); - geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0.075, 0.0375, 0)); + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-4.0757, -4.3432, -6.2154)); geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2)); var unitScale = 20; geometry.applyMatrix(new THREE.Matrix4().makeScale(unitScale, unitScale, unitScale)); + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-21, -0.63, 0)); return geometry; } @@ -46,21 +46,21 @@ StaplerAssembler.prototype._loadSTls = function(doAdd){ loader.load(this._headSTLFile(), function(geometry){ doAdd(geometryScale(geometry), "zAxis"); }); - loader.load("assets/stls/stapler/yStage.stl", function(geometry){ + loader.load("assets/stls/stapler/yAxis.stl", function(geometry){ doAdd(geometryScale(geometry), "yAxis"); }); - loader.load("assets/stls/stapler/xStage.stl", function(geometry){ + loader.load("assets/stls/stapler/xAxis.stl", function(geometry){ doAdd(geometryScale(geometry), "xAxis"); }); loader.load("assets/stls/stapler/substrate.stl", function(geometry){ - geometry.applyMatrix(new THREE.Matrix4().makeRotationY(Math.PI/2)); - geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0, 1.8545, -1.2598)); +// geometry.applyMatrix(new THREE.Matrix4().makeRotationY(Math.PI/2)); +// geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0, 1.8545, -1.2598)); doAdd(geometryScale(geometry), "substrate"); }); }; StaplerAssembler.prototype._headSTLFile = function(){ - return "assets/stls/stapler/zStage.stl"; + return "assets/stls/stapler/zAxis.stl"; }; StaplerAssembler.prototype._moveXAxis = function(startingPos, target, axis, speed, callback){