diff --git a/js/cam/Assembler.js b/js/cam/Assembler.js index 50ceef8e468ec1abb04c1ecafd7ef807d055c146..3863168c777e0c7b0b153fc9589813ff7e6d9223 100644 --- a/js/cam/Assembler.js +++ b/js/cam/Assembler.js @@ -90,7 +90,7 @@ Assembler = Backbone.Model.extend({ this.set("machine", new God()); this.set("camProcess", "gcode"); this.set("originPosition", {x:0,y:0,z:0}); - this.set("stockPosition", {x:0,y:0,z:50});//todo calculate a good stock position + this.set("stockPosition", {x:0,y:0,z:150});//todo calculate a good stock position } else if (machineName == "oneBitBot"){ this.set("machine", new OneBitBot()); this.set("camProcess", "gcode"); diff --git a/js/cam/Machine.js b/js/cam/Machine.js index 67163ee72fae4f370227154604b067a19efd7790..6a255c2f3e07621fd325543c74c28952dcdc39c6 100644 --- a/js/cam/Machine.js +++ b/js/cam/Machine.js @@ -321,7 +321,7 @@ God.prototype._postPickUpStock = function(exporter, stockPosition, rapidHeight, return data; }; -God.prototype._postReleaseStock = function(cell, exporter, rapidHeight, wcs, safeHeight){ +God.prototype._postReleaseStock = function(cellPosition, cell, exporter, rapidHeight, wcs, safeHeight){ var data = ""; var cellPosition = cell.getPosition(); data += exporter.rapidXY(cellPosition.x-wcs.x, cellPosition.y-wcs.y); diff --git a/js/fea/DmaCellOcta.js b/js/fea/DmaCellOcta.js index ad3a8bd6eada2814c3747e0708fbdf1f0833c9ff..fda02f81954dd5924dc98a9e630b8ef478154140 100644 --- a/js/fea/DmaCellOcta.js +++ b/js/fea/DmaCellOcta.js @@ -68,6 +68,11 @@ DMAFreeFormOctaCell.prototype = Object.create(DMAFreeFormCell.prototype); DMAFreeFormOctaCell.prototype._doMeshTransformations = function(mesh){ + if (!this.parentDirection) { + this.parentDirection = new THREE.Vector3(0,0,1); + this.parentQuaternion = new THREE.Quaternion(); + this.parentPos = new THREE.Vector3(0,0,0); + } var direction = this.parentDirection.clone(); var zAxis = new THREE.Vector3(0,0,1); zAxis.applyQuaternion(this.parentQuaternion); diff --git a/js/models/AppState.js b/js/models/AppState.js index 4794e6490ac9621229e9837308f2772febb5afa2..9c5b44ecaac224324032f988b364fd0813d3774f 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -72,11 +72,11 @@ AppState = Backbone.Model.extend({ vox: "Snap Voxel" //beam:"Beam" }, - vertex: { + vertex: null//{ //beam:"Beam", - square:"Square", - xShape:"X" - } +// square:"Square", +// xShape:"X" +// } }, tetra: {vertex: null}, cube: {face: null},