From bf3c4fa1f8ec324baffdb34ae353875e0651f6a8 Mon Sep 17 00:00:00 2001 From: atlante45 Date: Mon, 15 Jul 2013 12:04:24 -0700 Subject: [PATCH] Avatar resizing final commit --- interface/src/Application.cpp | 12 ++++++------ interface/src/Avatar.cpp | 4 ++-- interface/src/Camera.cpp | 16 ++++++++-------- interface/src/Camera.h | 1 + libraries/avatars/src/AvatarData.cpp | 1 - 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 056d9b2fa9..a795398b23 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1183,21 +1183,21 @@ void Application::setRenderThirdPerson(bool thirdPerson) { } void Application::increaseAvatarSize() { - if (3.0f < _myAvatar.getScale() + 0.25f) { + if (5.0f < _myAvatar.getScale() + 0.05f) { return; } - _myAvatar.setScale(_myAvatar.getScale() + 0.25f); - _myCamera.setScale(_myAvatar.getScale() + 0.25f); + _myAvatar.setScale(_myAvatar.getScale() + 0.05f); + _myCamera.setScale(_myAvatar.getScale() + 0.05f); } void Application::decreaseAvatarSize() { - if (_myAvatar.getScale() + 0.25f < 0.25f) { + if (_myAvatar.getScale() - 0.05f < 0.15f) { return; } - _myAvatar.setScale(_myAvatar.getScale() - 0.25f); - _myCamera.setScale(_myAvatar.getScale() - 0.25f); + _myAvatar.setScale(_myAvatar.getScale() - 0.05f); + _myCamera.setScale(_myAvatar.getScale() - 0.05f); } void Application::setFrustumOffset(bool frustumOffset) { diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 08d977d975..b384b61da3 100755 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -575,13 +575,13 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) { _bodyYawDelta *= bodySpinMomentum; _bodyRollDelta *= bodySpinMomentum; - const float MAX_STATIC_FRICTION_VELOCITY = _scale * 0.5f; + const float MAX_STATIC_FRICTION_VELOCITY = 0.5f; const float STATIC_FRICTION_STRENGTH = _scale * 20.f; applyStaticFriction(deltaTime, _velocity, MAX_STATIC_FRICTION_VELOCITY, STATIC_FRICTION_STRENGTH); const float LINEAR_DAMPING_STRENGTH = 1.0f; const float SPEED_BRAKE_POWER = _scale * 10.0f; - const float SQUARED_DAMPING_STRENGTH = _scale * 0.2f; + const float SQUARED_DAMPING_STRENGTH = 0.2f; if (_speedBrakes) { applyDamping(deltaTime, _velocity, LINEAR_DAMPING_STRENGTH * SPEED_BRAKE_POWER, SQUARED_DAMPING_STRENGTH * SPEED_BRAKE_POWER); } else { diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp index 5ad728d30c..8aaec5b899 100644 --- a/interface/src/Camera.cpp +++ b/interface/src/Camera.cpp @@ -92,14 +92,14 @@ void Camera::updateFollowMode(float deltaTime) { if (_needsToInitialize || (_tightness == 0.0f)) { _rotation = _targetRotation; - _idealPosition = _targetPosition + _rotation * glm::vec3(0.0f, _upShift, _distance); + _idealPosition = _targetPosition + _scale * (_rotation * glm::vec3(0.0f, _upShift, _distance)); _position = _idealPosition; _needsToInitialize = false; } else { // pull rotation towards ideal _rotation = safeMix(_rotation, _targetRotation, t); - _idealPosition = _targetPosition + _rotation * glm::vec3(0.0f, _upShift, _distance); + _idealPosition = _targetPosition + _scale * (_rotation * glm::vec3(0.0f, _upShift, _distance)); _position += (_idealPosition - _position) * t; } } @@ -124,18 +124,18 @@ void Camera::setMode(CameraMode m) { _previousTightness = _tightness; if (_mode == CAMERA_MODE_THIRD_PERSON) { - _newUpShift = _scale * CAMERA_THIRD_PERSON_MODE_UP_SHIFT; - _newDistance = _scale * CAMERA_THIRD_PERSON_MODE_DISTANCE; + _newUpShift = CAMERA_THIRD_PERSON_MODE_UP_SHIFT; + _newDistance = CAMERA_THIRD_PERSON_MODE_DISTANCE; _newTightness = CAMERA_THIRD_PERSON_MODE_TIGHTNESS; } else if (_mode == CAMERA_MODE_FIRST_PERSON) { - _newUpShift = _scale * CAMERA_FIRST_PERSON_MODE_UP_SHIFT; - _newDistance = _scale * CAMERA_FIRST_PERSON_MODE_DISTANCE; + _newUpShift = CAMERA_FIRST_PERSON_MODE_UP_SHIFT; + _newDistance = CAMERA_FIRST_PERSON_MODE_DISTANCE; _newTightness = CAMERA_FIRST_PERSON_MODE_TIGHTNESS; } else if (_mode == CAMERA_MODE_MIRROR) { - _newUpShift = _scale * CAMERA_MIRROR_MODE_UP_SHIFT; - _newDistance = _scale * CAMERA_MIRROR_MODE_DISTANCE; + _newUpShift = CAMERA_MIRROR_MODE_UP_SHIFT; + _newDistance = CAMERA_MIRROR_MODE_DISTANCE; _newTightness = CAMERA_MIRROR_MODE_TIGHTNESS; } } diff --git a/interface/src/Camera.h b/interface/src/Camera.h index e890bad400..d83a36ee16 100644 --- a/interface/src/Camera.h +++ b/interface/src/Camera.h @@ -59,6 +59,7 @@ public: float getFarClip () { return _scale * _farClip; } const glm::vec3& getEyeOffsetPosition () { return _eyeOffsetPosition; } const glm::quat& getEyeOffsetOrientation () { return _eyeOffsetOrientation; } + float getScale () { return _scale; } bool getFrustumNeedsReshape(); // call to find out if the view frustum needs to be reshaped void setFrustumWasReshaped(); // call this after reshaping the view frustum. diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 99961df988..e198336f54 100755 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -200,7 +200,6 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) { sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t*) sourceBuffer, &_bodyPitch); sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t*) sourceBuffer, &_bodyRoll); sourceBuffer += unpackFloatRatioFromTwoByte( sourceBuffer, _newScale); - std::cout << "New Scale : " << _newScale << std::endl; // Head rotation (NOTE: This needs to become a quaternion to save two bytes) float headYaw, headPitch, headRoll;