Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-15 15:59:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removed duplicate code

Browse source
This commit is contained in:
Dante Ruiz 2017-01-20 00:57:48 +00:00
parent 1e7e4576cc
commit a319db3cb4
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/scripting/HMDScriptingInterface.h
View file

@ -31,7 +31,6 @@ class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Depen
Q_PROPERTY(bool showTablet READ getShouldShowTablet) Q_PROPERTY(bool showTablet READ getShouldShowTablet)
Q_PROPERTY(QUuid tabletID READ getCurrentTableUIID WRITE setCurrentTabletUIID) Q_PROPERTY(QUuid tabletID READ getCurrentTableUIID WRITE setCurrentTabletUIID)
Q_PROPERTY(unsigned int homeButtonID READ getCurrentHomeButtonUUID WRITE setCurrentHomeButtonUUID) Q_PROPERTY(unsigned int homeButtonID READ getCurrentHomeButtonUUID WRITE setCurrentHomeButtonUUID)
Q_PROPERTY(QUuid tabletEntityID READ getCurrentTabletEntityID WRITE setCurrentTabletEntityID)
public: public:
@ -96,8 +95,6 @@ public:
void setCurrentHomeButtonUUID(unsigned int homeButtonID) { _homeButtonID = homeButtonID; } void setCurrentHomeButtonUUID(unsigned int homeButtonID) { _homeButtonID = homeButtonID; }
unsigned int getCurrentHomeButtonUUID() { return _homeButtonID; } unsigned int getCurrentHomeButtonUUID() { return _homeButtonID; }
void setCurrentTabletEntityID(QUuid tabletEntityID) {_tabletEntityID = tabletEntityID; }
QUuid getCurrentTabletEntityID() { return _tabletEntityID; }
private: private:
bool _showTablet { false }; bool _showTablet { false };

2
scripts/system/controllers/handControllerGrab.js
View file

@ -1700,7 +1700,7 @@ function MyController(hand) {
}; };
this.isTablet = function (entityID) { 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 true;
} }
return false; return false;