Skip to content

Commit

Permalink
Oculus Rift|libappfw: Fixing up projection, head position
Browse files Browse the repository at this point in the history
  • Loading branch information
@skyjake
skyjake committed Aug 21, 2014
1 parent 2c1214b commit fdbb9cc
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 19 deletions.
4 changes: 4 additions & 0 deletions doomsday/libappfw/include/de/vr/oculusrift.h
View file
Expand Up @@ -72,6 +72,8 @@ class LIBAPPFW_PUBLIC OculusRift
*/
void setYawOffset(float yawRadians);

void resetTracking();

/**
* Sets a yaw offset that makes the current actual Oculus Rift yaw come out as zero.
*/
Expand All @@ -94,6 +96,8 @@ class LIBAPPFW_PUBLIC OculusRift
*/
Vector3f headPosition() const;

Vector3f eyeOffset() const;

/**
* Returns the eye pose for the current eye, including the head orientation and
* position in relation to the tracking origin.
Expand Down
43 changes: 29 additions & 14 deletions doomsday/libappfw/src/vr/oculusrift.cpp
View file
Expand Up @@ -53,7 +53,6 @@ DENG2_PIMPL(OculusRift)
ovrHmd hmd;
ovrEyeType currentEye;
ovrPosef headPose[2];
//bool needPose[2] { true, true };
ovrEyeRenderDesc render[2];
ovrTexture textures[2];
ovrFovPort fov[2];
Expand All @@ -63,6 +62,7 @@ DENG2_PIMPL(OculusRift)
Matrix4f eyeMatrix;
Vector3f pitchRollYaw;
Vector3f headPosition;
Vector3f eyeOffset;
float aspect = 1.f;

BaseWindow *window = nullptr;
Expand Down Expand Up @@ -135,13 +135,13 @@ DENG2_PIMPL(OculusRift)
{
Sizei size[2];
ovrFovPort fovMax;
float density = 0.75f;
for(int eye = 0; eye < 2; ++eye)
{
// Use the default FOV.
fov[eye] = hmd->DefaultEyeFov[eye];

size[eye] = ovrHmd_GetFovTextureSize(hmd, ovrEyeType(eye), fov[eye],
1.0f /*density*/);
size[eye] = ovrHmd_GetFovTextureSize(hmd, ovrEyeType(eye), fov[eye], density);
}

fovMax.LeftTan = max(fov[0].LeftTan, fov[1].LeftTan);
Expand Down Expand Up @@ -229,7 +229,7 @@ DENG2_PIMPL(OculusRift)
// Configure OpenGL.
ovrGLConfig cfg;
cfg.OGL.Header.API = ovrRenderAPI_OpenGL;
cfg.OGL.Header.RTSize = Sizei(buf.size().x, buf.size().y);
cfg.OGL.Header.RTSize = hmd->Resolution;
cfg.OGL.Header.Multisample = buf.sampleCount();
#ifdef WIN32
cfg.OGL.Window = window->nativeHandle();
Expand All @@ -241,6 +241,7 @@ DENG2_PIMPL(OculusRift)
return;
}

/*
for(int i = 0; i < 2; ++i)
{
qDebug() << "Eye:" << render[i].Eye
Expand All @@ -255,7 +256,7 @@ DENG2_PIMPL(OculusRift)
<< "ViewAdjust:" << render[i].ViewAdjust.x
<< render[i].ViewAdjust.y
<< render[i].ViewAdjust.z;
}
}*/

ovrHmd_AttachToWindow(hmd, window->nativeHandle(), NULL, NULL);

Expand Down Expand Up @@ -359,6 +360,10 @@ DENG2_PIMPL(OculusRift)
pose.Position.y,
pose.Position.z);

eyeOffset = Vector3f(render[currentEye].ViewAdjust.x,
render[currentEye].ViewAdjust.y,
render[currentEye].ViewAdjust.z);

// TODO: Rotation directly from quaternion?

