X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fheadtrackingcamera.cpp;fp=source%2Fheadtrackingcamera.cpp;h=a296639315634c0f2f4feb689dd988e81746bd49;hp=42eedd5d90caa21543776a47d95049069b99e587;hb=b70741a6810b7fe822212dd6fa9110f674a47036;hpb=0b9fa4d7eb2acb22f5f4f31bbd508d0216421108

diff --git a/source/headtrackingcamera.cpp b/source/headtrackingcamera.cpp
index 42eedd5..a296639 100644
--- a/source/headtrackingcamera.cpp
+++ b/source/headtrackingcamera.cpp
@@ -15,7 +15,14 @@ void HeadTrackingCamera::set_elevation_offset(float o)
 
 void HeadTrackingCamera::update_from_matrix(const GL::Matrix &hmd_matrix)
 {
-	GL::Matrix matrix = base_camera.get_object_matrix()*hmd_matrix;
+	const GL::Vector3 &up_dir = base_camera.get_up_direction();
+	GL::Vector3 right_dir = normalize(cross(base_camera.get_look_direction(), up_dir));
+	GL::Vector4 columns[4];
+	columns[0] = compose(right_dir, 0.0f);
+	columns[1] = compose(up_dir, 0.0f);
+	columns[2] = compose(cross(right_dir, up_dir), 0.0f);
+	columns[3] = compose(base_camera.get_position(), 1.0f);
+	GL::Matrix matrix = GL::Matrix::from_columns(columns)*hmd_matrix;
 
 	set_position(matrix*GL::Vector3()+base_camera.get_up_direction()*elevation_offset);
 	set_look_direction((matrix*GL::Vector4(0, 0, -1, 0)).slice<3>(0));