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

Tabs -> spaces, spacing fix.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-05-20 09:38:01 -07:00
parent ae02004ef6
commit 85bca558f5
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
interface/src/Camera.h
View file

@ -35,8 +35,8 @@ public:
void initialize(); // instantly put the camera at the ideal position and rotation. void initialize(); // instantly put the camera at the ideal position and rotation.
void update( float deltaTime ); void update( float deltaTime );
void setYaw ( float y ) { _yaw = y; } void setYaw ( float y ) { _yaw = y; }
void setPitch ( float p ) { _pitch = p; } void setPitch ( float p ) { _pitch = p; }
void setRoll ( float r ) { _roll = r; } void setRoll ( float r ) { _roll = r; }
@ -75,27 +75,27 @@ public:
private: private:
bool _needsToInitialize; bool _needsToInitialize;
CameraMode _mode; CameraMode _mode;
bool _frustumNeedsReshape; bool _frustumNeedsReshape;
glm::vec3 _position; glm::vec3 _position;
glm::vec3 _idealPosition; glm::vec3 _idealPosition;
glm::vec3 _targetPosition; glm::vec3 _targetPosition;
float _fieldOfView; float _fieldOfView;
float _aspectRatio; float _aspectRatio;
float _nearClip; float _nearClip;
float _farClip; float _farClip;
glm::vec3 _eyeOffsetPosition; glm::vec3 _eyeOffsetPosition;
glm::quat _eyeOffsetOrientation; glm::quat _eyeOffsetOrientation;
float _yaw; float _yaw;
float _pitch; float _pitch;
float _roll; float _roll;
float _upShift; float _upShift;
float _idealYaw; float _idealYaw;
float _idealPitch; float _idealPitch;
float _idealRoll; float _idealRoll;
float _distance; float _distance;
float _tightness; float _tightness;
Orientation _orientation; Orientation _orientation;
float _modeShift; float _modeShift;
CameraFollowingAttributes _attributes[NUM_CAMERA_MODES]; CameraFollowingAttributes _attributes[NUM_CAMERA_MODES];

10
libraries/voxels/src/ViewFrustum.h
View file

@ -66,11 +66,11 @@ public:
const glm::vec3& getRight() const { return _right; }; const glm::vec3& getRight() const { return _right; };
// setters for lens attributes // setters for lens attributes
void setFieldOfView ( float f ) { _fieldOfView = f; } void setFieldOfView ( float f ) { _fieldOfView = f; }
void setAspectRatio ( float a ) { _aspectRatio = a; } void setAspectRatio ( float a ) { _aspectRatio = a; }
void setNearClip ( float n ) { _nearClip = n; } void setNearClip ( float n ) { _nearClip = n; }
void setFarClip ( float f ) { _farClip = f; } void setFarClip ( float f ) { _farClip = f; }
void setEyeOffsetPosition (const glm::vec3& p) { _eyeOffsetPosition = p; } void setEyeOffsetPosition (const glm::vec3& p) { _eyeOffsetPosition = p; }
void setEyeOffsetOrientation (const glm::quat& o) { _eyeOffsetOrientation = o; } void setEyeOffsetOrientation (const glm::quat& o) { _eyeOffsetOrientation = o; }