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

Restore split behavior for inputs/displays on quit

Browse source
This commit is contained in:
Atlante45 2016-06-20 14:15:45 -07:00
parent 882ad2f6fb
commit 45921a5c8d
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -161,7 +161,10 @@ static bool isBadPose(vr::HmdMatrix34_t* mat) {
bool OpenVrDisplayPlugin::beginFrameRender(uint32_t frameIndex) { bool OpenVrDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
handleOpenVrEvents(); handleOpenVrEvents();
if (openVrQuitRequested()) {
QMetaObject::invokeMethod(qApp, "quit");
return false;
}
double displayFrequency = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_DisplayFrequency_Float); double displayFrequency = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_DisplayFrequency_Float);
double frameDuration = 1.f / displayFrequency; double frameDuration = 1.f / displayFrequency;
double vsyncToPhotons = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_SecondsFromVsyncToPhotons_Float); double vsyncToPhotons = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_SecondsFromVsyncToPhotons_Float);

8
plugins/openvr/src/OpenVrHelpers.cpp
View file

@ -34,6 +34,11 @@ using Lock = std::unique_lock<Mutex>;
static int refCount { 0 }; static int refCount { 0 };
static Mutex mutex; static Mutex mutex;
static vr::IVRSystem* activeHmd { nullptr }; static vr::IVRSystem* activeHmd { nullptr };
static bool _openVrQuitRequested { false };
bool openVrQuitRequested() {
return _openVrQuitRequested;
}
static const uint32_t RELEASE_OPENVR_HMD_DELAY_MS = 5000; static const uint32_t RELEASE_OPENVR_HMD_DELAY_MS = 5000;
@ -99,6 +104,7 @@ void releaseOpenVrSystem() {
qCDebug(displayplugins) << "OpenVR: zero refcount, deallocate VR system"; qCDebug(displayplugins) << "OpenVR: zero refcount, deallocate VR system";
#endif #endif
vr::VR_Shutdown(); vr::VR_Shutdown();
_openVrQuitRequested = false;
activeHmd = nullptr; activeHmd = nullptr;
} }
} }
@ -257,8 +263,8 @@ void handleOpenVrEvents() {
while (activeHmd->PollNextEvent(&event, sizeof(event))) { while (activeHmd->PollNextEvent(&event, sizeof(event))) {
switch (event.eventType) { switch (event.eventType) {
case vr::VREvent_Quit: case vr::VREvent_Quit:
_openVrQuitRequested = true;
activeHmd->AcknowledgeQuit_Exiting(); activeHmd->AcknowledgeQuit_Exiting();
QMetaObject::invokeMethod(qApp, "quit");
break; break;
case vr::VREvent_KeyboardDone: case vr::VREvent_KeyboardDone:

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

@ -214,6 +214,10 @@ void ViveControllerManager::renderHand(const controller::Pose& pose, gpu::Batch&
void ViveControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) { void ViveControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
auto userInputMapper = DependencyManager::get<controller::UserInputMapper>(); auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
handleOpenVrEvents(); handleOpenVrEvents();
if (openVrQuitRequested()) {
deactivate();
return;
}
// because update mutates the internal state we need to lock // because update mutates the internal state we need to lock
userInputMapper->withLock([&, this]() { userInputMapper->withLock([&, this]() {