From f2e9f30477e376a2d586c4de58fc13aa8b4f2981 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 11 Jun 2015 16:39:33 -0700
Subject: [PATCH] cleaning up
---
js/lattice/CompositeEditorLattice.js | 3 ++-
js/lattice/Lattice.js | 34 ++++++++++++++++------------
2 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js
index d96236de..247377af 100644
--- a/js/lattice/CompositeEditorLattice.js
+++ b/js/lattice/CompositeEditorLattice.js
@@ -46,7 +46,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
-
+
//3d ui
@@ -67,6 +67,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
+ //composite events
_changeRandomColor: function(){
this.set("color", makeRandomColor());
diff --git a/js/lattice/Lattice.js b/js/lattice/Lattice.js
index 341bcc7d..0c4c5c24 100644
--- a/js/lattice/Lattice.js
+++ b/js/lattice/Lattice.js
@@ -190,6 +190,26 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
+
+ //3d ui
+
+ addHighlightableCell: function(cell){
+ three.addCell(cell);
+ },
+
+ removeHighlightableCell: function(cell){
+ three.removeCell(cell);
+ },
+
+ getHighlightableCells: function(){
+ return three.getCells();
+ },
+
+
+
+
+
+
//fill geometry
subtractMesh: function(mesh){
@@ -277,20 +297,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
return this;
},
- addHighlightableCell: function(cell){
- three.addCell(cell);
- },
-
- removeHighlightableCell: function(cell){
- three.removeCell(cell);
- },
-
- getHighlightableCells: function(){
- return three.getCells();
- },
-
-
-
--
GitLab