X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fheadtrackingcamera.cpp;h=9f4dd5c16768471c33e1a926f205021df50a3224;hp=86d6e24427d1ad2d1b08f9974be5a9b54ac16af8;hb=c3de3d030e663319289ce39aef1e8b21c3b47084;hpb=a0a8e3a7c5a229dcccd1af3a3edeac5ba8156954

diff --git a/source/headtrackingcamera.cpp b/source/headtrackingcamera.cpp
index 86d6e24..9f4dd5c 100644
--- a/source/headtrackingcamera.cpp
+++ b/source/headtrackingcamera.cpp
@@ -21,10 +21,12 @@ void HeadTrackingCamera::update_from_matrix(const GL::Matrix &hmd_matrix)
 	columns[0] = compose(right, 0.0f);
 	columns[1] = compose(up, 0.0f);
 	columns[2] = compose(cross(right, up), 0.0f);
-	columns[3] = compose(base_camera.get_position(), 1.0f);
-	GL::Matrix matrix = GL::Matrix::from_columns(columns)*hmd_matrix;
+	columns[3] = compose(base_camera.get_position()+base_camera.get_up_direction()*elevation_offset, 1.0f);
+	base_matrix = GL::Matrix::from_columns(columns);
 
-	set_position(matrix*GL::Vector3()+base_camera.get_up_direction()*elevation_offset);
+	GL::Matrix matrix = base_matrix*hmd_matrix;
+
+	set_position(matrix*GL::Vector3());
 	set_look_direction((matrix*GL::Vector4(0, 0, -1, 0)).slice<3>(0));
 	set_up_direction((matrix*GL::Vector4(0, 1, 0, 0)).slice<3>(0));