X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Flibovr%2Flibovrcamera.cpp;h=b4c6f2c564c8aab03563743e3cb629719aed5c2d;hp=744608619a5926dabb77de836ae31a9966d30564;hb=a0a8e3a7c5a229dcccd1af3a3edeac5ba8156954;hpb=81d7a9bad0313e06ed154734d3f2a3120b26b6db

diff --git a/source/libovr/libovrcamera.cpp b/source/libovr/libovrcamera.cpp
index 7446086..b4c6f2c 100644
--- a/source/libovr/libovrcamera.cpp
+++ b/source/libovr/libovrcamera.cpp
@@ -7,26 +7,26 @@ namespace VR {
 
 LibOVRCamera::LibOVRCamera(const LibOVRSystem &d, const GL::Camera &c):
 	HeadTrackingCamera(c),
-	device(d)
+	system(d)
 {
 	unsigned supported = ovrTrackingCap_Orientation|ovrTrackingCap_MagYawCorrection|ovrTrackingCap_Position;
-	ovrHmd_ConfigureTracking(device.get_private().ovr_hmd, supported, 0);
+	ovrHmd_ConfigureTracking(system.get_private().ovr_hmd, supported, 0);
 }
 
 void LibOVRCamera::reset_tracking()
 {
-	ovrHmd_RecenterPose(device.get_private().ovr_hmd);
+	ovrHmd_RecenterPose(system.get_private().ovr_hmd);
 }
 
 void LibOVRCamera::update()
 {
 	double time;
-	if(device.is_timing_active())
-		time = device.get_tracking_time();
+	if(system.is_timing_active())
+		time = system.get_tracking_time();
 	else
-		time = device.get_current_time();
+		time = system.get_current_time();
 
-	ovrTrackingState state = ovrHmd_GetTrackingState(device.get_private().ovr_hmd, time);
+	ovrTrackingState state = ovrHmd_GetTrackingState(system.get_private().ovr_hmd, time);
 	OVR::Posef head_pose = state.HeadPose.ThePose;
 	OVR::Matrix4f tracking_matrix(head_pose);
 	update_from_matrix(transpose(GL::Matrix(&tracking_matrix.M[0][0])));