From 85ab1871bd7ceafad05324e8bd3fd47f80595f4e Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sun, 25 Jan 2015 18:22:46 -0500
Subject: [PATCH] key bindings
---
js/threeViews/threeView.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/js/threeViews/threeView.js b/js/threeViews/threeView.js
index 87d6c414..8b17a1d9 100644
--- a/js/threeViews/threeView.js
+++ b/js/threeViews/threeView.js
@@ -76,6 +76,7 @@ ThreeView = Backbone.View.extend({
break;
case 32://space bar
this.deleteMode = state;
+ this.controls.enabled = !state;
default:
}
},
@@ -91,7 +92,7 @@ ThreeView = Backbone.View.extend({
_mouseMoved: function(e){
- if (this.mouseIsDown && !this.shiftIsDown) {//in the middle of a camera move
+ if (this.mouseIsDown && this.controls.enabled) {//in the middle of a camera move
this._hideHighlighter();
return;
}
@@ -111,7 +112,7 @@ ThreeView = Backbone.View.extend({
this.currentIntersectedObject = intersections[0].object;
- if (this.deleteMode && this.mouseIsDown && this.shiftIsDown){
+ if (this.deleteMode && this.mouseIsDown){
this._addRemoveVoxel();
return;
}
--
GitLab