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

more correct CONTINUE collision event filter

Browse source
This commit is contained in:
Andrew Meadows 2017-01-10 21:29:08 -08:00
parent 2541bfb1a8
commit b5537304a3
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/physics/src/ContactInfo.cpp
View file

@ -18,10 +18,20 @@ void ContactInfo::update(uint32_t currentStep, const btManifoldPoint& p) {
distance = p.m_distance1; distance = p.m_distance1;
} }
const uint32_t STEPS_BETWEEN_CONTINUE_EVENTS = 9;
ContactEventType ContactInfo::computeType(uint32_t thisStep) { ContactEventType ContactInfo::computeType(uint32_t thisStep) {
++_numChecks; if (_continueExpiry == 0) {
if (_numChecks == 1) { _continueExpiry = thisStep + STEPS_BETWEEN_CONTINUE_EVENTS;
return CONTACT_EVENT_TYPE_START; return CONTACT_EVENT_TYPE_START;
} }
return (_lastStep == thisStep) ? CONTACT_EVENT_TYPE_CONTINUE : CONTACT_EVENT_TYPE_END; return (_lastStep == thisStep) ? CONTACT_EVENT_TYPE_CONTINUE : CONTACT_EVENT_TYPE_END;
} }
bool ContactInfo::readyForContinue(uint32_t thisStep) {
if (thisStep > _continueExpiry) {
_continueExpiry = thisStep + STEPS_BETWEEN_CONTINUE_EVENTS;
return true;
}
return false;
}

4
libraries/physics/src/ContactInfo.h
View file

@ -26,12 +26,14 @@ public:
const btVector3& getPositionWorldOnB() const { return positionWorldOnB; } const btVector3& getPositionWorldOnB() const { return positionWorldOnB; }
btVector3 getPositionWorldOnA() const { return positionWorldOnB + normalWorldOnB * distance; } btVector3 getPositionWorldOnA() const { return positionWorldOnB + normalWorldOnB * distance; }
bool readyForContinue(uint32_t thisStep);
btVector3 positionWorldOnB; btVector3 positionWorldOnB;
btVector3 normalWorldOnB; btVector3 normalWorldOnB;
btScalar distance; btScalar distance;
private: private:
uint32_t _lastStep { 0 }; uint32_t _lastStep { 0 };
uint32_t _numChecks { 0 }; uint32_t _continueExpiry { 0 };
}; };

5
libraries/physics/src/PhysicsEngine.cpp
View file

@ -270,7 +270,7 @@ void PhysicsEngine::stepSimulation() {
} }
auto onSubStep = [this]() { auto onSubStep = [this]() {
updateContactMap(); this->updateContactMap();
}; };
int numSubsteps = _dynamicsWorld->stepSimulationWithSubstepCallback(timeStep, PHYSICS_ENGINE_MAX_NUM_SUBSTEPS, int numSubsteps = _dynamicsWorld->stepSimulationWithSubstepCallback(timeStep, PHYSICS_ENGINE_MAX_NUM_SUBSTEPS,
@ -393,7 +393,6 @@ void PhysicsEngine::updateContactMap() {
} }
const CollisionEvents& PhysicsEngine::getCollisionEvents() { const CollisionEvents& PhysicsEngine::getCollisionEvents() {
const uint32_t CONTINUE_EVENT_FILTER_FREQUENCY = 10;
_collisionEvents.clear(); _collisionEvents.clear();
// scan known contacts and trigger events // scan known contacts and trigger events
@ -402,7 +401,7 @@ const CollisionEvents& PhysicsEngine::getCollisionEvents() {
while (contactItr != _contactMap.end()) { while (contactItr != _contactMap.end()) {
ContactInfo& contact = contactItr->second; ContactInfo& contact = contactItr->second;
ContactEventType type = contact.computeType(_numContactFrames); ContactEventType type = contact.computeType(_numContactFrames);
if (type != CONTACT_EVENT_TYPE_CONTINUE || _numSubsteps % CONTINUE_EVENT_FILTER_FREQUENCY == 0) { if (type != CONTACT_EVENT_TYPE_CONTINUE || contact.readyForContinue(_numContactFrames)) {
ObjectMotionState* motionStateA = static_cast<ObjectMotionState*>(contactItr->first._a); ObjectMotionState* motionStateA = static_cast<ObjectMotionState*>(contactItr->first._a);
ObjectMotionState* motionStateB = static_cast<ObjectMotionState*>(contactItr->first._b); ObjectMotionState* motionStateB = static_cast<ObjectMotionState*>(contactItr->first._b);