Skip to content
Snippets Groups Projects
Commit 682c100d authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

clear all cells

parent 852c1433
Branches
No related tags found
No related merge requests found
...@@ -8,6 +8,8 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -8,6 +8,8 @@ LatticeMenuView = Backbone.View.extend({
el: "#menuContent", el: "#menuContent",
events: { events: {
"click #latticeMenuClearCells": "_clearCells"
}, },
initialize: function(){ initialize: function(){
...@@ -16,6 +18,11 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -16,6 +18,11 @@ LatticeMenuView = Backbone.View.extend({
this.listenTo(this.model, "change", this.render); this.listenTo(this.model, "change", this.render);
}, },
_clearCells: function(e){
e.preventDefault();
this.model.clearCells();
},
_formatData: function(){ _formatData: function(){
var formattedCellType = "Octagon"; var formattedCellType = "Octagon";
var formattedConnectionType = "Face-Connected"; var formattedConnectionType = "Face-Connected";
...@@ -32,7 +39,7 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -32,7 +39,7 @@ LatticeMenuView = Backbone.View.extend({
Scale:&nbsp;&nbsp;<%= scale %><br/>\ Scale:&nbsp;&nbsp;<%= scale %><br/>\
Column Separation:<br/>\ Column Separation:<br/>\
NumCells:&nbsp;&nbsp;<%= numCells %><br/><br/>\ NumCells:&nbsp;&nbsp;<%= numCells %><br/><br/>\
<a href="#" class=" btn btn-block btn-lg btn-default">Clear All Cells</a><br/>\ <a href="#" id="latticeMenuClearCells" class=" btn btn-block btn-lg btn-default">Clear All Cells</a><br/>\
') ')
}); });
\ No newline at end of file
...@@ -22,14 +22,16 @@ Lattice = Backbone.Model.extend({ ...@@ -22,14 +22,16 @@ Lattice = Backbone.Model.extend({
}, },
addCell: function(position){ addCell: function(position){
new Cell(position); this.get("cells").push(new Cell(position));
this.set("numCells", this.get("numCells")+1); this.set("numCells", this.get("numCells")+1);
window.three.render(); window.three.render();
}, },
removeCell: function(object){ removeCell: function(object){
window.three.sceneRemove(object); var cells = this.get("cells");
cells.splice(cells.indexOf(object), 1);
this.set("numCells", this.get("numCells")-1); this.set("numCells", this.get("numCells")-1);
window.three.sceneRemove(object);
window.three.render(); window.three.render();
}, },
...@@ -38,7 +40,8 @@ Lattice = Backbone.Model.extend({ ...@@ -38,7 +40,8 @@ Lattice = Backbone.Model.extend({
cell.remove(); cell.remove();
}); });
this.set("cells", []); this.set("cells", []);
this.set("numCells, 0"); this.set("numCells", 0);
window.three.render();
} }
}); });
\ No newline at end of file
...@@ -54,7 +54,7 @@ function ThreeModel(){ ...@@ -54,7 +54,7 @@ function ThreeModel(){
function sceneRemove(object){ function sceneRemove(object){
var objectToRemove = object; var objectToRemove = object;
if (object.parent !== THREE.Scene) { if (object.parent.type != "Scene") {
objectToRemove = object.parent; objectToRemove = object.parent;
} }
scene.remove(objectToRemove); scene.remove(objectToRemove);
...@@ -66,15 +66,16 @@ function ThreeModel(){ ...@@ -66,15 +66,16 @@ function ThreeModel(){
renderer.render(scene, camera); renderer.render(scene, camera);
} }
function clearAll(){x function clearAll(){
var children = scene.children; // var children = objects.slice(0);
for (var i=children.length;i>=0;i--){ // for (var i=children.length;i>=0;i--){
var object = children[i]; // var object = children[i];
if (object instanceof THREE.Mesh){// && object != this.fillGeometry.get("mesh") // if (!(object instanceof THREE.Mesh)){// && object != this.fillGeometry.get("mesh")
scene.remove(object); // scene.remove(object);
} // objects.splice(objects.indexOf(object), 1);
} // }
render(); // }
// render();
} }
return {//return public properties/methods return {//return public properties/methods
......
...@@ -75,6 +75,7 @@ ThreeView = Backbone.View.extend({ ...@@ -75,6 +75,7 @@ ThreeView = Backbone.View.extend({
this.controls.enabled = !state; this.controls.enabled = !state;
break; break;
case 32://space bar case 32://space bar
e.preventDefault();
this.deleteMode = state; this.deleteMode = state;
this.controls.enabled = !state; this.controls.enabled = !state;
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment