diff --git a/assets/stls/stapler/zStageDual.stl b/assets/stls/stapler/zStageDual.stl new file mode 100644 index 0000000000000000000000000000000000000000..ac5bb03fc8bc63d2191cb81db94fad2698d5f5ea Binary files /dev/null and b/assets/stls/stapler/zStageDual.stl differ diff --git a/assets/stls/stapler/zStageDualHead.stl b/assets/stls/stapler/zStageDualHead.stl deleted file mode 100644 index ac0b305dfaad43b935f68b14c8f1599956790046..0000000000000000000000000000000000000000 Binary files a/assets/stls/stapler/zStageDualHead.stl and /dev/null differ diff --git a/index.html b/index.html index 47aa3078001c2ceabcd5cb66e0ac3d83687580e0..e14d6ad7d7aefa87254e0f89032bdb57b21ceeb5 100644 --- a/index.html +++ b/index.html @@ -88,6 +88,7 @@ <script src="js/cam/assemblers/Assembler.js"></script> <script src="js/cam/MachineOneBit.js"></script> <script src="js/cam/assemblers/StaplerAssembler.js"></script> + <script src="js/cam/assemblers/DualStaplerAssembler.js"></script> <script src="js/cam/cam.js"></script> <script src="js/cam/ShopbotExporter.js"></script> <script src="js/cam/GCodeExporter.js"></script> diff --git a/js/cam/assemblers/DualStaplerAssembler.js b/js/cam/assemblers/DualStaplerAssembler.js new file mode 100644 index 0000000000000000000000000000000000000000..432d569c0796310bffa1febcd8580ec81dc71efe --- /dev/null +++ b/js/cam/assemblers/DualStaplerAssembler.js @@ -0,0 +1,36 @@ +/** + * Created by aghassaei on 5/28/15. + */ + +function DualStaplerAssembler(){ + StaplerAssembler.call(this); +} +DualStaplerAssembler.prototype = Object.create(StaplerAssembler.prototype); + +StaplerAssembler.prototype._loadSTls = function(doAdd){ + + function geometryScale(geometry){ + var unitScale = 20; + geometry.applyMatrix(new THREE.Matrix4().makeScale(unitScale, unitScale, unitScale)); + geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2)); + return geometry; + } + + var loader = new THREE.STLLoader(); + loader.load("assets/stls/stapler/frame.stl", function(geometry){ + doAdd(geometryScale(geometry), "frame"); + }); + loader.load("assets/stls/stapler/zStageDual.stl", function(geometry){ + doAdd(geometryScale(geometry), "zAxis"); + }); + loader.load("assets/stls/stapler/yStage.stl", function(geometry){ + doAdd(geometryScale(geometry), "yAxis"); + }); + loader.load("assets/stls/stapler/xStage.stl", function(geometry){ + doAdd(geometryScale(geometry), "xAxis"); + }); + loader.load("assets/stls/stapler/substrate.stl", function(geometry){ + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0, 2, 0)); + doAdd(geometryScale(geometry), "substrate"); + }); +}; \ No newline at end of file diff --git a/js/cam/assemblers/StaplerAssembler.js b/js/cam/assemblers/StaplerAssembler.js index ad4dee29f2cf9840bfedb479a582e6d8147e3b9c..a7495ab494397c392ff3dfad06c5078a605ce3ed 100644 --- a/js/cam/assemblers/StaplerAssembler.js +++ b/js/cam/assemblers/StaplerAssembler.js @@ -24,7 +24,7 @@ StaplerAssembler.prototype._getTotalNumMeshes = function(){ StaplerAssembler.prototype._loadSTls = function(doAdd){ function geometryScale(geometry){ - var unitScale = 1; + var unitScale = 20; geometry.applyMatrix(new THREE.Matrix4().makeScale(unitScale, unitScale, unitScale)); geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2)); return geometry; @@ -44,6 +44,7 @@ StaplerAssembler.prototype._loadSTls = function(doAdd){ doAdd(geometryScale(geometry), "xAxis"); }); loader.load("assets/stls/stapler/substrate.stl", function(geometry){ + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0, 2, 0)); doAdd(geometryScale(geometry), "substrate"); }); -} \ No newline at end of file +}; \ No newline at end of file diff --git a/js/cam/cam.js b/js/cam/cam.js index d1bbe8e4c34ae35bab53cef36580c4d3829269e1..516ec4777234ceaf027414d4cc688c2f8edbbbf1 100644 --- a/js/cam/cam.js +++ b/js/cam/cam.js @@ -91,7 +91,7 @@ Cam = Backbone.Model.extend({ } else if (machineName == "stapler"){ this.set("assembler", new StaplerAssembler()); } else if (machineName == "staplerDual"){ - this.set("assembler", new StaplerAssembler()); + this.set("assembler", new DualStaplerAssembler()); } else{ console.warn("selected assembler not recognized"); }