This commit is contained in:
Jeffrey Ventrella 2013-05-26 15:23:44 -07:00
parent 883d21a5e4
commit 2b31e79a0b
2 changed files with 2 additions and 2 deletions

View file

@ -75,7 +75,7 @@ void AvatarTouch::render(glm::vec3 cameraPosition) {
p.y = 0.0005f;
renderCircle(p, _reachableRadius, glm::vec3(0.0f, 1.0f, 0.0f), 30);
// show if we are golding hands...
// show if we are holding hands...
if (_weAreHoldingHands) {
renderBeamBetweenHands();

View file

@ -83,7 +83,7 @@ void Camera::updateFollowMode(float deltaTime) {
if (_linearModeShift < 1.0f) {
_linearModeShift += _modeShiftRate * deltaTime;
_modeShift = ONE_HALF - ONE_HALF * cosf(_linearModeShift * PIE * 1.0);
_modeShift = ONE_HALF - ONE_HALF * cosf(_linearModeShift * PIE );
_upShift = _previousUpShift * (1.0f - _modeShift) + _newUpShift * _modeShift;
_distance = _previousDistance * (1.0f - _modeShift) + _newDistance * _modeShift;