diff --git a/css/main.css b/css/main.css index efde705d8873275d73ce211fd29bd700b422b84f..656d59ec51ceabfe7bfc136827125aa2c27d13f0 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 4306ef059c05bf8f79784e5b13af0b0e18e28d64..c74d187027b99c054194e6738bab4199bef3e17c 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");