Simplify hmd handle access in a couple of places

[libs/vr.git] / source / oculusriftcombiner.cpp

diff --git a/source/oculusriftcombiner.cpp b/source/oculusriftcombiner.cpp
index a9808de75a4c72a059b4365a9d499bbc1e4a1fc6..5e76cc8305a21ee6c3594ee666d9d50076016ade 100644 (file)
--- a/source/oculusriftcombiner.cpp
+++ b/source/oculusriftcombiner.cpp
@@ -82,8 +82,7 @@ OculusRiftCombiner::OculusRiftCombiner(const OculusRiftDevice &d):
        right_mesh((GL::VERTEX2, GL::TEXCOORD2,0, GL::TEXCOORD2,1, GL::TEXCOORD2,2, GL::TEXCOORD1,3)),
        shprog(vs_source, fs_source)
 {
-       const OculusRiftDevice::Private &dev_priv = device.get_private();
-       ovrHmd hmd = dev_priv.ovr_hmd;
+       ovrHmd hmd = device.get_private().ovr_hmd;
 
        ovrFovPort left_fov = hmd->DefaultEyeFov[ovrEye_Left];
        ovrFovPort right_fov = hmd->DefaultEyeFov[ovrEye_Right];
@@ -92,7 +91,7 @@ OculusRiftCombiner::OculusRiftCombiner(const OculusRiftDevice &d):
 
        float inner = max(left_fov.RightTan, right_fov.LeftTan);
        float outer = max(left_fov.LeftTan, right_fov.RightTan);
-       frustum_skew = (inner-outer)*2/(inner+outer);
+       frustum_skew = (inner-outer)/(inner+outer);
 
        left_fov.UpTan = right_fov.UpTan = vertical;
        left_fov.DownTan = right_fov.DownTan = vertical;