From b5521767b2923540bdce2544beb7cbf361ad1b5c Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 20 Aug 2015 23:53:03 -0400
Subject: [PATCH] stapler working
---
js/cam/assemblers/Assembler.js | 1 +
js/cam/assemblers/AssemblerPost.js | 3 ++-
js/cam/assemblers/StockComponent.js | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js
index 381dc7f2..d65fc62a 100644
--- a/js/cam/assemblers/Assembler.js
+++ b/js/cam/assemblers/Assembler.js
@@ -237,6 +237,7 @@ define(['underscore', 'appState', 'lattice', 'stlLoader', 'threeModel', 'cam', '
callback();
}
+ console.log(position);
var startingPos = this.components.xAxis.getPosition().add(this.components.yAxis.getPosition().add(this.components.zAxis.getPosition()));//this.components.zAxis.getAbsolutePosition();//get position of end effector
speed = this._normalizeSpeed(startingPos, position, new THREE.Vector3(speed, speed, speed));//todo fix this
diff --git a/js/cam/assemblers/AssemblerPost.js b/js/cam/assemblers/AssemblerPost.js
index 56c3421a..11dcec97 100644
--- a/js/cam/assemblers/AssemblerPost.js
+++ b/js/cam/assemblers/AssemblerPost.js
@@ -106,6 +106,8 @@ define(['underscore', 'appState', 'lattice', 'cam'], function(_, appState, latti
this.customCalcPositionOffsets = function(index, position, material, settings, context){
//this feeds into moveXY and placePart functions
+ position.sub(settings.originPosition);
+
if (index.z%2 != 0){
//offset for rotation
var offset = this.components.substrate.centerOfRotation.clone().multiplyScalar(settings.scale);//offset in mm
@@ -122,7 +124,6 @@ define(['underscore', 'appState', 'lattice', 'cam'], function(_, appState, latti
}
position.sub(stock.getPosition().multiplyScalar(settings.scale));
- position.sub(settings.originPosition);
return position;
}
diff --git a/js/cam/assemblers/StockComponent.js b/js/cam/assemblers/StockComponent.js
index fd71a0e1..120a2723 100644
--- a/js/cam/assemblers/StockComponent.js
+++ b/js/cam/assemblers/StockComponent.js
@@ -31,7 +31,7 @@ define(['underscore', 'cam', 'three', 'component', 'lattice', 'threeModel'],
};
StockComponent.prototype.getPosition = function(){
- return this.cell.getPosition();
+ return this.object3D.position.clone();
};
StockComponent.prototype.setMaterial = function(materialName){
--
GitLab