TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add basic rotation offset code

Browse source
This commit is contained in:
James Urquhart 2016-05-23 00:45:19 +01:00
parent 784f6f92d8
commit e6c89b1f24
2 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Engine/source/platform/input/openVR/openVRProvider.cpp
View file

@ -106,6 +106,8 @@ namespace OpenVRUtil
return KEY_BUTTON1;
case vr::VRMouseButton_Middle:
return KEY_BUTTON2;
default:
return KEY_NULL;
}
}
@ -224,6 +226,10 @@ U32 OpenVRProvider::OVR_AXISTRACKPAD[vr::k_unMaxTrackedDeviceCount] = { 0 };
U32 OpenVRProvider::OVR_AXISJOYSTICK[vr::k_unMaxTrackedDeviceCount] = { 0 };
U32 OpenVRProvider::OVR_AXISTRIGGER[vr::k_unMaxTrackedDeviceCount] = { 0 };
EulerF OpenVRProvider::smHMDRotOffset(0);
F32 OpenVRProvider::smHMDmvYaw = 0;
F32 OpenVRProvider::smHMDmvPitch = 0;
static String GetTrackedDeviceString(vr::IVRSystem *pHmd, vr::TrackedDeviceIndex_t unDevice, vr::TrackedDeviceProperty prop, vr::TrackedPropertyError *peError = NULL)
{
uint32_t unRequiredBufferLen = pHmd->GetStringTrackedDeviceProperty(unDevice, prop, NULL, 0, peError);
@ -384,6 +390,13 @@ void OpenVRProvider::staticInit()
Con::setIntVariable("$OpenVR::OverlayFlags_SendVRScrollEvents", 1 << (U32)vr::VROverlayFlags_SendVRScrollEvents);
Con::setIntVariable("$OpenVR::OverlayFlags_SendVRTouchpadEvents", 1 << (U32)vr::VROverlayFlags_SendVRTouchpadEvents);
Con::setIntVariable("$OpenVR::OverlayFlags_ShowTouchPadScrollWheel", 1 << (U32)vr::VROverlayFlags_ShowTouchPadScrollWheel);
Con::addVariable("$OpenVR::HMDRotOffsetX", TypeF32, &smHMDRotOffset.x);
Con::addVariable("$OpenVR::HMDRotOffsetY", TypeF32, &smHMDRotOffset.y);
Con::addVariable("$OpenVR::HMDRotOffsetZ", TypeF32, &smHMDRotOffset.z);
Con::addVariable("$OpenVR::HMDmvYaw", TypeF32, &smHMDmvYaw);
Con::addVariable("$OpenVR::HMDmvPitch", TypeF32, &smHMDmvPitch);
}
bool OpenVRProvider::enable()
@ -558,6 +571,22 @@ bool OpenVRProvider::process()
if (!vr::VRCompositor())
return true;
// Update HMD rotation offset
smHMDRotOffset.z += smHMDmvYaw;
smHMDRotOffset.x += smHMDmvPitch;
while (smHMDRotOffset.x < -M_PI_F)
smHMDRotOffset.x += M_2PI_F;
while (smHMDRotOffset.x > M_PI_F)
smHMDRotOffset.x -= M_2PI_F;
while (smHMDRotOffset.z < -M_PI_F)
smHMDRotOffset.z += M_2PI_F;
while (smHMDRotOffset.z > M_PI_F)
smHMDRotOffset.z -= M_2PI_F;
smHMDmvYaw = 0;
smHMDmvPitch = 0;
// Process SteamVR events
vr::VREvent_t event;
while (mHMD->PollNextEvent(&event, sizeof(event)))
@ -932,6 +961,16 @@ void OpenVRProvider::updateTrackedPoses()
if (nDevice == vr::k_unTrackedDeviceIndex_Hmd)
{
mHMDRenderState.mHMDPose = mat;
MatrixF rotOffset(1);
EulerF localRot(-smHMDRotOffset.x, -smHMDRotOffset.z, smHMDRotOffset.y);
// NOTE: offsetting before is probably the best we're going to be able to do here, since if we apply the matrix AFTER
// we will get correct movements relative to the camera HOWEVER this also distorts any future movements from the HMD since
// we will then be on a really weird rotation axis.
QuatF(localRot).setMatrix(&rotOffset);
rotOffset.inverse();
mHMDRenderState.mHMDPose = rotOffset * mHMDRenderState.mHMDPose;
// jamesu - store the last rotation for temp debugging
MatrixF torqueMat(1);
OpenVRUtil::convertTransformFromOVR(mat, torqueMat);

6
Engine/source/platform/input/openVR/openVRProvider.h
View file

@ -278,6 +278,12 @@ public:
static U32 OVR_AXISJOYSTICK[vr::k_unMaxTrackedDeviceCount];
static U32 OVR_AXISTRIGGER[vr::k_unMaxTrackedDeviceCount];
/// @name HMD Rotation offset
/// {
static EulerF smHMDRotOffset;
static F32 smHMDmvYaw;
static F32 smHMDmvPitch;
/// }
public:
// For ManagedSingleton.