fixed merge problem with shifted avatar

This commit is contained in:
ZappoMan 2013-04-16 15:41:38 -07:00
parent fcbf44cad9
commit edfb1501f1

View file

@ -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 );