From 3d9878b519394d2903ac0cc9f24e60e91189fde7 Mon Sep 17 00:00:00 2001
From: amandaghassaei <amandaghassaei@gmail.com>
Date: Sat, 14 Mar 2015 13:47:32 -0400
Subject: [PATCH] assembler control points scale
---
css/main.css | 8 ++++----
js/cam/Assembler.js | 13 ++++++++++---
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/css/main.css b/css/main.css
index efde705d..656d59ec 100644
--- a/css/main.css
+++ b/css/main.css
@@ -139,12 +139,12 @@ nav .btn {
}
#menuContent{
- padding: 30px;
+ padding: 30px 30px 100px 30px;
overflow-y: scroll;
- top: 100px;
+ top: 50px;
bottom: 0;
- position: fixed;
- width: 400px;
+ position: absolute;
+ width: 100%;
}
hr {
diff --git a/js/cam/Assembler.js b/js/cam/Assembler.js
index 4306ef05..c74d1870 100644
--- a/js/cam/Assembler.js
+++ b/js/cam/Assembler.js
@@ -47,21 +47,28 @@ Assembler = Backbone.Model.extend({
"change:cellType " +
"change:connectionType",
this._setNeedsPostProcessing);
+ this.listenTo(options.lattice, "change:scale", this._setCAMScale);
//init origin mesh
- var scale = options.lattice.get("scale");
- var origin = new THREE.Mesh(new THREE.SphereGeometry(scale/4),
+ var origin = new THREE.Mesh(new THREE.SphereGeometry(1),
new THREE.MeshBasicMaterial({color:0xff0000}));
dmaGlobals.three.sceneAdd(origin);
this.set("origin", origin);
//init stock mesh
- var stock = new THREE.Mesh(new THREE.SphereGeometry(scale/4),
+ var stock = new THREE.Mesh(new THREE.SphereGeometry(1),
new THREE.MeshBasicMaterial({color:0xff00ff}));
dmaGlobals.three.sceneAdd(stock);
this.set("stock", stock);
+ this._setCAMScale(options.lattice.get("scale"));
this._setCAMVisibility();
},
+ _setCAMScale: function(scale){
+ var scale = dmaGlobals.lattice.get("scale")/8;
+ this.get("origin").scale.set(scale, scale, scale);
+ this.get("stock").scale.set(scale, scale, scale);
+ },
+
_setCAMVisibility: function(){
var visible = false;
var currentTab = dmaGlobals.appState.get("currentTab");
--
GitLab