From 3e9e00f1d6889f2263949ad8bfa4e85715468d36 Mon Sep 17 00:00:00 2001 From: David Back Date: Wed, 1 Aug 2018 12:42:50 -0700 Subject: [PATCH 1/4] use key codes for entity camera keys --- scripts/system/libraries/entityCameraTool.js | 27 +++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js index fb808cc7ea..3869ff2fe8 100644 --- a/scripts/system/libraries/entityCameraTool.js +++ b/scripts/system/libraries/entityCameraTool.js @@ -39,6 +39,9 @@ var EASING_MULTIPLIER = 8; var INITIAL_ZOOM_DISTANCE = 2; var INITIAL_ZOOM_DISTANCE_FIRST_PERSON = 3; +var KEY_A = 80; +var KEY_D = 80; + var easeOutCubic = function(t) { t--; return t * t * t + 1; @@ -77,17 +80,17 @@ CameraManager = function() { } var keyToActionMapping = { - "a": "orbitLeft", - "d": "orbitRight", - "w": "orbitForward", - "s": "orbitBackward", - "e": "orbitUp", - "c": "orbitDown", - - "LEFT": "orbitLeft", - "RIGHT": "orbitRight", - "UP": "orbitForward", - "DOWN": "orbitBackward", + 65: "orbitLeft", // "a" + 68: "orbitRight", // "d" + 87: "orbitForward", // "w" + 83: "orbitBackward",// "s" + 69: "orbitUp", // "e" + 67: "orbitDown", // "c" + + 16777234: "orbitLeft", //"LEFT" + 16777236: "orbitRight", //"RIGHT" + 16777235: "orbitForward", //"UP" + 16777237: "orbitBackward",//"DOWN" } var CAPTURED_KEYS = []; @@ -96,7 +99,7 @@ CameraManager = function() { } function getActionForKeyEvent(event) { - var action = keyToActionMapping[event.text]; + var action = keyToActionMapping[event.key]; if (action !== undefined) { if (event.isShifted) { if (action === "orbitForward") { From 97e45643b009fbcce63d2b05902508ffec910eb3 Mon Sep 17 00:00:00 2001 From: David Back Date: Wed, 1 Aug 2018 12:44:40 -0700 Subject: [PATCH 2/4] spacing --- scripts/system/libraries/entityCameraTool.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js index 3869ff2fe8..5f56c6edf6 100644 --- a/scripts/system/libraries/entityCameraTool.js +++ b/scripts/system/libraries/entityCameraTool.js @@ -80,17 +80,17 @@ CameraManager = function() { } var keyToActionMapping = { - 65: "orbitLeft", // "a" - 68: "orbitRight", // "d" - 87: "orbitForward", // "w" - 83: "orbitBackward",// "s" - 69: "orbitUp", // "e" - 67: "orbitDown", // "c" + 65: "orbitLeft", // "a" + 68: "orbitRight", // "d" + 87: "orbitForward", // "w" + 83: "orbitBackward", // "s" + 69: "orbitUp", // "e" + 67: "orbitDown", // "c" - 16777234: "orbitLeft", //"LEFT" - 16777236: "orbitRight", //"RIGHT" - 16777235: "orbitForward", //"UP" - 16777237: "orbitBackward",//"DOWN" + 16777234: "orbitLeft", // "LEFT" + 16777236: "orbitRight", // "RIGHT" + 16777235: "orbitForward", // "UP" + 16777237: "orbitBackward", // "DOWN" } var CAPTURED_KEYS = []; From f946bb73eff2ede58241547e8f6a350cb979d727 Mon Sep 17 00:00:00 2001 From: David Back Date: Wed, 1 Aug 2018 12:46:17 -0700 Subject: [PATCH 3/4] remove constants --- scripts/system/libraries/entityCameraTool.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js index 5f56c6edf6..36c45515e5 100644 --- a/scripts/system/libraries/entityCameraTool.js +++ b/scripts/system/libraries/entityCameraTool.js @@ -39,8 +39,6 @@ var EASING_MULTIPLIER = 8; var INITIAL_ZOOM_DISTANCE = 2; var INITIAL_ZOOM_DISTANCE_FIRST_PERSON = 3; -var KEY_A = 80; -var KEY_D = 80; var easeOutCubic = function(t) { t--; From cdbf75666fe22437145d58d815e128c1b2bf5951 Mon Sep 17 00:00:00 2001 From: David Back Date: Wed, 1 Aug 2018 12:46:49 -0700 Subject: [PATCH 4/4] new line --- scripts/system/libraries/entityCameraTool.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js index 36c45515e5..f554f45722 100644 --- a/scripts/system/libraries/entityCameraTool.js +++ b/scripts/system/libraries/entityCameraTool.js @@ -39,7 +39,6 @@ var EASING_MULTIPLIER = 8; var INITIAL_ZOOM_DISTANCE = 2; var INITIAL_ZOOM_DISTANCE_FIRST_PERSON = 3; - var easeOutCubic = function(t) { t--; return t * t * t + 1;