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

Moved device class check into handleTrackedObject

Browse source
This commit is contained in:
Anthony J. Thibault 2017-04-06 13:20:00 -07:00
parent 42262aac78
commit 4e49774d0e
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -142,13 +142,7 @@ void ViveControllerManager::InputDevice::update(float deltaTime, const controlle
// collect poses for all generic trackers // collect poses for all generic trackers
for (int i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) { for (int i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) {
if (_system->GetTrackedDeviceClass(i) == vr::TrackedDeviceClass_GenericTracker) { handleTrackedObject(i, inputCalibrationData);
handleTrackedObject(i, inputCalibrationData);
} else {
uint32_t poseIndex = controller::TRACKED_OBJECT_00 + i;
controller::Pose invalidPose;
_poseStateMap[poseIndex] = invalidPose;
}
} }
// handle haptics // handle haptics
@ -177,6 +171,7 @@ void ViveControllerManager::InputDevice::handleTrackedObject(uint32_t deviceInde
uint32_t poseIndex = controller::TRACKED_OBJECT_00 + deviceIndex; uint32_t poseIndex = controller::TRACKED_OBJECT_00 + deviceIndex;
if (_system->IsTrackedDeviceConnected(deviceIndex) && if (_system->IsTrackedDeviceConnected(deviceIndex) &&
_system->GetTrackedDeviceClass(deviceIndex) == vr::TrackedDeviceClass_GenericTracker &&
_nextSimPoseData.vrPoses[deviceIndex].bPoseIsValid && _nextSimPoseData.vrPoses[deviceIndex].bPoseIsValid &&
poseIndex <= controller::TRACKED_OBJECT_15) { poseIndex <= controller::TRACKED_OBJECT_15) {