X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Flibovr%2Flibovrcombiner.cpp;h=1022bfdda70ecf1dd2e2dcf263754c06fb62556d;hp=5eddb4a2f91e959065119b180a70f664515edca6;hb=80785cc981166c5faacfcc41476b3d2ffdb65c4a;hpb=31c28161d36749d040cbab0099b352f53cad232d

diff --git a/source/libovr/libovrcombiner.cpp b/source/libovr/libovrcombiner.cpp
index 5eddb4a..1022bfd 100644
--- a/source/libovr/libovrcombiner.cpp
+++ b/source/libovr/libovrcombiner.cpp
@@ -6,7 +6,6 @@
 
 using namespace std;
 
-
 namespace {
 
 const char vs_source[] =
@@ -82,13 +81,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 +121,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 +163,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();
 }