Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 17:24:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

trying to get around git confusion

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-04-16 15:54:20 -07:00
commit dcd6aafb77
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Camera.cpp
View file

@ -46,12 +46,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 );

13
interface/src/Camera.h
View file

@ -29,19 +29,6 @@ public:
void update( float deltaTime );
/*
void setMode ( CameraMode m ) { mode = m; }
void setYaw ( float y ) { idealYaw = y; }
void setPitch ( float p ) { pitch = p; }
void setRoll ( float r ) { roll = r; }
void setUp ( float u ) { up = u; }
void setDistance ( float d ) { distance = d; }
void setTargetPosition ( glm::vec3 t ) { targetPosition = t; }
void setPosition ( glm::vec3 p ) { position = p; }
void setTightness ( float t ) { tightness = t; }
void setOrientation ( Orientation o ) { orientation.set(o); }
*/
void setMode ( CameraMode m ) { _mode = m; }
void setYaw ( float y ) { _idealYaw = y; }
void setPitch ( float p ) { _pitch = p; }