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

Merge repairs.

Browse source
This commit is contained in:
Philip Rosedale 2013-04-30 13:49:42 -07:00
parent 6142372219
commit 55330cf14f
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/src/Avatar.cpp
View file

@ -111,8 +111,6 @@ Avatar::Avatar(bool isMine) {
_head.noise = 0; _head.noise = 0;
_movedHandOffset = glm::vec3( 0.0, 0.0, 0.0 ); _movedHandOffset = glm::vec3( 0.0, 0.0, 0.0 );
_usingBodySprings = true; _usingBodySprings = true;
_springForce = 6.0f;
_springVelocityDecay = 16.0f;
_renderYaw = 0.0; _renderYaw = 0.0;
_renderPitch = 0.0; _renderPitch = 0.0;
_sphere = NULL; _sphere = NULL;
@ -161,8 +159,6 @@ Avatar::Avatar(const Avatar &otherAvatar) {
_TEST_bigSpherePosition = otherAvatar._TEST_bigSpherePosition; _TEST_bigSpherePosition = otherAvatar._TEST_bigSpherePosition;
_movedHandOffset = otherAvatar._movedHandOffset; _movedHandOffset = otherAvatar._movedHandOffset;
_usingBodySprings = otherAvatar._usingBodySprings; _usingBodySprings = otherAvatar._usingBodySprings;
_springForce = otherAvatar._springForce;
_springVelocityDecay = otherAvatar._springVelocityDecay;
_orientation.set( otherAvatar._orientation ); _orientation.set( otherAvatar._orientation );
_sphere = NULL; _sphere = NULL;
@ -427,8 +423,23 @@ void Avatar::simulate(float deltaTime) {
// update head information // update head information
updateHead(deltaTime); updateHead(deltaTime);
// calculate speed, and use that to determine walking vs. standing
// Decay head back to center if turned on _speed = glm::length( _velocity );
float rotationalSpeed = fabs( _bodyYawDelta );
if ( _speed + rotationalSpeed > 0.2 ) {
_mode = AVATAR_MODE_WALKING;
} else {
_mode = AVATAR_MODE_INTERACTING;
}
}
void Avatar::updateHead(float deltaTime) {
// Decay head back to center if turned on
if (_returnHeadToCenter) { if (_returnHeadToCenter) {
// Decay back toward center // Decay back toward center
_headPitch *= (1.0f - DECAY * 2 * deltaTime); _headPitch *= (1.0f - DECAY * 2 * deltaTime);