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

cleanup

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/AvatarTouch.cpp
View file

@ -75,7 +75,7 @@ void AvatarTouch::render(glm::vec3 cameraPosition) {
p.y = 0.0005f; p.y = 0.0005f;
renderCircle(p, _reachableRadius, glm::vec3(0.0f, 1.0f, 0.0f), 30); 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) { if (_weAreHoldingHands) {
renderBeamBetweenHands(); renderBeamBetweenHands();

2
interface/src/Camera.cpp
View file

@ -83,7 +83,7 @@ void Camera::updateFollowMode(float deltaTime) {
if (_linearModeShift < 1.0f) { if (_linearModeShift < 1.0f) {
_linearModeShift += _modeShiftRate * deltaTime; _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; _upShift = _previousUpShift * (1.0f - _modeShift) + _newUpShift * _modeShift;
_distance = _previousDistance * (1.0f - _modeShift) + _newDistance * _modeShift; _distance = _previousDistance * (1.0f - _modeShift) + _newDistance * _modeShift;