diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js index d96236de6550ae6abc4e62980b0a786d7be67686..247377af172c5237fcf9d49df9b654c8d5da6c94 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 341bcc7d625639a6101ea78d288bb5fae3acf15a..0c4c5c245d7c5e70b3b85ed678bfcb1a7fbb6573 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(); - }, - - -