Commit f879aa8e authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

eod

parent ca7c3de6
......@@ -196,11 +196,13 @@ define(['underscore', 'appState', 'lattice', 'cam'], function(_, appState, latti
AssemblerPost.prototype._postReleaseStock = function(index, position, material, settings, exporter, context){
var data = "";
//offset for rotation
var offset = this.components.substrate.centerOfRotation.clone().multiplyScalar(settings.scale);
// position.add(new THREE.Vector3(18.23*((index.z)%2), 0.3*((index.z)%2), 0));
if (index.z%2 != 0){
position = new THREE.Vector3(-position.y, position.x, position.z);
//offset for rotation
var offset = this.components.substrate.centerOfRotation.clone().multiplyScalar(settings.scale);//offset in mm
var dist = position.clone().sub(offset);
position = offset.add(new THREE.Vector3(dist.y, -dist.x, position.z));
}
var stock = _.find(this.stock, function(thisStock){
......
......@@ -209,7 +209,7 @@ define(['underscore', 'cam', 'three'], function(_, cam, THREE){
if (callback) callback();
return;
}
target = this.applyRotation(target);//absolute?
target = this.applyAbsoluteRotation(target);//absolute?
var currentPosition = this.getPosition();
var increment = speed/1500.0*cam.get("simSpeed");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment