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

Merge pull request #14620 from amantley/hmdSmoothFix

Browse source 
VIVE can now auto-detect hmd and desktop modes
This commit is contained in:
Jeff Clinton 2019-01-02 09:15:32 -08:00 committed by GitHub
commit 7143689ddf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -671,8 +671,6 @@ void OpenVrDisplayPlugin::postPreview() {
PoseData nextRender, nextSim; PoseData nextRender, nextSim;
nextRender.frameIndex = presentCount(); nextRender.frameIndex = presentCount();
_hmdActivityLevel = _system->GetTrackedDeviceActivityLevel(vr::k_unTrackedDeviceIndex_Hmd);
if (!_threadedSubmit) { if (!_threadedSubmit) {
vr::VRCompositor()->WaitGetPoses(nextRender.vrPoses, vr::k_unMaxTrackedDeviceCount, nextSim.vrPoses, vr::VRCompositor()->WaitGetPoses(nextRender.vrPoses, vr::k_unMaxTrackedDeviceCount, nextSim.vrPoses,
vr::k_unMaxTrackedDeviceCount); vr::k_unMaxTrackedDeviceCount);
@ -692,7 +690,7 @@ void OpenVrDisplayPlugin::postPreview() {
} }
bool OpenVrDisplayPlugin::isHmdMounted() const { bool OpenVrDisplayPlugin::isHmdMounted() const {
return _hmdActivityLevel == vr::k_EDeviceActivityLevel_UserInteraction; return isHeadInHeadset();
} }
void OpenVrDisplayPlugin::updatePresentPose() { void OpenVrDisplayPlugin::updatePresentPose() {

2
plugins/openvr/src/OpenVrDisplayPlugin.h
View file

@ -37,6 +37,7 @@ class OpenVrDisplayPlugin : public HmdDisplayPlugin {
public: public:
bool isSupported() const override; bool isSupported() const override;
const QString getName() const override; const QString getName() const override;
bool getSupportsAutoSwitch() override final { return true; }
glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override; glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override;
glm::mat4 getCullingProjection(const glm::mat4& baseProjection) const override; glm::mat4 getCullingProjection(const glm::mat4& baseProjection) const override;
@ -78,7 +79,6 @@ protected:
private: private:
vr::IVRSystem* _system { nullptr }; vr::IVRSystem* _system { nullptr };
std::atomic<vr::EDeviceActivityLevel> _hmdActivityLevel { vr::k_EDeviceActivityLevel_Unknown };
std::atomic<uint32_t> _keyboardSupressionCount{ 0 }; std::atomic<uint32_t> _keyboardSupressionCount{ 0 };
vr::HmdMatrix34_t _lastGoodHMDPose; vr::HmdMatrix34_t _lastGoodHMDPose;

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

@ -37,6 +37,11 @@ static int refCount { 0 };
static Mutex mutex; static Mutex mutex;
static vr::IVRSystem* activeHmd { nullptr }; static vr::IVRSystem* activeHmd { nullptr };
static bool _openVrQuitRequested { false }; static bool _openVrQuitRequested { false };
static bool _headInHeadset { false };
bool isHeadInHeadset() {
return _headInHeadset;
}
bool openVrQuitRequested() { bool openVrQuitRequested() {
return _openVrQuitRequested; return _openVrQuitRequested;
@ -272,6 +277,15 @@ void handleOpenVrEvents() {
default: default:
break; break;
} }
if (event.data.controller.button == vr::k_EButton_ProximitySensor) {
vr::VRControllerState_t controllerState = vr::VRControllerState_t();
if (activeHmd->GetControllerState(vr::k_unTrackedDeviceIndex_Hmd, &controllerState, sizeof(vr::VRControllerState_t))) {
ulong promitySensorFlag = (1UL << ((int)vr::k_EButton_ProximitySensor));
_headInHeadset = (controllerState.ulButtonPressed & promitySensorFlag) == promitySensorFlag;
}
}
#if DEV_BUILD #if DEV_BUILD
qDebug() << "OpenVR: Event " << activeHmd->GetEventTypeNameFromEnum((vr::EVREventType)event.eventType) << "(" << event.eventType << ")"; qDebug() << "OpenVR: Event " << activeHmd->GetEventTypeNameFromEnum((vr::EVREventType)event.eventType) << "(" << event.eventType << ")";
#endif #endif

1
plugins/openvr/src/OpenVrHelpers.h
View file

@ -23,6 +23,7 @@ vr::IVRSystem* acquireOpenVrSystem();
void releaseOpenVrSystem(); void releaseOpenVrSystem();
void handleOpenVrEvents(); void handleOpenVrEvents();
bool openVrQuitRequested(); bool openVrQuitRequested();
bool isHeadInHeadset();
void enableOpenVrKeyboard(PluginContainer* container); void enableOpenVrKeyboard(PluginContainer* container);
void disableOpenVrKeyboard(); void disableOpenVrKeyboard();
bool isOpenVrKeyboardShown(); bool isOpenVrKeyboardShown();