From e2598b685dc17472a7c6c6042679fe161af8c9eb Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 28 May 2015 14:56:37 -0700
Subject: [PATCH] spproximate stock position
---
js/cam/assemblers/Assembler.js | 4 ++++
js/cam/assemblers/StaplerAssembler.js | 5 +++++
js/cam/cam.js | 6 +++---
js/cells/supercells/GIKSuperCell.js | 2 +-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js
index 40829b1d..318ce58a 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 40239eee..c638f5a9 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 02e385d0..c6c25b4b 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 fc9190f3..222e2976 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();
};
--
GitLab