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

don't do simple simulation on children of avatars

Browse source
This commit is contained in:
Seth Alves 2016-06-08 12:17:07 -07:00
parent 201d7a7d3b
commit a1766539f4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities/src/EntitySimulation.cpp
View file

@ -261,7 +261,11 @@ void EntitySimulation::moveSimpleKinematics(const quint64& now) {
SetOfEntities::iterator itemItr = _simpleKinematicEntities.begin();
while (itemItr != _simpleKinematicEntities.end()) {
EntityItemPointer entity = *itemItr;
if (entity->isMovingRelativeToParent() && !entity->getPhysicsInfo()) {
if (entity->isMovingRelativeToParent() &&
!entity->getPhysicsInfo() &&
// The entity-server doesn't know where avatars are, so don't attempt to do simple extrapolation for
// children of avatars.
!entity->hasAncestorOfType(NestableType::Avatar)) {
entity->simulate(now);
_entitiesToSort.insert(entity);
++itemItr;