Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

guard sixense from updating before activated

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-10-14 15:32:10 -07:00
parent f051a84dc6
commit 4107f4ea9f
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
View file

@ -122,6 +122,7 @@ void SixenseManager::activate() {
#endif
loadSettings();
sixenseInit();
_activated = true;
#endif
}
@ -138,6 +139,7 @@ void SixenseManager::deactivate() {
#endif
sixenseExit();
_activated = false;
#ifdef __APPLE__
delete _sixenseLibrary;
@ -157,6 +159,9 @@ void SixenseManager::setSixenseFilter(bool filter) {
}
void SixenseManager::update(float deltaTime, bool jointsCaptured) {
if (!_activated) {
return;
}
#ifdef HAVE_SIXENSE
_buttonPressedMap.clear();

3
libraries/input-plugins/src/input-plugins/SixenseManager.h
View file

@ -117,6 +117,9 @@ private:
static const QString NAME;
static const QString HYDRA_ID_STRING;
bool _activated = false;
};
#endif // hifi_SixenseManager_h