OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Rework PhysX collision flutter bug workaround 

To better handle erroneous trigger events under the new timing method, use the number of times the simulation has actually advanced instead of the number of evals received.

Cleaned up a bit.
Skoader 12 years ago committed by Adam Johnson
parent
d06ba6362c
commit
d3ea8fe333
4 changed files with 167 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
  2. 3
      Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h
  3. 213
      Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp
  4. 49
      Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h

3
Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
Unescape View File

@ -283,6 +283,7 @@ plSimulationMgr* plSimulationMgr::GetInstance()
plSimulationMgr::plSimulationMgr()
: fSuspended(true)
, fAccumulator(0.0f)
, fStepCount(0)
, fLOSDispatch(new plLOSDispatch())
, fSoundMgr(new plPhysicsSoundMgr)
, fLog(nil)
@ -468,6 +469,8 @@ void plSimulationMgr::Advance(float delSecs)
fAccumulator = kDefaultMaxDelta;
}
++fStepCount;
// Perform as many whole substeps as possible saving the remainder in our accumulator.
int numSubSteps = (int)(fAccumulator / kDefaultStepSize + 0.000001f);
float delta = numSubSteps * kDefaultStepSize;

3
Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h
Unescape View File

@ -99,6 +99,8 @@ public:
int GetMaterialIdx(NxScene* scene, float friction, float restitution);
uint32_t GetStepCount() const { return fStepCount; }
//Fix to Move collision messages and their handling out of the simulation step
void AddCollisionMsg(plKey hitee, plKey hitter, bool entering);
void AddCollisionMsg(plCollideMsg* msg);
@ -139,6 +141,7 @@ protected:
bool fSuspended;
float fAccumulator;
uint32_t fStepCount;
// A utility class to keep track of a request for a physical synchronization.
// These requests must pass a certain criteria (see the code for the latest)

213
Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp
Unescape View File

