Refactor|Oculus Rift: Migrated head tracking to libappfw

de::OculusRift accesses LibOVR and provides head tracking information.
skyjake · Jan 30, 2014 · f22b329 · f22b329
1 parent ad9e78b
commit f22b329
Show file tree

Hide file tree

Showing 28 changed files with 439 additions and 362 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -37,7 +37,6 @@ include(../dep_deng1.pri)
 include(../dep_shell.pri)
 include(../dep_gui.pri)
 include(../dep_appfw.pri)
-include(../dep_rift.pri)
 
 # Definitions ----------------------------------------------------------------
 

diff --git a/doomsday/client/include/render/vr.h b/doomsday/client/include/render/vr.h
@@ -22,7 +22,7 @@
 
 #include "dd_types.h"
 
-#include <de/Vector>
+#include <de/OculusRift>
 
 namespace de {
 
@@ -55,61 +55,11 @@ class VRConfig
         NUM_STEREO_MODES
     };
 
-    /**
-     * State parameters for Oculus Rift.
-     */
-    class OculusRift {
-    public:
-        OculusRift();
-
-        bool init();
-
-        void deinit();
-
-        void setRiftLatency(float latency);
-
-        // True if Oculus Rift is enabled and can report head orientation.
-        bool isReady() const;
-
-        void update();
-
-        // Called to allow head orientation to change again.
-        void allowUpdate();
-
-        // Returns current pitch, roll, yaw angles, in radians. If no head tracking is available,
-        // the returned values are not valid.
-        Vector3f headOrientation() const;
-
-        float interpupillaryDistance() const;
-
-        // Use screen size instead of resolution in case non-square pixels?
-        float aspect() const { return 0.5f * _screenSize.x / _screenSize.y; }
-        Vector2f const &screenSize() const { return _screenSize; }
-        Vector4f const &chromAbParam() const { return _chromAbParam; }
-        float distortionScale() const;
-        float fovX() const; // in degrees
-        float fovY() const; // in degrees
-        Vector4f const &hmdWarpParam() const { return _hmdWarpParam; }
-        float lensSeparationDistance() const { return _lensSeparationDistance; }
-
-    private:
-        DENG2_PRIVATE(d)
-
-        Vector2f _screenSize;
-        float _lensSeparationDistance;
-        Vector4f _hmdWarpParam;
-        Vector4f _chromAbParam;
-        float _eyeToScreenDistance;
-
-    public:
-        float riftLatency;
-    };
-
 public:
     VRConfig();
 
-    OculusRift &ovr();
-    OculusRift const &ovr() const;
+    OculusRift &oculusRift();
+    OculusRift const &oculusRift() const;
 
     /// Currently active stereo rendering mode.
     StereoMode mode() const;
@@ -157,9 +107,6 @@ void consoleRegister();
 
 float riftFovX(); ///< Horizontal field of view in Oculus Rift in degrees
 
-// To release memory and resources when done, for tidiness.
-//void deleteOculusTracker();
-
 // Load Oculus Rift parameters via Rift SDK
 bool loadRiftParameters();
 

diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp
@@ -2372,7 +2372,7 @@ int DD_GetInteger(int ddvalue)
         return (int) GL_PrepareLSTexture(LST_DYNAMIC);
 
     case DD_USING_HEAD_TRACKING:
-        return vrCfg.mode() == VRConfig::ModeOculusRift && vrCfg.ovr().isReady();
+        return vrCfg.mode() == VRConfig::ModeOculusRift && vrCfg.oculusRift().isReady();
 #endif
 
     case DD_NUMLUMPS:

diff --git a/doomsday/client/src/gl/gl_main.cpp b/doomsday/client/src/gl/gl_main.cpp
@@ -564,7 +564,7 @@ Matrix4f GL_GetProjectionMatrix()
 
     if (vrCfg.mode() == VRConfig::ModeOculusRift)
     {
-        aspect = vrCfg.ovr().aspect();
+        aspect = vrCfg.oculusRift().aspect();
         // A little trigonometry to apply aspect ratio to angles
         float x = tan(0.5 * de::degreeToRadian(Rend_FieldOfView()));
         yfov = de::radianToDegree(2.0 * atan2(x/aspect, 1.0f));

diff --git a/doomsday/client/src/render/rend_main.cpp b/doomsday/client/src/render/rend_main.cpp
@@ -540,9 +540,9 @@ Matrix4f Rend_GetModelViewMatrix(int consoleNum, bool useAngles)
              * these values and is syncing with them independently (however, game has more
              * latency).
              */
-            if((vrCfg.mode() == VRConfig::ModeOculusRift) && vrCfg.ovr().isReady())
+            if((vrCfg.mode() == VRConfig::ModeOculusRift) && vrCfg.oculusRift().isReady())
             {
-                Vector3f const pry = vrCfg.ovr().headOrientation();
+                Vector3f const pry = vrCfg.oculusRift().headOrientation();
 
                 // Use angles directly from the Rift for best response.
                 roll  = -radianToDegree(pry[1]);

diff --git a/doomsday/client/src/render/viewports.cpp b/doomsday/client/src/render/viewports.cpp
@@ -872,7 +872,7 @@ DENG_EXTERN_C void R_RenderPlayerView(int num)
 
     // Latest possible time to check the real head angles. After this we'll be
     // using the provided values.
-    vrCfg.ovr().update();
+    vrCfg.oculusRift().update();
 
     R_SetupPlayerSprites();
 
@@ -1324,7 +1324,7 @@ angle_t viewer_t::angle() const
     {
         // Apply the actual, current yaw offset. The game has omitted the "body yaw"
         // portion from the value already.
-        a += (fixed_t)(radianToDegree(vrCfg.ovr().headOrientation()[2]) / 180 * ANGLE_180);
+        a += (fixed_t)(radianToDegree(vrCfg.oculusRift().headOrientation()[2]) / 180 * ANGLE_180);
     }
     return a;
 }