diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js index 40829b1d603d79a2874d7fa650c03997ea7aa4d9..318ce58ad871b7034a4686fa23ebf02c3b1e5361 100644 --- a/js/cam/assemblers/Assembler.js +++ b/js/cam/assemblers/Assembler.js @@ -8,6 +8,7 @@ var assemblerMaterial = new THREE.MeshLambertMaterial({color:0xaaaaaa, shading: function Assembler(){ this.stock = this._buildStock(); + this._positionStockRelativeToEndEffector(this.stock); this.object3D = new THREE.Object3D(); globals.three.sceneAdd(this.object3D); var self = this; @@ -22,6 +23,9 @@ Assembler.prototype._buildStock = function(){ return globals.lattice.makeCellForLatticeType(null); }; +Assembler.prototype._positionStockRelativeToEndEffector = function(){ +}; + Assembler.prototype._buildAssemblerMeshes = function(callback){ var numMeshes = this._getTotalNumMeshes(); if (numMeshes == 0) { diff --git a/js/cam/assemblers/StaplerAssembler.js b/js/cam/assemblers/StaplerAssembler.js index 40239eee83a464598f0aa5bb443ab8538ab8dad2..c638f5a909e393478caa81b54fd43af03541e945 100644 --- a/js/cam/assemblers/StaplerAssembler.js +++ b/js/cam/assemblers/StaplerAssembler.js @@ -9,6 +9,11 @@ function StaplerAssembler(){ } StaplerAssembler.prototype = Object.create(Assembler.prototype); +StaplerAssembler.prototype._positionStockRelativeToEndEffector = function(stock){ + var object3D = stock.getObject3D(); + object3D.position.set((2.4803+0.2)*20, (-1.9471+0.36)*20, 1.7*20); +}; + StaplerAssembler.prototype._configureAssemblerMovementDependencies = function(){ this.zAxis.add(this.stock.getObject3D()); this.xAxis.add(this.zAxis); diff --git a/js/cam/cam.js b/js/cam/cam.js index 02e385d0d629a3a1a8d21e888d83d4083e0fb36b..c6c25b4b260309326e86360a838f84d5000df471 100644 --- a/js/cam/cam.js +++ b/js/cam/cam.js @@ -75,7 +75,7 @@ Cam = Backbone.Model.extend({ this.listenTo(globals.appState, "change:cellMode", this._updateCellMode); this.listenTo(this, "change:machineName", this.selectMachine); - this._initOriginAndStock(); +// this._initOriginAndStock(); }, selectMachine: function(){ @@ -140,8 +140,8 @@ Cam = Backbone.Model.extend({ _setCAMVisibility: function(){ var visible = this.isVisible(); - this.get("origin").visible = visible; - this.get("stock").visible = visible; +// this.get("origin").visible = visible; +// this.get("stock").visible = visible; if (visible && !this.get("assembler")) this.selectMachine(); if (this.get("assembler")) this.get("assembler").setVisibility(visible); globals.three.render(); diff --git a/js/cells/supercells/GIKSuperCell.js b/js/cells/supercells/GIKSuperCell.js index fc9190f32248fed6601994809c613b6aa2980de2..222e2976e4a5bf3cf31934b3d9f4e9445f113015 100644 --- a/js/cells/supercells/GIKSuperCell.js +++ b/js/cells/supercells/GIKSuperCell.js @@ -45,7 +45,7 @@ GIKSuperCell = function(length, range, cells){ self.addChildCell(cell.setSuperCell(self, index)); }); if (this.indices) globals.three.sceneAdd(this.object3D, "supercell"); - else (this.hide()); +// else (this.hide()); this.setMode(); };