@ -68,8 +68,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plModifier/plDetectorLog.h"
#define USE_PHYSX_MULTIPLE_CAMREGION_ENTER 1
#define USE_PHYSX_COLLISION_FLUTTER_WORKAROUND 1
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
#include "plPhysX/plSimulationMgr.h"
#endif
plArmatureMod* plCollisionDetector::IGetAvatarModifier(plKey key)
{
@ -240,57 +243,18 @@ plCameraRegionDetector::~plCameraRegionDetector()
hsRefCnt_SafeUnRef(*it);
}
void plCameraRegionDetector::ITrigger(plKey hitter, bool entering, bool immediate)
{
if (fSavingSendMsg)
DetectorLogRed("%s: Stale messages on ITrigger. This should never happen!", GetKeyName().c_str());
if (fIsInside && entering)
DetectorLogRed("%s: Duplicate enter! Did we miss an exit?", GetKeyName().c_str());
else if (!fIsInside && !entering)
DetectorLogRed("%s: Duplicate exit! Did we miss an enter?", GetKeyName().c_str());
fSavingSendMsg = true;
fSavedMsgEnterFlag = entering;
if (entering)
{
DetectorLog("%s: Saving camera Entering volume - Evals=%d", GetKeyName().c_str(),fNumEvals);
fLastEnterEval = fNumEvals;
}
else
{
DetectorLog("%s: Saving camera Exiting volume - Evals=%d", GetKeyName().c_str(),fNumEvals);
fLastExitEval = fNumEvals;
}
if (immediate)
ISendSavedTriggerMsgs();
}
void plCameraRegionDetector::ISendSavedTriggerMsgs()
{
if (fSavingSendMsg)
void plCameraRegionDetector::ISendTriggerMsg()
{
for (size_t i = 0; i < fMessages.size(); ++i)
{
hsRefCnt_SafeRef(fMessages[i]);
if (fSavedMsgEnterFlag)
for (plCameraMsgVec::iterator it = fMessages.begin(); it != fMessages.end(); ++it)
{
fMessages[i]->SetCmd(plCameraMsg::kEntering);
DetectorLog("Entering cameraRegion: %s - Evals=%d -msg %d of %d\n", GetKeyName().c_str(),fNumEvals,i+1,fMessages.size());
fIsInside = true;
}
plCameraMsg* msg = *it;
if (fIsInside)
msg->SetCmd(plCameraMsg::kEntering);
else
{
fMessages[i]->ClearCmd(plCameraMsg::kEntering);
DetectorLog("Exiting cameraRegion: %s - Evals=%d -msg %d of %d\n", GetKeyName().c_str(),fNumEvals,i+1,fMessages.size());
fIsInside = false;
msg->ClearCmd(plCameraMsg::kEntering);
msg->SendAndKeep();
}
plgDispatch::MsgSend(fMessages[i]);
}
}
fSavingSendMsg = false;
}
bool plCameraRegionDetector::MsgReceive(plMessage* msg)
{
@ -300,8 +264,16 @@ bool plCameraRegionDetector::MsgReceive(plMessage* msg)
// camera collisions are only for the local player
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pCollMsg->fOtherKey)
return true;
// Fall through to plObjectInVolumeDetector, which will register us for plEvalMsg
// and handle it for us. (Hint: See ISendSavedTriggerMsgs)
if (!fWaitingForEval)
IRegisterForEval();
fEntering = (pCollMsg->fEntering != 0);
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
fLastStep = plSimulationMgr::GetInstance()->GetStepCount();
#endif
return true;
}
return plObjectInVolumeDetector::MsgReceive(msg);
@ -327,56 +299,72 @@ void plCameraRegionDetector::Write(hsStream* stream, hsResMgr* mgr)
}
void plCameraRegionDetector::IHandleEval(plEvalMsg*)
{
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
if (plSimulationMgr::GetInstance()->GetStepCount() - fLastStep > 1)
{
#endif
if (fIsInside != fEntering)
{
fIsInside = fEntering;
DetectorLog("%s CameraRegion: %s", fIsInside ? "Entering" : "Exiting", GetKeyName().c_str());
ISendTriggerMsg();
}
plgDispatch::Dispatch()->UnRegisterForExactType(plEvalMsg::Index(), GetKey());
fWaitingForEval = false;
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
}
#endif
}
/////////////////////////////////
/////////////////////////////////
/////////////////////////////////
/////////////////////////////////
// object-in-volume detector
void plObjectInVolumeDetector::ITrigger(plKey hitter, bool entering, bool immediate)
void plObjectInVolumeDetector::ITrigger(plKey hitter, bool entering)
{
hsRefCnt_SafeUnRef(fSavedActivatorMsg);
fSavedActivatorMsg = new plActivatorMsg;
fSavedActivatorMsg->AddReceivers(fReceivers);
if (fProxyKey)
fSavedActivatorMsg->fHiteeObj = fProxyKey;
else
fSavedActivatorMsg->fHiteeObj = GetTarget()->GetKey();
fSavedActivatorMsg->fHitterObj = hitter;
fSavedActivatorMsg->SetSender(GetKey());
if (entering)
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
for (bookKeepingList::iterator it = fCollisionList.begin(); it != fCollisionList.end(); ++it)
{
DetectorLog("%s: Saving Entering volume - Evals=%d", GetKeyName().c_str(), fNumEvals);
fSavedActivatorMsg->SetTriggerType(plActivatorMsg::kVolumeEnter);
fLastEnterEval = fNumEvals;
}
else
plCollisionBookKeepingInfo* collisionInfo = *it;
if (collisionInfo->fHitter == hitter)
{
DetectorLog("%s: Saving Exiting volume - Evals=%d", GetKeyName().c_str(), fNumEvals);
fSavedActivatorMsg->SetTriggerType(plActivatorMsg::kVolumeExit);
fLastExitEval = fNumEvals;
collisionInfo->fEntering = entering;
collisionInfo->fLastStep = plSimulationMgr::GetInstance()->GetStepCount();
return;
}
}
#endif
if (immediate)
ISendSavedTriggerMsgs();
plCollisionBookKeepingInfo* collisionInfo = new plCollisionBookKeepingInfo(hitter, entering);
fCollisionList.push_back(collisionInfo);
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
collisionInfo->fLastStep = plSimulationMgr::GetInstance()->GetStepCount();
#endif
}
void plObjectInVolumeDetector::ISendSavedTriggerMsgs()
void plObjectInVolumeDetector::IRegisterForEval()
{
if (fSavedActivatorMsg)
fWaitingForEval = true;
plgDispatch::Dispatch()->RegisterForExactType(plEvalMsg::Index(), GetKey());
}
void plObjectInVolumeDetector::ISendTriggerMsg(plKey hitter, bool entering)
{
if (fSavedActivatorMsg->fTriggerType == plActivatorMsg::kVolumeEnter)
DetectorLog("%s: Sending Entering volume - Evals=%d", GetKeyName().c_str(), fNumEvals);
plActivatorMsg* activatorMsg = new plActivatorMsg();
activatorMsg->SetSender(GetKey());
activatorMsg->AddReceivers(fReceivers);
activatorMsg->fHiteeObj = fProxyKey ? fProxyKey : GetTarget()->GetKey();
activatorMsg->fHitterObj = hitter;
if (entering)
activatorMsg->SetTriggerType(plActivatorMsg::kVolumeEnter);
else
DetectorLog("%s: Sending Exiting volume - Evals=%d", GetKeyName().c_str(), fNumEvals);
activatorMsg->SetTriggerType(plActivatorMsg::kVolumeExit);
// we're saving the message to be dispatched later...
plgDispatch::MsgSend(fSavedActivatorMsg);
}
fSavedActivatorMsg = nil;
plgDispatch::MsgSend(activatorMsg);
}
bool plObjectInVolumeDetector::MsgReceive(plMessage* msg)
@ -387,18 +375,17 @@ bool plObjectInVolumeDetector::MsgReceive(plMessage* msg)
// If the avatar is disabled (flying around), don't trigger
if (IIsDisabledAvatar(pCollMsg->fOtherKey))
return false;
if (!fWaitingForEval)
IRegisterForEval();
ITrigger(pCollMsg->fOtherKey, (pCollMsg->fEntering != 0));
plgDispatch::Dispatch()->RegisterForExactType(plEvalMsg::Index(), GetKey());
return true;
}
plEvalMsg* pEvalMsg = plEvalMsg::ConvertNoRef(msg);
if (pEvalMsg)
{
fNumEvals++;
ISendSavedTriggerMsgs();
plgDispatch::Dispatch()->UnRegisterForExactType(plEvalMsg::Index(), GetKey());
}
IHandleEval(pEvalMsg);
plPlayerPageMsg* pageMsg = plPlayerPageMsg::ConvertNoRef(msg);
if (pageMsg && pageMsg->fUnload)
@ -409,6 +396,48 @@ bool plObjectInVolumeDetector::MsgReceive(plMessage* msg)
return plCollisionDetector::MsgReceive(msg);
}
void plObjectInVolumeDetector::IHandleEval(plEvalMsg*)
{
bookKeepingList::iterator it = fCollisionList.begin();
while (it != fCollisionList.end())
{
plCollisionBookKeepingInfo* collisionInfo = *it;
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
if (plSimulationMgr::GetInstance()->GetStepCount() - collisionInfo->fLastStep > 1)
{
#endif // USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
ResidentSet::iterator j = fCurrentResidents.find(collisionInfo->fHitter);
bool wasInside = j != fCurrentResidents.end();
if (collisionInfo->fEntering != wasInside)
{
if (collisionInfo->fEntering)
{
fCurrentResidents.insert(collisionInfo->fHitter);
DetectorLog("%s: Sending Volume Enter ActivatorMsg", GetKeyName().c_str());
ISendTriggerMsg(collisionInfo->fHitter, true);
}
else
{
fCurrentResidents.erase(j);
DetectorLog("%s: Sending Volume Exit ActivatorMsg", GetKeyName().c_str());
ISendTriggerMsg(collisionInfo->fHitter, false);
}
}
delete collisionInfo;
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
it = fCollisionList.erase(it);
}
else
{
++it;
}
#else
++it;
#endif // USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
}
}
void plObjectInVolumeDetector::SetTarget(plSceneObject* so)
{
plCollisionDetector::SetTarget(so);
@ -485,13 +514,13 @@ void plObjectInVolumeAndFacingDetector::ICheckForTrigger()
{
DetectorLog("%s: Trigger InVolume&Facing", GetKeyName().c_str());
fTriggered = true;
ITrigger(avatar->GetKey(), true, true);
ISendTriggerMsg(avatar->GetKey(), true);
}
else if (!facing && fTriggered)
{
DetectorLog("%s: Untrigger InVolume&Facing", GetKeyName().c_str());
fTriggered = false;
ITrigger(avatar->GetKey(), false, true);
ISendTriggerMsg(avatar->GetKey(), false);
}
}
}
@ -525,7 +554,7 @@ bool plObjectInVolumeAndFacingDetector::MsgReceive(plMessage* msg)
if (fTriggered)
{
fTriggered = false;
ITrigger(plNetClientApp::GetInstance()->GetLocalPlayerKey(), false, true);
ISendTriggerMsg(plNetClientApp::GetInstance()->GetLocalPlayerKey(), false);
}
}