eyeMatrix = Matrix4f::translate(headPosition)
Expand All @@ -367,9 +372,7 @@ DENG2_PIMPL(OculusRift)
Matrix4f::rotate(-radianToDegree(pitchRollYaw[0]), Vector3f(1, 0, 0)) *
Matrix4f::rotate(-radianToDegree(pitchRollYaw[2]), Vector3f(0, 1, 0))
*
Matrix4f::translate(Vector3f(render[currentEye].ViewAdjust.x,
render[currentEye].ViewAdjust.y,
render[currentEye].ViewAdjust.z));
Matrix4f::translate(-eyeOffset);
}

void beginFrame()
Expand Down Expand Up @@ -497,6 +500,16 @@ void OculusRift::setYawOffset(float yawRadians)
d->yawOffset = yawRadians;
}

void OculusRift::resetTracking()
{
#ifdef DENG_HAVE_OCULUS_API
if(d->isReady())
{
ovrHmd_RecenterPose(d->hmd);
}
#endif
}

void OculusRift::resetYaw()
{
d->yawOffset = -d->pitchRollYaw.z;
Expand Down Expand Up @@ -545,7 +558,7 @@ void OculusRift::update()

Vector3f OculusRift::headOrientation() const
{
if(d->frameOngoing) d->updateEyePose();
//if(d->frameOngoing) d->updateEyePose();

Vector3f pry = d->pitchRollYaw;
pry.z = wrap(pry.z + d->yawOffset, -PIf, PIf);
Expand All @@ -567,9 +580,6 @@ Vector3f OculusRift::headOrientation() const
Matrix4f OculusRift::eyePose() const
{
DENG2_ASSERT(isReady());
#ifdef DENG_HAVE_OCULUS_API
d->updateEyePose();
#endif
return d->eyeMatrix;
}

Expand All @@ -578,12 +588,17 @@ Vector3f OculusRift::headPosition() const
return d->headPosition;
}

Vector3f OculusRift::eyeOffset() const
{
return d->eyeOffset;
}

Matrix4f OculusRift::projection(float nearDist, float farDist) const
{
DENG2_ASSERT(isReady());
#ifdef DENG_HAVE_OCULUS_API
return ovrMatrix4f_Projection(d->fov[d->currentEye], nearDist, farDist,
false /* right-handed */).M[0];
return Matrix4f(ovrMatrix4f_Projection(d->fov[d->currentEye], nearDist, farDist,
true /* right-handed */).M[0]).transpose();
#else
DENG2_UNUSED2(nearDist, farDist);
return Matrix4f();
Expand Down
14 changes: 9 additions & 5 deletions doomsday/libappfw/src/vr/vrconfig.cpp
View file
Expand Up @@ -54,8 +54,12 @@ DENG2_PIMPL(VRConfig)
, riftFramebufferSamples(1)
, frustumShift(true)
, dominantEye(0.0f)
{}

float mapUnitsPerMeter() const
{
//ovr.init();
// 0.925 because eyes are not at top of head
return eyeHeightInMapUnits / (0.925 * playerPhysicalHeight);
}
};

Expand Down Expand Up @@ -91,9 +95,7 @@ void VRConfig::setCurrentEye(Eye eye)
{
float eyePos = (eye == NeitherEye? 0 : eye == LeftEye? -1 : 1);

// 0.925 because eyes are not at top of head
float mapUnitsPerMeter = d->eyeHeightInMapUnits / (0.925 * d->playerPhysicalHeight);
d->eyeShift = mapUnitsPerMeter * (eyePos - d->dominantEye) * 0.5 * d->ipd;
d->eyeShift = d->mapUnitsPerMeter() * (eyePos - d->dominantEye) * 0.5 * d->ipd;
if(d->swapEyes)
{
d->eyeShift *= -1;
Expand Down Expand Up @@ -214,7 +216,9 @@ Matrix4f VRConfig::projectionMatrix(float fovDegrees,
if(mode() == OculusRift)
{
// OVR will calculate our projection matrix.
return oculusRift().projection(nearClip, farClip);
float const mapUnits = d->mapUnitsPerMeter();
return oculusRift().projection(nearClip / mapUnits, farClip / mapUnits) *
Matrix4f::translate(oculusRift().eyeOffset() * mapUnits);
}

float const yfov = verticalFieldOfView(fovDegrees, viewPortSize);
Expand Down

0 comments on commit fdbb9cc

Please sign in to comment.