Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 20:58:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not shut down hydra when it says there are no devices. Count to

Browse source 
allowedHydraFailures in settings.
This commit is contained in:
howard-stearns 2015-10-26 19:27:22 -07:00
parent 5e66207bc6
commit cbade6a095
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,7 +167,10 @@ void SixenseManager::update(float deltaTime, bool jointsCaptured) {
if (sixenseGetNumActiveControllers() == 0) {
if (_hydrasConnected) {
qCDebug(inputplugins, "hydra disconnected");
qCDebug(inputplugins) << "hydra disconnected" << _badDataCount;
if (_badDataCount++ < _allowedBadDataCount) { // gotta get some no-active in a row before we shut things down
return;
}
}
_hydrasConnected = false;
if (_deviceID != 0) {
@ -181,6 +184,7 @@ void SixenseManager::update(float deltaTime, bool jointsCaptured) {
PerformanceTimer perfTimer("sixense");
if (!_hydrasConnected) {
_hydrasConnected = true;
_badDataCount = 0;
registerToUserInputMapper(*userInputMapper);
assignDefaultInputMapping(*userInputMapper);
UserActivityLogger::getInstance().connectedDevice("spatial_controller", "hydra");
@ -555,6 +559,7 @@ void SixenseManager::saveSettings() const {
settings.setVec3Value(QString("avatarPosition"), _avatarPosition);
settings.setQuatValue(QString("avatarRotation"), _avatarRotation);
settings.setValue(QString("reachLength"), QVariant(_reachLength));
settings.setValue(QString("allowedHydraFailures"), 120);
}
settings.endGroup();
}
@ -567,6 +572,7 @@ void SixenseManager::loadSettings() {
settings.getVec3ValueIfValid(QString("avatarPosition"), _avatarPosition);
settings.getQuatValueIfValid(QString("avatarRotation"), _avatarRotation);
settings.getFloatValueIfValid(QString("reachLength"), _reachLength);
_allowedBadDataCount = settings.value(QString("allowedHydraFailures"), 120).toInt();
}
settings.endGroup();
}

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

@ -114,6 +114,8 @@ private:
#endif
bool _hydrasConnected;
int _badDataCount;
int _allowedBadDataCount;
static const QString NAME;
static const QString HYDRA_ID_STRING;