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

diff --git a/source/oculusriftcamera.cpp b/source/oculusriftcamera.cpp
index 8b98adb..33ed07f 100644
--- a/source/oculusriftcamera.cpp
+++ b/source/oculusriftcamera.cpp
@@ -10,12 +10,13 @@ OculusRiftCamera::OculusRiftCamera(const OculusRiftDevice &d, const GL::Camera &
 	base_camera(c)
 {
 	const OculusRiftDevice::Private &dev_priv = device.get_private();
-	unsigned supported = ovrTrackingCap_Orientation|ovrTrackingCap_MagYawCorrection;
+	unsigned supported = ovrTrackingCap_Orientation|ovrTrackingCap_MagYawCorrection|ovrTrackingCap_Position;
 	ovrHmd_ConfigureTracking(dev_priv.ovr_hmd, supported, 0);
 }
 
-OculusRiftCamera::~OculusRiftCamera()
+void OculusRiftCamera::reset_tracking()
 {
+	ovrHmd_RecenterPose(device.get_private().ovr_hmd);
 }
 
 void OculusRiftCamera::update()
@@ -23,13 +24,14 @@ void OculusRiftCamera::update()
 	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());