LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

onContact callback API

Browse source
This commit is contained in:
Mikulas Florek 2017-10-03 15:10:10 +02:00
parent 69bfbe81ec
commit 601e894ebc
2 changed files with 54 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/physics/physics_scene.cpp
View file

@ -214,9 +214,16 @@ struct PhysicsSceneImpl LUMIX_FINAL : public PhysicsScene
};
struct ContactCallback LUMIX_FINAL : public PxSimulationEventCallback
struct ContactCallback
{
explicit ContactCallback(PhysicsSceneImpl& scene)
ContactCallbackHandle handle;
Delegate<void(const ContactData&)> callback;
};
struct PhysxContactCallback LUMIX_FINAL : public PxSimulationEventCallback
{
explicit PhysxContactCallback(PhysicsSceneImpl& scene)
: m_scene(scene)
{
}
@ -235,10 +242,12 @@ struct PhysicsSceneImpl LUMIX_FINAL : public PhysicsScene
PxContactPairPoint contact;
auto contact_count = cp.extractContacts(&contact, 1);
auto pos = fromPhysx(contact.position);
Entity e1 = {(int)(intptr_t)(pairHeader.actors[0]->userData)};
Entity e2 = {(int)(intptr_t)(pairHeader.actors[1]->userData)};
m_scene.onContact(e1, e2, pos);
ContactData contact_data;
contact_data.position = fromPhysx(contact.position);
contact_data.e1 = {(int)(intptr_t)(pairHeader.actors[0]->userData)};
contact_data.e2 = {(int)(intptr_t)(pairHeader.actors[1]->userData)};
m_scene.onContact(contact_data);
}
}
@ -316,6 +325,7 @@ struct PhysicsSceneImpl LUMIX_FINAL : public PhysicsScene
, m_universe(context)
, m_is_game_running(false)
, m_contact_callback(*this)
, m_contact_callbacks(m_allocator)
, m_queued_forces(m_allocator)
, m_layers_count(2)
, m_joints(m_allocator)
@ -420,7 +430,7 @@ struct PhysicsSceneImpl LUMIX_FINAL : public PhysicsScene
}
void onContact(Entity e1, Entity e2, const Vec3& position)
void onContact(const ContactData& contact_data)
{
if (!m_script_scene) return;
@ -442,8 +452,12 @@ struct PhysicsSceneImpl LUMIX_FINAL : public PhysicsScene
}
};
send(e1, e2, position);
send(e2, e1, position);
send(contact_data.e1, contact_data.e2, contact_data.position);
send(contact_data.e2, contact_data.e1, contact_data.position);
for (auto& cb : m_contact_callbacks)
{
cb.callback.invoke(contact_data);
}
}
@ -2239,6 +2253,23 @@ struct PhysicsSceneImpl LUMIX_FINAL : public PhysicsScene
}
ContactCallbackHandle addOnContactCallback(Delegate<void(const ContactData&)> callback) override
{
ContactCallback cb;
cb.handle = m_contact_callbacks.empty() ? 0 : m_contact_callbacks.back().handle + 1;
cb.callback = callback;
m_contact_callbacks.push(cb);
return cb.handle;
}
void removeOnContactCallback(ContactCallbackHandle handle) override
{
m_contact_callbacks.eraseItems([handle](const ContactCallback& cb) { return cb.handle == handle; });
}
ComponentHandle getActorComponent(Entity entity) override
{
int idx = m_actors.find(entity);
@ -4437,7 +4468,7 @@ struct PhysicsSceneImpl LUMIX_FINAL : public PhysicsScene
Universe& m_universe;
Engine* m_engine;
ContactCallback m_contact_callback;
PhysxContactCallback m_contact_callback;
BoneOrientation m_new_bone_orientation = BoneOrientation::X;
PxScene* m_scene;
LuaScriptScene* m_script_scene;
@ -4453,6 +4484,7 @@ struct PhysicsSceneImpl LUMIX_FINAL : public PhysicsScene
AssociativeArray<Entity, Heightfield> m_terrains;
Array<RigidActor*> m_dynamic_actors;
Array<ContactCallback> m_contact_callbacks;
bool m_is_game_running;
bool m_is_updating_ragdoll;
u32 m_debug_visualization_flags;

12
src/physics/physics_scene.h
View file

@ -36,6 +36,7 @@ class PhysicsSystem;
struct RagdollBone;
struct RigidTransform;
class Universe;
template <typename T> class Delegate;
struct RaycastHit
@ -73,6 +74,15 @@ public:
DYNAMIC,
KINEMATIC
};
struct ContactData
{
Vec3 position;
Entity e1;
Entity e2;
};
typedef int ContactCallbackHandle;
static PhysicsScene* create(PhysicsSystem& system, Universe& context, Engine& engine, IAllocator& allocator);
static void destroy(PhysicsScene* scene);
@ -84,6 +94,8 @@ public:
virtual bool raycastEx(const Vec3& origin, const Vec3& dir, float distance, RaycastHit& result, Entity ignored) = 0;
virtual PhysicsSystem& getSystem() const = 0;
virtual ContactCallbackHandle addOnContactCallback(Delegate<void(const ContactData&)> callback) = 0;
virtual void removeOnContactCallback(ContactCallbackHandle idx) = 0;
virtual ComponentHandle getActorComponent(Entity entity) = 0;
virtual void setActorLayer(ComponentHandle cmp, int layer) = 0;
virtual int getActorLayer(ComponentHandle cmp) = 0;