Chromatic aberration correction is always included in distortion

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

diff --git a/source/oculusriftcamera.cpp b/source/oculusriftcamera.cpp
index 9b85d12e8f474e32d5bb4372d271e0263e785fa0..0eede270de864b92f17bf18031c0d012cf2b1a65 100644 (file)
--- a/source/oculusriftcamera.cpp
+++ b/source/oculusriftcamera.cpp
@@ -1,5 +1,4 @@
 #include "oculusriftcamera.h"
-#include "oculusriftcamera_private.h"
 #include "oculusriftdevice.h"
 #include "oculusriftdevice_private.h"
 
@@ -8,32 +7,41 @@ namespace VR {
 
 OculusRiftCamera::OculusRiftCamera(const OculusRiftDevice &d, const GL::Camera &c):
        device(d),
-       base_camera(c),
-       priv(new Private)
+       base_camera(c)
 {
-       const OculusRiftDevice::Private &dev_priv = device.get_private();
-       priv->ovr_sensor = dev_priv.ovr_hmd->GetSensor();
-       priv->fusion.AttachToSensor(priv->ovr_sensor);
+       unsigned supported = ovrTrackingCap_Orientation|ovrTrackingCap_MagYawCorrection|ovrTrackingCap_Position;
+       ovrHmd_ConfigureTracking(device.get_private().ovr_hmd, supported, 0);
 }
 
-OculusRiftCamera::~OculusRiftCamera()
+void OculusRiftCamera::reset_tracking()
 {
-       delete priv;
+       ovrHmd_RecenterPose(device.get_private().ovr_hmd);
 }
 
 void OculusRiftCamera::update()
 {
-       OVR::Matrix4f sensor_matrix = priv->fusion.GetOrientation();
-       const float *m = &sensor_matrix.M[0][0];
+       double time;
+       if(device.is_timing_active())
+               time = device.get_tracking_time();
+       else
+               time = device.get_current_time();
+
+       ovrTrackingState state = ovrHmd_GetTrackingState(device.get_private().ovr_hmd, time);
+       OVR::Posef head_pose = state.HeadPose.ThePose;
+       OVR::Matrix4f tracking_matrix(head_pose.Rotation);
+       OVR::Vector3f trans = head_pose.Translation;
+       const float *m = &tracking_matrix.M[0][0];
 
        const GL::Vector3 &base_look = base_camera.get_look_direction();
        GL::Vector3 base_right = normalize(cross(base_look, base_camera.get_up_direction()));
        GL::Vector3 base_up = normalize(cross(base_right, base_look));
 
-       set_position(base_camera.get_position());
+       set_position(base_camera.get_position()+trans.x*base_right+trans.y*base_up-trans.z*base_look);
        set_up_direction(base_right*m[1]+base_up*m[5]-base_look*m[9]);
        set_look_direction(-base_right*m[2]-base_up*m[6]+base_look*m[10]);
        set_depth_clip(base_camera.get_near_clip(), base_camera.get_far_clip());
+       set_field_of_view(base_camera.get_field_of_view());
+       set_aspect(base_camera.get_aspect());
 }
 
 } // namespace VR