From d9cdfa3f870b060e38cd155886d36746f3f339a2 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 28 May 2015 20:14:37 -0700
Subject: [PATCH] origin selection tools working again
---
js/cam/assemblers/Assembler.js | 6 ++++++
js/cam/assemblers/StaplerAssembler.js | 2 +-
js/cam/cam.js | 5 +----
js/models/AppState.js | 1 +
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js
index 9e6e7f19..232478be 100644
--- a/js/cam/assemblers/Assembler.js
+++ b/js/cam/assemblers/Assembler.js
@@ -163,6 +163,12 @@ Assembler.prototype.releaseStock = function(index){
Assembler.prototype.pause = function(){
};
+Assembler.prototype.moveMachine = function(){
+ var origin = globals.cam.get("originPosition");
+ this.object3D.position.set(origin.x, origin.y, origin.z);
+ globals.three.render();
+};
+
Assembler.prototype.moveTo = function(x, y, z, speed, wcs, callback){
x = this._makeAbsPosition(x, wcs.x);
y = this._makeAbsPosition(y, wcs.y);
diff --git a/js/cam/assemblers/StaplerAssembler.js b/js/cam/assemblers/StaplerAssembler.js
index 3765debb..96fa4ad6 100644
--- a/js/cam/assemblers/StaplerAssembler.js
+++ b/js/cam/assemblers/StaplerAssembler.js
@@ -31,7 +31,7 @@ StaplerAssembler.prototype._loadSTls = function(doAdd){
function geometryScale(geometry){
geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0.125, -2.3883, 1.0348));
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0, 0.0625, -0.025));
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0.075, 0.0375, 0));
geometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.PI/2));
var unitScale = 20;
diff --git a/js/cam/cam.js b/js/cam/cam.js
index 32ad2062..3d3d69ca 100644
--- a/js/cam/cam.js
+++ b/js/cam/cam.js
@@ -164,7 +164,6 @@ Cam = Backbone.Model.extend({
globals.three.sceneAdd(stock);
this.set("stock", stock);
this._moveStock();
- this._setCAMScale();
this._setCAMVisibility();
},
@@ -173,14 +172,12 @@ Cam = Backbone.Model.extend({
// this.get("origin").position.set(position.x, position.y, position.z);
if (this.get("stockFixed")) this._updateStockPosToOrigin(position, this.previous("originPosition"));
globals.three.render();
- if (this.get("assembler") && this.get("assembler").setMachinePosition) this.get("assembler").setMachinePosition();
+ if (this.get("assembler")) this.get("assembler").moveMachine();
},
_updateStockPosToOrigin: function(newOrigin, lastOrigin){
var newStockPosition = _.clone(this.get("stockPosition"));
- console.log(newStockPosition);
_.each(_.keys(newStockPosition), function(key){
- console.log(key);
newStockPosition[key] += newOrigin[key] - lastOrigin[key];
newStockPosition[key] = parseFloat(newStockPosition[key].toFixed(4));
});
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 2d620fc5..f3038134 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -97,6 +97,7 @@ AppState = Backbone.Model.extend({
if (navSelection == "navDesign") {
this.set("currentTab", this.get("lastDesignTab"));
this.set("basePlaneIsVisible", true);
+ this.set("highlighterIsVisible", true);
}
else if (navSelection == "navSim") {
this.set("currentTab", this.get("lastSimulationTab"));
--
GitLab