From f0e58fea9ae14f9fd7f7b21b7dd5023ef8b5ebcf Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 26 May 2017 11:42:43 -0700
Subject: [PATCH] Modify gracefulControls SPACE key to be toggle
---
script-archive/gracefulControls.js | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/script-archive/gracefulControls.js b/script-archive/gracefulControls.js
index ab5de48ae2..3179044c2c 100644
--- a/script-archive/gracefulControls.js
+++ b/script-archive/gracefulControls.js
@@ -45,8 +45,9 @@ var KEY_LEFT = "a";
var KEY_RIGHT = "d";
var KEY_UP = "e";
var KEY_DOWN = "c";
-var KEY_ENABLE = "SPACE";
-var CAPTURED_KEYS = [KEY_BRAKE, KEY_FORWARD, KEY_BACKWARD, KEY_LEFT, KEY_RIGHT, KEY_UP, KEY_DOWN, KEY_ENABLE];
+var KEY_TOGGLE= "SPACE";
+var KEY_DISABLE = "ESC";
+var CAPTURED_KEYS = [KEY_BRAKE, KEY_FORWARD, KEY_BACKWARD, KEY_LEFT, KEY_RIGHT, KEY_UP, KEY_DOWN, KEY_TOGGLE];
// Global Variables
var keys = {};
@@ -63,12 +64,10 @@ var yawSpeed = 0;
var pitchSpeed = 0;
function keyPressEvent(event) {
- if (event.text == "ESC") {
+ if (event.text == KEY_DISABLE) {
disable();
- } else if (event.text == KEY_ENABLE) {
- if (Window.hasFocus()) {
- enable();
- }
+ } else if (event.text == KEY_TOGGLE) {
+ toggleEnabled();
} else if (event.text == KEY_BRAKE) {
movementParameters = BRAKE_PARAMETERS;
}
@@ -178,8 +177,17 @@ function resetCursorPosition() {
lastY = newY;
}
+
+function toggleEnabled() {
+ if (enabled) {
+ disable();
+ } else {
+ enable();
+ }
+}
+
function enable() {
- if (!enabled) {
+ if (!enabled && Window.hasFocus()) {
enabled = true;
resetCursorPosition();