From 189f6f544061a3a65abdcc88b32261dc20b0f55e Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 15 Jun 2020 08:04:51 +1200 Subject: [PATCH] Code review --- .../controllers/controllerModules/trackedHandTablet.js | 8 +------- .../controllers/controllerModules/trackedHandWalk.js | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/system/controllers/controllerModules/trackedHandTablet.js b/scripts/system/controllers/controllerModules/trackedHandTablet.js index 6bb9d67ef8..66cf408af8 100644 --- a/scripts/system/controllers/controllerModules/trackedHandTablet.js +++ b/scripts/system/controllers/controllerModules/trackedHandTablet.js @@ -94,13 +94,7 @@ Script.include("/~/system/libraries/controllers.js"); }; this.isReady = function (controllerData) { - if (!handsAreTracked()) { - return makeRunningValues(false, [], []); - } else if (this.gestureCompleted) { - return makeRunningValues(true, [], []); - } else { - return makeRunningValues(false, [], []); - } + return makeRunningValues(handsAreTracked() && this.gestureCompleted, [], []); }; this.run = function (controllerData) { diff --git a/scripts/system/controllers/controllerModules/trackedHandWalk.js b/scripts/system/controllers/controllerModules/trackedHandWalk.js index 92549eaa81..9ecc53a1fa 100644 --- a/scripts/system/controllers/controllerModules/trackedHandWalk.js +++ b/scripts/system/controllers/controllerModules/trackedHandWalk.js @@ -105,13 +105,7 @@ Script.include("/~/system/libraries/controllers.js"); }; this.isReady = function (controllerData) { - if (!handsAreTracked()) { - return makeRunningValues(false, [], []); - } else if (this.walkingForward || this.walkingBackward) { - return makeRunningValues(true, [], []); - } else { - return makeRunningValues(false, [], []); - } + return makeRunningValues(handsAreTracked() && (this.walkingForward || this.walkingBackward), [], []); }; this.run = function (controllerData) {