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

delete default EntityMotionState ctor

Browse source
This commit is contained in:
Andrew Meadows 2018-03-14 08:56:54 -07:00
parent 73fa6d3d2f
commit c61a226bb5
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/physics/src/EntityMotionState.cpp
View file

@ -67,6 +67,7 @@ EntityMotionState::EntityMotionState(btCollisionShape* shape, EntityItemPointer
_accelerationNearlyGravityCount(0), _accelerationNearlyGravityCount(0),
_numInactiveUpdates(1) _numInactiveUpdates(1)
{ {
// EntityMotionState keeps a SharedPointer to its EntityItem which is only set in the CTOR
_type = MOTIONSTATE_TYPE_ENTITY; _type = MOTIONSTATE_TYPE_ENTITY;
assert(_entity); assert(_entity);
assert(entityTreeIsLocked()); assert(entityTreeIsLocked());
@ -80,6 +81,7 @@ EntityMotionState::EntityMotionState(btCollisionShape* shape, EntityItemPointer
EntityMotionState::~EntityMotionState() { EntityMotionState::~EntityMotionState() {
if (_entity) { if (_entity) {
// EntityMotionState keeps a SharedPointer to its EntityItem which is only cleared in the DTOR
assert(_entity->getPhysicsInfo() == this); assert(_entity->getPhysicsInfo() == this);
_entity->setPhysicsInfo(nullptr); _entity->setPhysicsInfo(nullptr);
_entity.reset(); _entity.reset();
@ -127,7 +129,7 @@ void EntityMotionState::handleEasyChanges(uint32_t& flags) {
if (flags & Simulation::DIRTY_SIMULATOR_ID) { if (flags & Simulation::DIRTY_SIMULATOR_ID) {
if (_entity->getSimulatorID().isNull()) { if (_entity->getSimulatorID().isNull()) {
// simulation ownership has been removed by an external simulator // simulation ownership has been removed
if (glm::length2(_entity->getWorldVelocity()) == 0.0f) { if (glm::length2(_entity->getWorldVelocity()) == 0.0f) {
// this object is coming to rest --> clear the ACTIVATION flag and _outgoingPriority // this object is coming to rest --> clear the ACTIVATION flag and _outgoingPriority
flags &= ~Simulation::DIRTY_PHYSICS_ACTIVATION; flags &= ~Simulation::DIRTY_PHYSICS_ACTIVATION;
@ -630,7 +632,7 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
_entity->rememberHasSimulationOwnershipBid(); _entity->rememberHasSimulationOwnershipBid();
// ...then reset _outgoingPriority // ...then reset _outgoingPriority
_outgoingPriority = 0; _outgoingPriority = 0;
// _outgoingPrioriuty will be re-computed before next bid, // _outgoingPriority will be re-computed before next bid,
// or will be set to agree with ownership priority should we win the bid // or will be set to agree with ownership priority should we win the bid
} else if (_outgoingPriority != _entity->getSimulationPriority()) { } else if (_outgoingPriority != _entity->getSimulationPriority()) {
// we own the simulation but our desired priority has changed // we own the simulation but our desired priority has changed

1
libraries/physics/src/EntityMotionState.h
View file

@ -25,6 +25,7 @@
class EntityMotionState : public ObjectMotionState { class EntityMotionState : public ObjectMotionState {
public: public:
EntityMotionState() = delete;
EntityMotionState(btCollisionShape* shape, EntityItemPointer item); EntityMotionState(btCollisionShape* shape, EntityItemPointer item);
virtual ~EntityMotionState(); virtual ~EntityMotionState();