mirror of
https://github.com/AleziaKurdis/overte.git
synced 2025-07-10 19:58:15 +02:00
fixed merge problem with shifted avatar
This commit is contained in:
parent
fcbf44cad9
commit
edfb1501f1
1 changed files with 0 additions and 5 deletions
|
@ -45,13 +45,8 @@ void Camera::update( float deltaTime )
|
||||||
}
|
}
|
||||||
|
|
||||||
_position += ( _idealPosition - _position ) * t;
|
_position += ( _idealPosition - _position ) * t;
|
||||||
_yaw += ( _idealYaw - _yaw ) * t;
|
|
||||||
|
|
||||||
//roll = 20.0;
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
// generate the ortho-normals for the orientation based on the Euler angles
|
// generate the ortho-normals for the orientation based on the Euler angles
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
_orientation.setToIdentity();
|
_orientation.setToIdentity();
|
||||||
_orientation.yaw ( _yaw );
|
_orientation.yaw ( _yaw );
|
||||||
_orientation.pitch ( _pitch );
|
_orientation.pitch ( _pitch );
|
||||||
|
|
Loading…
Reference in a new issue