From bc30f92e94f1e676def3480256e5f864764b569e Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sun, 1 Feb 2015 14:25:59 -0500
Subject: [PATCH] more scaling stuff
---
js/menus/LatticeMenuView.js | 4 +++-
js/models/BasePlane.js | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js
index dc1543a6..d9b9d29c 100644
--- a/js/menus/LatticeMenuView.js
+++ b/js/menus/LatticeMenuView.js
@@ -43,7 +43,9 @@ LatticeMenuView = Backbone.View.extend({
},
_sliderDidSlide: function(e){
- this.model.previewScaleChange($(e.target)[0].value);
+ var 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();
},
diff --git a/js/models/BasePlane.js b/js/models/BasePlane.js
index 183f6ff7..f35508d9 100644
--- a/js/models/BasePlane.js
+++ b/js/models/BasePlane.js
@@ -31,6 +31,7 @@ BasePlane = Backbone.Model.extend({
},
updateScale: function(scale){
+ //todo this should work by mesh scaling, figure out what's up
var newGeometry = this.get("unitGeometry").clone();
newGeometry.applyMatrix(new THREE.Matrix4().makeScale(scale, scale, scale));
var geometry = this.get("mesh").geometry;
--
GitLab