formatting changes

This commit is contained in:
Jeffrey Ventrella 2013-05-17 09:52:19 -07:00
parent 0edf72a2be
commit ade5b7bec3
4 changed files with 13 additions and 22 deletions

View file

@ -122,15 +122,6 @@ void Camera::updateFollowMode(float deltaTime) {
_upShift = _attributes[_mode].upShift * _modeShift + _previousAttributes[_mode].upShift * inverseModeShift; _upShift = _attributes[_mode].upShift * _modeShift + _previousAttributes[_mode].upShift * inverseModeShift;
_distance = _attributes[_mode].distance * _modeShift + _previousAttributes[_mode].distance * inverseModeShift; _distance = _attributes[_mode].distance * _modeShift + _previousAttributes[_mode].distance * inverseModeShift;
_upShift = _attributes[_mode].upShift * _modeShift + _previousAttributes[_mode].upShift * inverseModeShift; _upShift = _attributes[_mode].upShift * _modeShift + _previousAttributes[_mode].upShift * inverseModeShift;
/*
//transition to the attributes of the current mode
_upShift += (_attributes[_mode].upShift - _upShift ) * deltaTime * MODE_SHIFT_RATE;
_distance += (_attributes[_mode].distance - _distance ) * deltaTime * MODE_SHIFT_RATE;
_tightness += (_attributes[_mode].tightness - _tightness) * deltaTime * MODE_SHIFT_RATE;
*/
} }

View file

@ -40,7 +40,7 @@ public:
glm::vec3 getApproximateEyePosition(); glm::vec3 getApproximateEyePosition();
// Do you want head to try to return to center (depends on interface detected) // Do you want head to try to return to center (depends on interface detected)
void setReturnToCenter(bool r) { _returnHeadToCenter = r; } void setReturnToCenter(bool returnHeadToCenter) { _returnHeadToCenter = returnHeadToCenter; }
const bool getReturnToCenter() const { return _returnHeadToCenter; } const bool getReturnToCenter() const { return _returnHeadToCenter; }
float getAverageLoudness() {return _averageLoudness;}; float getAverageLoudness() {return _averageLoudness;};

View file

@ -25,12 +25,12 @@ void Orientation::setToIdentity() {
front = glm::vec3(IDENTITY_FRONT); front = glm::vec3(IDENTITY_FRONT);
} }
void Orientation::setToPitchYawRoll(float p, float y, float r) { void Orientation::setToPitchYawRoll(float pitch_change, float yaw_change, float roll_change) {
setToIdentity(); setToIdentity();
pitch(p); pitch(pitch_change);
yaw (y); yaw (yaw_change);
roll (r); roll (roll_change);
} }
@ -102,10 +102,10 @@ void Orientation::roll(float angle) {
} }
} }
void Orientation::rotate(float p, float y, float r) { void Orientation::rotate(float pitch_change, float yaw_change, float roll_change) {
pitch(p); pitch(pitch_change);
yaw (y); yaw (yaw_change);
roll (r); roll (roll_change);
} }
void Orientation::rotate(glm::vec3 eulerAngles) { void Orientation::rotate(glm::vec3 eulerAngles) {

View file

@ -22,12 +22,12 @@ public:
Orientation(); Orientation();
void set(Orientation); void set(Orientation);
void setToPitchYawRoll(float p, float y, float r); void setToPitchYawRoll(float pitch_change, float yaw_change, float roll_change);
void setToIdentity(); void setToIdentity();
void pitch(float p); void pitch(float pitch_change);
void yaw (float y); void yaw (float yaw_change);
void roll (float r); void roll (float roll_change);
void rotate(float pitch, float yaw, float roll); void rotate(float pitch, float yaw, float roll);
void rotate(glm::vec3 EulerAngles); void rotate(glm::vec3 EulerAngles);