diff --git a/assets/stls/crab/crab.stl b/assets/stls/crab/crab.stl deleted file mode 100644 index 73e680a7351ead9002cd235c2c32207e720ad905..0000000000000000000000000000000000000000 Binary files a/assets/stls/crab/crab.stl and /dev/null differ diff --git a/js/cam/assemblers/Crab.js b/js/cam/assemblers/Crab.js deleted file mode 100644 index bfd0fe51dfe065e030d29f129f565aae15ba4662..0000000000000000000000000000000000000000 --- a/js/cam/assemblers/Crab.js +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Created by aghassaei on 6/23/15. - */ - - -define(['stlLoader', 'bin!assets/stls/crab/crab.stl', 'threeModel', 'assembler'], function(THREE, geometry, three, Assembler){ - - - var loader = new THREE.STLLoader(); - var unitGeo = preProcessGeo(loader.parse(geometry)); - - function preProcessGeo(geo){ - var unitScale = 1/4; - geo.applyMatrix(new THREE.Matrix4().makeScale(unitScale, unitScale, unitScale)); - geo.applyMatrix(new THREE.Matrix4().makeTranslation(0.6, 0.7, 0.5)); - return geo; - } - - function CrabAssembler(){ - this.stockAttachedToEndEffector = true;//no need for "stock position" - Assembler.call(this); - } - CrabAssembler.prototype = Object.create(Assembler.prototype); - - CrabAssembler.prototype._buildStock = function(){ - return null; -// return new StockClass({}); - }; - - CrabAssembler.prototype._configureAssemblerMovementDependencies = function(){ - this.object3D.add(this.frame.getObject3D()); - }; - - CrabAssembler.prototype._getSTLs = function(){ - return { - frame: unitGeo - } - }; - - return CrabAssembler; -}); \ No newline at end of file diff --git a/js/main.js b/js/main.js index 2d4eeaf834ec668384ca3364ee87211630bfd4bb..c8788288fb35ee84d2dbe8939c77e5c0f3caf754 100644 --- a/js/main.js +++ b/js/main.js @@ -165,14 +165,13 @@ require.config({ //cam - cam: 'cam/cam', + cam: 'cam/CAM', //assemblers assembler: 'cam/assemblers/Assembler', component: 'cam/assemblers/Component', stapler: 'cam/assemblers/StaplerAssembler', dualStapler: 'cam/assemblers/DualStaplerAssembler', - crab: 'cam/assemblers/crab', //processes gcode: 'cam/processes/GCodeExporter', diff --git a/js/menus/AssemblerMenuView.js b/js/menus/AssemblerMenuView.js index fe1afb70f7ed689b10e70a872e0ec174d9cfa2c0..dcae6a7d799ce8f5697d7128b8cf773b5bdc9021 100644 --- a/js/menus/AssemblerMenuView.js +++ b/js/menus/AssemblerMenuView.js @@ -32,7 +32,6 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice', 'text!a var newVal = $(e.target).val(); if (newVal.length<3) return;//todo this isn't quite right cam.set("placementOrder", newVal); - // cam.trigger("change:placementOrder"); }, _makeTemplateJSON: function(){ diff --git a/js/menus/templates/AssemblerMenuView.html b/js/menus/templates/AssemblerMenuView.html index bcb06f5451bfb25aa65686af3c27f63e20b2ca09..c6a41a9d717bfd3782adf4fcb22a35d94a215d6b 100644 --- a/js/menus/templates/AssemblerMenuView.html +++ b/js/menus/templates/AssemblerMenuView.html @@ -26,4 +26,5 @@ Strategy: </div><br/><br/> <% if (camStrategy == "raster"){ %> Raster Order: <input value="<%= placementOrder %>" placeholder="Placement Order" class="form-control placementOrder" type="text"><br/><br/> -<% } %> \ No newline at end of file +<% } %> +Num Materials: diff --git a/js/plists/PList.js b/js/plists/PList.js index b5a156d7f091fc0b0e4a681881eb747e55720962..8b63c903bc5b697e85de565d5957970935d13701 100644 --- a/js/plists/PList.js +++ b/js/plists/PList.js @@ -201,12 +201,6 @@ define(['three'], function(THREE){ relative: false, camProcesses: ["gcode"] }, - crab: { - name: "Crab", - shouldPickUpStock: true, - relative: true, - camProcesses: ["gcode"] - }, shopbot: { name: "Shopbot", shouldPickUpStock: true, @@ -241,7 +235,7 @@ define(['three'], function(THREE){ machineTypesForLattice:{ octa:{ face: ["handOfGod"], - edgeRot: ["crab", "shopbot", "oneBitBot", "handOfGod"], + edgeRot: ["shopbot", "oneBitBot", "handOfGod"], vertex: ["handOfGod"] }, tetra: {