49
Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h
Unescape View File

@ -53,6 +53,8 @@ class plArmatureMod;
class plActivatorMsg;
class plEvalMsg;
#define USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
class plCollisionDetector : public plDetectorModifier
{
protected:
@ -92,23 +94,37 @@ public:
class plObjectInVolumeDetector : public plCollisionDetector
{
protected:
virtual void ITrigger(plKey hitter, bool entering, bool immediate=false);
virtual void ISendSavedTriggerMsgs();
class plCollisionBookKeepingInfo
{
public:
plCollisionBookKeepingInfo(const plKey& key, bool entering)
: fHitter(key), fEntering(entering) { }
plKey fHitter;
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
uint32_t fLastStep;
#endif // USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
bool fEntering;
};
void ITrigger(plKey hitter, bool entering);
void ISendTriggerMsg(plKey hitter, bool entering);
void IRegisterForEval();
virtual void IHandleEval(plEvalMsg*);
bool fWaitingForEval;
plActivatorMsg* fSavedActivatorMsg;
uint32_t fNumEvals;
uint32_t fLastEnterEval;
uint32_t fLastExitEval;
typedef std::list<plCollisionBookKeepingInfo*> bookKeepingList;
bookKeepingList fCollisionList;
typedef std::set<plKey> ResidentSet;
ResidentSet fCurrentResidents;
public:
plObjectInVolumeDetector()
: plCollisionDetector(), fSavedActivatorMsg(nil), fNumEvals(0), fLastEnterEval(0), fLastExitEval(0)
{ }
: plCollisionDetector(), fWaitingForEval(false) { }
plObjectInVolumeDetector(int8_t type)
: plCollisionDetector(type), fSavedActivatorMsg(nil), fNumEvals(0), fLastEnterEval(0), fLastExitEval(0)
{ }
: plCollisionDetector(type), fWaitingForEval(false) { }
virtual ~plObjectInVolumeDetector() { }
@ -159,16 +175,17 @@ protected:
typedef std::vector<plCameraMsg*> plCameraMsgVec;
plCameraMsgVec fMessages;
#ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND
uint32_t fLastStep;
#endif
bool fIsInside;
bool fSavingSendMsg;
bool fSavedMsgEnterFlag;
bool fEntering;
virtual void ITrigger(plKey hitter, bool entering, bool immediate=false);
virtual void ISendSavedTriggerMsgs();
void ISendTriggerMsg();
virtual void IHandleEval(plEvalMsg*);
public:
plCameraRegionDetector()
: plObjectInVolumeDetector(), fIsInside(false), fSavingSendMsg(false)
{ }
: plObjectInVolumeDetector(), fIsInside(false) { }
~plCameraRegionDetector();
virtual bool MsgReceive(plMessage* msg);

Write Preview
Loading…
Cancel
Save