From b4690a65c85b5f3b989aeeda07ce0b2b1cdd711e Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Fri, 25 Sep 2015 12:17:37 -0400 Subject: [PATCH] stopping pt --- js/API/LatticeAPI.js | 10 ++++++++++ js/API/MaterialAPI.js | 21 --------------------- js/API/MaterialsAPI.js | 28 ++++++++++++++++++++++++++++ js/lattice/LatticeBase.js | 1 - js/models/AppState.js | 2 +- 5 files changed, 39 insertions(+), 23 deletions(-) delete mode 100644 js/API/MaterialAPI.js create mode 100644 js/API/MaterialsAPI.js diff --git a/js/API/LatticeAPI.js b/js/API/LatticeAPI.js index 2f84fa34..931b71b3 100644 --- a/js/API/LatticeAPI.js +++ b/js/API/LatticeAPI.js @@ -87,6 +87,16 @@ define(['lattice'], function(lattice){ }, + addCellAtIndex: function(){ + + }, + + removeCellAtIndex: function(){ + + }, + + + //general diff --git a/js/API/MaterialAPI.js b/js/API/MaterialAPI.js deleted file mode 100644 index 270fed12..00000000 --- a/js/API/MaterialAPI.js +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Created by aghassaei on 9/25/15. - */ - - -define([], function(){ - - - function init(){ - - } - - function set(){ - - } - - function destroy(){ - - } - -}); \ No newline at end of file diff --git a/js/API/MaterialsAPI.js b/js/API/MaterialsAPI.js new file mode 100644 index 00000000..0ddf6346 --- /dev/null +++ b/js/API/MaterialsAPI.js @@ -0,0 +1,28 @@ +/** + * Created by aghassaei on 9/25/15. + */ + + +define(['materials'], function(){ + + + return { + + init: function(){ + + }, + + set: function(){ + + }, + + bulkChangeMaterial: function(startMaterial, endMaterial){ + + }, + + destroy: function(){ + + } + } + +}); \ No newline at end of file diff --git a/js/lattice/LatticeBase.js b/js/lattice/LatticeBase.js index bdda21df..e5a59ef9 100644 --- a/js/lattice/LatticeBase.js +++ b/js/lattice/LatticeBase.js @@ -27,7 +27,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre this.sparseCells = [[[null]]];//3D matrix containing highest hierarchical level of cells and null //bind events - this.listenTo(appState, "change:cellMode", this._updateForMode); this.listenTo(appState, "change:cellsVisible", this._setCellVisibility); diff --git a/js/models/AppState.js b/js/models/AppState.js index 28bfb708..d7341932 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -33,7 +33,7 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'globals'], deleteMode: false, highlightMode: true, extrudeMode: false, - cellMode: "cell",//supercell, cell, part, node, beam + cellMode: "cell",//supercell, cell, part, hide cellsVisible: true, superCellIndex: new THREE.Vector3(0,0,0),//offset of superCell adds -- GitLab