Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OpenVR to latest commit (based on 0.9.21) #12

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions DisplayExtractor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,7 @@ int main() {
std::cout << PREFIX << "Got " << numDevices
<< " tracked devices at startup" << std::endl;
for (decltype(numDevices) i = 0; i < numDevices; ++i) {
auto dev = vive.serverDevProvider().GetTrackedDeviceDriver(
i, vr::ITrackedDeviceServerDriver_Version);
auto dev = vive.serverDevProvider().GetTrackedDeviceDriver(i);
vive.devices().addAndActivateDevice(dev);
std::cout << PREFIX << "Device " << i << std::endl;
auto disp =
Expand Down
11 changes: 5 additions & 6 deletions OSVRViveTracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ namespace vive {
m_vive->serverDevProvider().LeaveStandby();

auto handleNewDevice = [&](const char *serialNum) {
auto dev = m_vive->serverDevProvider().FindTrackedDeviceDriver(
serialNum, vr::ITrackedDeviceServerDriver_Version);
auto dev =
m_vive->serverDevProvider().FindTrackedDeviceDriver(serialNum);
if (!dev) {
/// The only devices we usually can't look up by serial number
/// seem to be the lighthouse base stations.
Expand Down Expand Up @@ -195,8 +195,8 @@ namespace vive {
std::cout << PREFIX << "Got " << numDevices
<< " tracked devices at startup" << std::endl;
for (decltype(numDevices) i = 0; i < numDevices; ++i) {
auto dev = m_vive->serverDevProvider().GetTrackedDeviceDriver(
i, vr::ITrackedDeviceServerDriver_Version);
auto dev =
m_vive->serverDevProvider().GetTrackedDeviceDriver(i);
activateDevice(dev);
}
}
Expand Down Expand Up @@ -588,8 +588,7 @@ namespace vive {
true);
}
return std::make_pair(
m_vive->serverDevProvider().GetTrackedDeviceDriver(
unWhichDevice, vr::ITrackedDeviceServerDriver_Version),
m_vive->serverDevProvider().GetTrackedDeviceDriver(unWhichDevice),
false);
}

Expand Down
2 changes: 1 addition & 1 deletion vendor/openvr
Submodule openvr updated 436 files