Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:56:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

AvatarUpdate: fix for very large dt

Browse source 
This was affecting threaded avatar update when enabled.
This commit is contained in:
Anthony J. Thibault 2015-11-30 15:21:04 -08:00
parent e2d9e37eb8
commit f922f61c3d
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/avatar/AvatarManager.cpp
View file

@ -356,7 +356,8 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
AudioInjector::playSound(collisionSoundURL, energyFactorOfFull, AVATAR_STRETCH_FACTOR, myAvatar->getPosition()); AudioInjector::playSound(collisionSoundURL, energyFactorOfFull, AVATAR_STRETCH_FACTOR, myAvatar->getPosition());
myAvatar->collisionWithEntity(collision); myAvatar->collisionWithEntity(collision);
return; } return;
}
} }
} }
} }

7
interface/src/avatar/AvatarUpdate.cpp
View file

@ -44,9 +44,12 @@ void AvatarUpdate::synchronousProcess() {
bool AvatarUpdate::process() { bool AvatarUpdate::process() {
PerformanceTimer perfTimer("AvatarUpdate"); PerformanceTimer perfTimer("AvatarUpdate");
quint64 start = usecTimestampNow(); quint64 start = usecTimestampNow();
quint64 deltaMicroseconds = start - _lastAvatarUpdate; quint64 deltaMicroseconds = 0;
_lastAvatarUpdate = start; if (_lastAvatarUpdate > 0) {
deltaMicroseconds = start - _lastAvatarUpdate;
}
float deltaSeconds = (float) deltaMicroseconds / (float) USECS_PER_SECOND; float deltaSeconds = (float) deltaMicroseconds / (float) USECS_PER_SECOND;
_lastAvatarUpdate = start;
qApp->setAvatarSimrateSample(1.0f / deltaSeconds); qApp->setAvatarSimrateSample(1.0f / deltaSeconds);
QSharedPointer<AvatarManager> manager = DependencyManager::get<AvatarManager>(); QSharedPointer<AvatarManager> manager = DependencyManager::get<AvatarManager>();