Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 7 additions & 26 deletions src/world/physics_world_bullet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -267,32 +267,6 @@ struct MyFilterCallback : public btOverlapFilterCallback
}
};

/// @todo Interact with dynamic objects,
/// Ride kinematicly animated platforms properly
/// More realistic (or maybe just a config option) falling
/// -> Should integrate falling velocity manually and use that in stepDown()
/// Support jumping
/// Support ducking
class btKinematicClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
{
public:
btCollisionObject *_me;

btKinematicClosestNotMeRayResultCallback(btCollisionObject *me)
: btCollisionWorld::ClosestRayResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0))
{
_me = me;
}

virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult &ray_result, bool normal_in_world_space)
{
if (ray_result.m_collisionObject == _me)
return 1.0;

return ClosestRayResultCallback::addSingleResult(ray_result, normal_in_world_space);
}
};

class btKinematicClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback
{
public:
Expand Down Expand Up @@ -327,6 +301,13 @@ class btKinematicClosestNotMeConvexResultCallback : public btCollisionWorld::Clo

return ClosestConvexResultCallback::addSingleResult(convex_result, normal_in_world_space);
}

virtual bool needsCollision(btBroadphaseProxy *proxy0) const
{
bool collides = (proxy0->m_collisionFilterGroup & m_collisionFilterMask) != 0;
collides = collides || (m_collisionFilterGroup & proxy0->m_collisionFilterMask);
return collides;
}
};

struct MoverFlags
Expand Down