From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 4 Oct 2016 08:39:46 +0000 (+0300)
Subject: Fix a warning about a shadowed member variable
X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=commitdiff_plain;h=81d7a9bad0313e06ed154734d3f2a3120b26b6db

Fix a warning about a shadowed member variable
---

diff --git a/source/headtrackingcamera.cpp b/source/headtrackingcamera.cpp
index a296639..86d6e24 100644
--- a/source/headtrackingcamera.cpp
+++ b/source/headtrackingcamera.cpp
@@ -15,12 +15,12 @@ void HeadTrackingCamera::set_elevation_offset(float o)
 
 void HeadTrackingCamera::update_from_matrix(const GL::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));
+	const GL::Vector3 &up = base_camera.get_up_direction();
+	GL::Vector3 right = normalize(cross(base_camera.get_look_direction(), up));
 	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[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;