X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Foculusriftcamera.cpp;h=33ed07f261dc35180b5a0dc88727f6ea0be6782e;hp=2a8af2b020c345a0e8b4f9b172edfc13a457c4b6;hb=a6b7e23d5d47c37284480651a9686be01f28a82a;hpb=acd60fff1e7374c819cb8c4eb6a6143b990dd40b

diff --git a/source/oculusriftcamera.cpp b/source/oculusriftcamera.cpp
index 2a8af2b..33ed07f 100644
--- 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,29 +7,31 @@ 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(dev_priv.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];
+	ovrTrackingState state = ovrHmd_GetTrackingState(device.get_private().ovr_hmd, ovr_GetTimeInSeconds());
+	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());