From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 5 Oct 2016 23:31:00 +0000 (+0300)
Subject: Apply s/device/system/ to member variables as well
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=a0a8e3a7c5a229dcccd1af3a3edeac5ba8156954;p=libs%2Fvr.git

Apply s/device/system/ to member variables as well
---

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])));
diff --git a/source/libovr/libovrcamera.h b/source/libovr/libovrcamera.h
index 44495b0..f570a56 100644
--- a/source/libovr/libovrcamera.h
+++ b/source/libovr/libovrcamera.h
@@ -11,7 +11,7 @@ class LibOVRSystem;
 class LibOVRCamera: public HeadTrackingCamera
 {
 private:
-	const LibOVRSystem &device;
+	const LibOVRSystem &system;
 
 public:
 	LibOVRCamera(const LibOVRSystem &, const GL::Camera &);
diff --git a/source/libovr/libovrcombiner.cpp b/source/libovr/libovrcombiner.cpp
index 5eddb4a..fc3ed67 100644
--- a/source/libovr/libovrcombiner.cpp
+++ b/source/libovr/libovrcombiner.cpp
@@ -82,13 +82,13 @@ struct LibOVRCombiner::Frustum: StereoCombiner::Frustum
 
 
 LibOVRCombiner::LibOVRCombiner(LibOVRSystem &d, GL::View &v):
-	device(d),
+	system(d),
 	view(v),
 	left_mesh((GL::VERTEX2, GL::TEXCOORD2,0, GL::TEXCOORD2,1, GL::TEXCOORD2,2, GL::TEXCOORD2,3)),
 	right_mesh((GL::VERTEX2, GL::TEXCOORD2,0, GL::TEXCOORD2,1, GL::TEXCOORD2,2, GL::TEXCOORD2,3)),
 	shprog(vs_source, fs_source)
 {
-	ovrHmd hmd = device.get_private().ovr_hmd;
+	ovrHmd hmd = system.get_private().ovr_hmd;
 
 	ovrFovPort left_fov = hmd->DefaultEyeFov[ovrEye_Left];
 	ovrFovPort right_fov = hmd->DefaultEyeFov[ovrEye_Right];
@@ -122,24 +122,24 @@ LibOVRCombiner::LibOVRCombiner(LibOVRSystem &d, GL::View &v):
 	right_shdata.uniform("uv_scale", uv_scale_offset[0].x, -uv_scale_offset[0].y);
 	right_shdata.uniform("uv_offset", uv_scale_offset[1].x, 1-uv_scale_offset[1].y);
 
-	device.configure_window(view.get_window());
+	system.configure_window(view.get_window());
 }
 
 void LibOVRCombiner::prepare() const
 {
-	device.begin_frame();
+	system.begin_frame();
 }
 
 void LibOVRCombiner::render(const GL::Texture2D &left, const GL::Texture2D &right) const
 {
 	GL::Bind bind_shprog(shprog);
 
-	ovrHmd hmd = device.get_private().ovr_hmd;
+	ovrHmd hmd = system.get_private().ovr_hmd;
 
-	if(device.is_timing_active())
+	if(system.is_timing_active())
 	{
-		ovr_WaitTillTime(device.get_timewarp_time());
-		ovrTrackingState state = ovrHmd_GetTrackingState(hmd, device.get_tracking_time());
+		ovr_WaitTillTime(system.get_timewarp_time());
+		ovrTrackingState state = ovrHmd_GetTrackingState(hmd, system.get_tracking_time());
 
 		ovrMatrix4f matrices[2];
 		ovrHmd_GetEyeTimewarpMatrices(hmd, ovrEye_Left, state.HeadPose.ThePose, matrices);
@@ -164,7 +164,7 @@ void LibOVRCombiner::render(const GL::Texture2D &left, const GL::Texture2D &righ
 	right_mesh.draw();
 
 	view.get_context().swap_buffers();
-	device.end_frame();
+	system.end_frame();
 }
 
 
diff --git a/source/libovr/libovrcombiner.h b/source/libovr/libovrcombiner.h
index 789de55..8ea8ce6 100644
--- a/source/libovr/libovrcombiner.h
+++ b/source/libovr/libovrcombiner.h
@@ -21,7 +21,7 @@ class LibOVRCombiner: public StereoCombiner
 private:
 	struct Frustum;
 
-	LibOVRSystem &device;
+	LibOVRSystem &system;
 	GL::View &view;
 	GL::Mesh left_mesh;
 	GL::Mesh right_mesh;
diff --git a/source/openvr/openvrcamera.cpp b/source/openvr/openvrcamera.cpp
index d6a0fe6..3e7b9d7 100644
--- a/source/openvr/openvrcamera.cpp
+++ b/source/openvr/openvrcamera.cpp
@@ -7,7 +7,7 @@ namespace VR {
 
 OpenVRCamera::OpenVRCamera(const OpenVRSystem &d, const GL::Camera &c):
 	HeadTrackingCamera(c),
-	device(d)
+	system(d)
 { }
 
 void OpenVRCamera::reset_tracking()
@@ -17,7 +17,7 @@ void OpenVRCamera::reset_tracking()
 
 void OpenVRCamera::update()
 {
-	update_from_matrix(device.get_hmd_matrix());
+	update_from_matrix(system.get_hmd_matrix());
 }
 
 } // namespace VR
diff --git a/source/openvr/openvrcamera.h b/source/openvr/openvrcamera.h
index ab14d3d..ef0d2fc 100644
--- a/source/openvr/openvrcamera.h
+++ b/source/openvr/openvrcamera.h
@@ -11,7 +11,7 @@ class OpenVRSystem;
 class OpenVRCamera: public HeadTrackingCamera
 {
 private:
-	const OpenVRSystem &device;
+	const OpenVRSystem &system;
 
 public:
 	OpenVRCamera(const OpenVRSystem &, const GL::Camera &);
diff --git a/source/openvr/openvrcombiner.cpp b/source/openvr/openvrcombiner.cpp
index 20b485e..85a0e2a 100644
--- a/source/openvr/openvrcombiner.cpp
+++ b/source/openvr/openvrcombiner.cpp
@@ -12,7 +12,7 @@ struct OpenVRCombiner::Private
 
 
 OpenVRCombiner::OpenVRCombiner(OpenVRSystem &d, GL::View &v):
-	device(d),
+	system(d),
 	view(v)
 {
 	vr::IVRSystem *vr_sys = vr::VRSystem();
@@ -31,7 +31,7 @@ OpenVRCombiner::OpenVRCombiner(OpenVRSystem &d, GL::View &v):
 
 void OpenVRCombiner::prepare() const
 {
-	device.update_pose_matrices();
+	system.update_pose_matrices();
 }
 
 void OpenVRCombiner::render(const GL::Texture2D &left, const GL::Texture2D &right) const
diff --git a/source/openvr/openvrcombiner.h b/source/openvr/openvrcombiner.h
index 5b9e3b4..33f266c 100644
--- a/source/openvr/openvrcombiner.h
+++ b/source/openvr/openvrcombiner.h
@@ -14,7 +14,7 @@ class OpenVRCombiner: public StereoCombiner
 private:
 	struct Private;
 
-	OpenVRSystem &device;
+	OpenVRSystem &system;
 	GL::View &view;
 
 public: