From 09b986bbab38adbfd5c45521e8f0220231d64456 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 24 Feb 2015 15:00:19 -0500
Subject: [PATCH] small changes
---
js/models/BasePlane.js | 15 ++++++---------
js/threeViews/Highlighter.js | 11 ++++++-----
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/js/models/BasePlane.js b/js/models/BasePlane.js
index 8ed76cbf..f88fa498 100644
--- a/js/models/BasePlane.js
+++ b/js/models/BasePlane.js
@@ -24,22 +24,19 @@ BasePlane = Backbone.Model.extend({
//draw mesh
this.set("mesh", this._makeBasePlaneMesh());
this.updateScale(options.scale);
- this._showMesh();//do this once
- },
-
- updateScale: function(scale){
+ var self = this;
_.each(this.get("mesh"), function(mesh){
- mesh.scale.set(scale, scale, scale);
+ window.three.sceneAdd(mesh, self._checkIsHighlightable(mesh));
});
+ window.three.render();
+
},
- _showMesh: function(){
- var self = this;
+ updateScale: function(scale){
_.each(this.get("mesh"), function(mesh){
- window.three.sceneAdd(mesh, self._checkIsHighlightable(mesh));
+ mesh.scale.set(scale, scale, scale);
});
- window.three.render();
},
// _renderForCurrentScene: function(){
diff --git a/js/threeViews/Highlighter.js b/js/threeViews/Highlighter.js
index e0f62b90..c53d76b1 100644
--- a/js/threeViews/Highlighter.js
+++ b/js/threeViews/Highlighter.js
@@ -7,8 +7,9 @@ Highlighter = Backbone.View.extend({
mesh: null,
highlightedObject: null,
- commonInit: function(geometry){
+ initialize: function(){
+ var geometry = this._makeGeometry();
geometry.dynamic = true;
this.mesh = new THREE.Mesh(geometry,
new THREE.MeshBasicMaterial({
@@ -111,14 +112,14 @@ Highlighter = Backbone.View.extend({
OctaFaceHighlighter = Highlighter.extend({
- initialize: function(){
+ _makeGeometry: function(){
var geometry = new THREE.Geometry();
//can't change size of faces or vertices buffers dynamically
geometry.vertices = [new THREE.Vector3(0,0,0), new THREE.Vector3(0,0,0), new THREE.Vector3(0,0,0)];
geometry.faces = [new THREE.Face3(0,1,2)];
- this.commonInit(geometry);
+ return geometry;
}
});
@@ -129,14 +130,14 @@ OctaFaceHighlighter = Highlighter.extend({
CubeHighlighter = Highlighter.extend({
- initialize: function(){
+ _makeGeometry: function(){
var geometry = new THREE.Geometry();
//can't change size of faces or vertices buffers dynamically
geometry.vertices = [new THREE.Vector3(0,0,0), new THREE.Vector3(0,0,0), new THREE.Vector3(0,0,0), new THREE.Vector3(0,0,0)];
geometry.faces = [new THREE.Face3(0,1,2), new THREE.Face3(0,2,3)];
- this.commonInit(geometry);
+ return geometry;
}
});
\ No newline at end of file
--
GitLab