mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 07:15:32 +00:00
Code Issues Releases Wiki Activity

Separate ContactTestResultCallback

Browse source
This commit is contained in:
Capostrophic 2020-03-30 21:49:47 +03:00
parent c94cd775bf
commit 5d625c12dc
3 changed files with 58 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/openmw/mwphysics/contacttestresultcallback.cpp Normal file
View file

@ -0,0 +1,27 @@
#include "contacttestresultcallback.hpp"
#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
#include "ptrholder.hpp"
namespace MWPhysics
{
ContactTestResultCallback::ContactTestResultCallback(const btCollisionObject* testedAgainst)
: mTestedAgainst(testedAgainst)
{
}
btScalar ContactTestResultCallback::addSingleResult(btManifoldPoint& cp,
const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
{
const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
if (collisionObject == mTestedAgainst)
collisionObject = col1Wrap->m_collisionObject;
PtrHolder* holder = static_cast<PtrHolder*>(collisionObject->getUserPointer());
if (holder)
mResult.push_back(holder->getPtr());
return 0.f;
}
}

30
apps/openmw/mwphysics/contacttestresultcallback.hpp Normal file
View file

@ -0,0 +1,30 @@
#ifndef OPENMW_MWPHYSICS_CONTACTTESTRESULTCALLBACK_H
#define OPENMW_MWPHYSICS_CONTACTTESTRESULTCALLBACK_H
#include <vector>
#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
#include "../mwworld/ptr.hpp"
class btCollisionObject;
class btCollisionObjectWrapper;
namespace MWPhysics
{
class ContactTestResultCallback : public btCollisionWorld::ContactResultCallback
{
const btCollisionObject* mTestedAgainst;
public:
ContactTestResultCallback(const btCollisionObject* testedAgainst);
virtual btScalar addSingleResult(btManifoldPoint& cp,
const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
const btCollisionObjectWrapper* col1Wrap,int partId1,int index1);
std::vector<MWWorld::Ptr> mResult;
};
}
#endif

27
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -48,6 +48,7 @@
#include "hasspherecollisioncallback.hpp" #include "hasspherecollisioncallback.hpp"
#include "deepestnotmecontacttestresultcallback.hpp" #include "deepestnotmecontacttestresultcallback.hpp"
#include "closestnotmerayresultcallback.hpp" #include "closestnotmerayresultcallback.hpp"
#include "contacttestresultcallback.hpp"
namespace MWPhysics namespace MWPhysics
{ {
@ -882,32 +883,6 @@ namespace MWPhysics
return osg::Vec3f(); return osg::Vec3f();
} }
class ContactTestResultCallback : public btCollisionWorld::ContactResultCallback
{
public:
ContactTestResultCallback(const btCollisionObject* testedAgainst)
: mTestedAgainst(testedAgainst)
{
}
const btCollisionObject* mTestedAgainst;
std::vector<MWWorld::Ptr> mResult;
virtual btScalar addSingleResult(btManifoldPoint& cp,
const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
{
const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
if (collisionObject == mTestedAgainst)
collisionObject = col1Wrap->m_collisionObject;
PtrHolder* holder = static_cast<PtrHolder*>(collisionObject->getUserPointer());
if (holder)
mResult.push_back(holder->getPtr());
return 0.f;
}
};
std::vector<MWWorld::Ptr> PhysicsSystem::getCollisions(const MWWorld::ConstPtr &ptr, int collisionGroup, int collisionMask) const std::vector<MWWorld::Ptr> PhysicsSystem::getCollisions(const MWWorld::ConstPtr &ptr, int collisionGroup, int collisionMask) const
{ {
btCollisionObject* me = nullptr; btCollisionObject* me = nullptr;