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

only active sixsense palms

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-01-04 12:26:30 -08:00
parent 218ae9c9d8
commit 89e499a78f
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/devices/SixenseManager.cpp
View file

@ -146,11 +146,6 @@ void SixenseManager::update(float deltaTime) {
#ifdef HAVE_SIXENSE #ifdef HAVE_SIXENSE
Hand* hand = Application::getInstance()->getAvatar()->getHand(); Hand* hand = Application::getInstance()->getAvatar()->getHand();
if (_isInitialized && _isEnabled) { if (_isInitialized && _isEnabled) {
// Disable the hands (and return to default pose) if both controllers are at base station
for (std::vector<PalmData>::iterator it = hand->getPalms().begin(); it != hand->getPalms().end(); it++) {
it->setActive(!_controllersAtBase);
}
#ifdef __APPLE__ #ifdef __APPLE__
SixenseBaseFunction sixenseGetNumActiveControllers = SixenseBaseFunction sixenseGetNumActiveControllers =
(SixenseBaseFunction) _sixenseLibrary->resolve("sixenseGetNumActiveControllers"); (SixenseBaseFunction) _sixenseLibrary->resolve("sixenseGetNumActiveControllers");
@ -213,6 +208,14 @@ void SixenseManager::update(float deltaTime) {
qDebug("Found new Sixense controller, ID %i", data->controller_index); qDebug("Found new Sixense controller, ID %i", data->controller_index);
} }
// Disable the hands (and return to default pose) if both controllers are at base station
if (foundHand) {
palm->setActive(!_controllersAtBase);
} else {
palm->setActive(false); // if this isn't a Sixsense ID palm, always make it inactive
}
// Read controller buttons and joystick into the hand // Read controller buttons and joystick into the hand
palm->setControllerButtons(data->buttons); palm->setControllerButtons(data->buttons);
palm->setTrigger(data->trigger); palm->setTrigger(data->trigger);