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

fix bug that was introducing a local velocity to an entity when it was parented to a moving avatar

Browse source
This commit is contained in:
Seth Alves 2019-01-15 11:36:08 -08:00 committed by Andrew Meadows
parent d64858b1c7
commit 2bf7ac2745
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/entities/src/EntityItemProperties.cpp
View file

@ -3833,22 +3833,22 @@ void EntityItemProperties::copySimulationRestrictedProperties(const EntityItemPo
setParentJointIndex(entity->getParentJointIndex()); setParentJointIndex(entity->getParentJointIndex());
} }
if (!_localPositionChanged && !_positionChanged) { if (!_localPositionChanged && !_positionChanged) {
setPosition(entity->getWorldPosition()); setLocalPosition(entity->getLocalPosition());
} }
if (!_localRotationChanged && !_rotationChanged) { if (!_localRotationChanged && !_rotationChanged) {
setRotation(entity->getWorldOrientation()); setLocalRotation(entity->getLocalOrientation());
} }
if (!_localVelocityChanged && !_velocityChanged) { if (!_localVelocityChanged && !_velocityChanged) {
setVelocity(entity->getWorldVelocity()); setLocalVelocity(entity->getLocalVelocity());
} }
if (!_localAngularVelocityChanged && !_angularVelocityChanged) { if (!_localAngularVelocityChanged && !_angularVelocityChanged) {
setAngularVelocity(entity->getWorldAngularVelocity()); setLocalAngularVelocity(entity->getLocalAngularVelocity());
} }
if (!_accelerationChanged) { if (!_accelerationChanged) {
setAcceleration(entity->getAcceleration()); setAcceleration(entity->getAcceleration());
} }
if (!_localDimensionsChanged && !_dimensionsChanged) { if (!_localDimensionsChanged && !_dimensionsChanged) {
setDimensions(entity->getScaledDimensions()); setLocalDimensions(entity->getUnscaledDimensions());
} }
} }