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

back out unrelated change

Browse source
This commit is contained in:
Seth Alves 2015-05-27 15:10:27 -07:00
parent c933c42b18
commit ded79609de
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/entities/src/EntityItem.cpp
View file

@ -321,11 +321,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
// if this bitstream indicates that this node is the simulation owner, ignore any physics-related updates. // if this bitstream indicates that this node is the simulation owner, ignore any physics-related updates.
glm::vec3 savePosition = _position; glm::vec3 savePosition = _position;
glm::quat saveRotation = _rotation; glm::quat saveRotation = _rotation;
glm::vec3 saveVelocity = _velocity; // glm::vec3 saveVelocity = _velocity;
glm::vec3 saveAngularVelocity = _angularVelocity; // glm::vec3 saveAngularVelocity = _angularVelocity;
glm::vec3 saveGravity = _gravity; // glm::vec3 saveGravity = _gravity;
glm::vec3 saveAcceleration = _acceleration; // glm::vec3 saveAcceleration = _acceleration;
uint32_t saveFlags = _dirtyFlags;
// Header bytes // Header bytes
@ -627,15 +626,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
// this node, so our version has to be newer than what the packet contained. // this node, so our version has to be newer than what the packet contained.
_position = savePosition; _position = savePosition;
_rotation = saveRotation; _rotation = saveRotation;
_velocity = saveVelocity; // _velocity = saveVelocity;
_angularVelocity = saveAngularVelocity; // _angularVelocity = saveAngularVelocity;
_gravity = saveGravity; // _gravity = saveGravity;
_acceleration = saveAcceleration; // _acceleration = saveAcceleration;
_dirtyFlags &= ~(saveFlags & (EntityItem::DIRTY_POSITION |
EntityItem::DIRTY_ROTATION |
EntityItem::DIRTY_LINEAR_VELOCITY |
EntityItem::DIRTY_ANGULAR_VELOCITY |
EntityItem::DIRTY_PHYSICS_ACTIVATION));
} }
return bytesRead; return bytesRead;