From a319db3cb43f420fea3c9ee27eff39aa474876cc Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 20 Jan 2017 00:57:48 +0000 Subject: [PATCH] removed duplicate code --- interface/src/scripting/HMDScriptingInterface.h | 3 --- scripts/system/controllers/handControllerGrab.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/interface/src/scripting/HMDScriptingInterface.h b/interface/src/scripting/HMDScriptingInterface.h index e242c6eade..0b09278d16 100644 --- a/interface/src/scripting/HMDScriptingInterface.h +++ b/interface/src/scripting/HMDScriptingInterface.h @@ -31,7 +31,6 @@ class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Depen Q_PROPERTY(bool showTablet READ getShouldShowTablet) Q_PROPERTY(QUuid tabletID READ getCurrentTableUIID WRITE setCurrentTabletUIID) Q_PROPERTY(unsigned int homeButtonID READ getCurrentHomeButtonUUID WRITE setCurrentHomeButtonUUID) - Q_PROPERTY(QUuid tabletEntityID READ getCurrentTabletEntityID WRITE setCurrentTabletEntityID) public: @@ -96,8 +95,6 @@ public: void setCurrentHomeButtonUUID(unsigned int homeButtonID) { _homeButtonID = homeButtonID; } unsigned int getCurrentHomeButtonUUID() { return _homeButtonID; } - void setCurrentTabletEntityID(QUuid tabletEntityID) {_tabletEntityID = tabletEntityID; } - QUuid getCurrentTabletEntityID() { return _tabletEntityID; } private: bool _showTablet { false }; diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index f3e41ef360..6c8a165ade 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -1700,7 +1700,7 @@ function MyController(hand) { }; this.isTablet = function (entityID) { - if (entityID === HMD.tabletEntityID) { // XXX what's a better way to know this? + if (entityID === HMD.tabletID) { // XXX what's a better way to know this? return true; } return false;