diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js index 67a60bb928548a5b6566c7118d9eebc88bc0f69a..f224be3f1b7359f842ce885a940f38f5c832a964 100644 --- a/js/menus/LatticeMenuView.js +++ b/js/menus/LatticeMenuView.js @@ -13,7 +13,7 @@ LatticeMenuView = Backbone.View.extend({ "click .cellType": "_changeCellType", "click .connectionType": "_changeConnectionType", "slide #scaleSlider": "_sliderDidSlide", - "slideStop #scaleSlider": "_changeScaleSlider" +// "slideStop #scaleSlider": "_changeScaleSlider" }, @@ -23,7 +23,7 @@ LatticeMenuView = Backbone.View.extend({ _.bindAll(this, "render"); this.listenTo(this.model, "change", function(){ - if(!this.model.hasChanged('cellMode')){//ignore cell mode changes + if(!this.model.hasChanged('cellMode') && !(this.model.hasChanged('scale'))){//ignore cell mode changes this.render(); }; }); @@ -44,14 +44,15 @@ LatticeMenuView = Backbone.View.extend({ _sliderDidSlide: function(e){ var scale = $(e.target)[0].value; - this.model.previewScaleChange(scale);//does not trigger lattice change event - no rerendering of ui + this.model.set("scale", $(e.target)[0].value); +// this.model.previewScaleChange(scale);//does not trigger lattice change event - no rerendering of ui $("#latticeScale").val(scale); window.three.render(); }, - _changeScaleSlider: function(e){ - this.model.set("scale", $(e.target)[0].value); - }, +// _changeScaleSlider: function(e){ +// this.model.set("scale", $(e.target)[0].value); +// }, _changeCellType: function(e){ e.preventDefault(); diff --git a/js/models/BasePlane.js b/js/models/BasePlane.js index d57e79a95dd4cc3ea640206ad9e3e1e88d0ce5a1..25384084f2f6df38514c3ce048b6efcd7f98c8e6 100644 --- a/js/models/BasePlane.js +++ b/js/models/BasePlane.js @@ -8,8 +8,8 @@ BasePlane = Backbone.Model.extend({ defaults: { zIndex: 0, mesh: null, - dimX: 10, - dimY: 10, + dimX: 100, + dimY: 100, material: new THREE.MeshBasicMaterial({color:0x000000, transparent:true, opacity:0.2, wireframe:true, side:THREE.DoubleSide}), currentScene: "default", allScenes: {default:"Default", "mars":"Mars"} diff --git a/js/models/Lattice.js b/js/models/Lattice.js index bf0862c28101bed063071e396b861f15dd80ede4..b26cb522a261e4dc212392682c1c66697797e583 100644 --- a/js/models/Lattice.js +++ b/js/models/Lattice.js @@ -219,9 +219,9 @@ Lattice = Backbone.Model.extend({ window.three.render(); }, - previewScaleChange: function(scale){ - this.get("basePlane").updateScale(scale); - }, +// previewScaleChange: function(scale){ +// this.get("basePlane").updateScale(scale); +// }, _changeLatticeStructure: function(){ this.clearCells(); @@ -262,7 +262,7 @@ OctaFaceLattice = Lattice.extend({ //bind events this.listenTo(this, "change:columnSeparation", this._changeColSeparation); - this.set("columnSeparation", 0.2); + this.set("columnSeparation", 0.1); }, _changeColSeparation: function(){ @@ -279,10 +279,12 @@ OctaFaceLattice = Lattice.extend({ //calc indices in cell matrix var scale = this.get("scale"); + var colSep = this.get("columnSeparation"); + var latticeScale = scale*(1+2*colSep); var octHeight = 2*scale/Math.sqrt(6); - var triHeight = scale/2*Math.sqrt(3); + var triHeight = latticeScale/2*Math.sqrt(3); var position = {}; - position.x = Math.round(absPosition.x/scale); + position.x = Math.round(absPosition.x/latticeScale); position.y = Math.round(absPosition.y/triHeight); position.z = Math.round(absPosition.z/octHeight); if (position.z%2 == 1) position.y += 1;