From edfb1501f1386a6c5eeda5499a19a465c93cadba Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 16 Apr 2013 15:41:38 -0700 Subject: [PATCH] fixed merge problem with shifted avatar --- interface/src/Camera.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp index 08cf7cb713..a74aace71e 100644 --- a/interface/src/Camera.cpp +++ b/interface/src/Camera.cpp @@ -45,13 +45,8 @@ void Camera::update( float deltaTime ) } _position += ( _idealPosition - _position ) * t; - _yaw += ( _idealYaw - _yaw ) * t; - //roll = 20.0; - - //------------------------------------------------------------------------- // generate the ortho-normals for the orientation based on the Euler angles - //------------------------------------------------------------------------- _orientation.setToIdentity(); _orientation.yaw ( _yaw ); _orientation.pitch ( _pitch );