EPhysics: implement event callback del full for world
match data pointer SVN revision: 73177
This commit is contained in:
parent
ebdc0f07a1
commit
d983ac3ae5
|
@ -560,11 +560,35 @@ EAPI void ephysics_world_event_callback_add(EPhysics_World *world, EPhysics_Call
|
||||||
* on error.
|
* on error.
|
||||||
*
|
*
|
||||||
* @see ephysics_world_event_callback_add() for details.
|
* @see ephysics_world_event_callback_add() for details.
|
||||||
|
* @see ephysics_world_event_callback_del_full() if you need to match data
|
||||||
|
* pointer.
|
||||||
*
|
*
|
||||||
* @ingroup EPhysics_World
|
* @ingroup EPhysics_World
|
||||||
*/
|
*/
|
||||||
EAPI void *ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func);
|
EAPI void *ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief
|
||||||
|
* Unregister an ephysics world event callback matching data pointer.
|
||||||
|
*
|
||||||
|
* A previously added callback that match @p world, @p type, @p func
|
||||||
|
* and @p data will be deleted.
|
||||||
|
*
|
||||||
|
* @param world The physics world.
|
||||||
|
* @param type The type of callback to be unregistered.
|
||||||
|
* @param func The callback function to be unregistered.
|
||||||
|
* @param data The data pointer that was passed to the callback.
|
||||||
|
* @return The user data passed when the callback was registered, or @c NULL
|
||||||
|
* on error.
|
||||||
|
*
|
||||||
|
* @see ephysics_world_event_callback_add() for details.
|
||||||
|
* @see ephysics_world_event_callback_del() if you don't need to match data
|
||||||
|
* pointer.
|
||||||
|
*
|
||||||
|
* @ingroup EPhysics_World
|
||||||
|
*/
|
||||||
|
EAPI void *ephysics_world_event_callback_del_full(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func, void *data);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief
|
* @brief
|
||||||
* Set linear slop to be used by world.
|
* Set linear slop to be used by world.
|
||||||
|
|
|
@ -592,6 +592,32 @@ ephysics_world_event_callback_del(EPhysics_World *world, EPhysics_Callback_Type
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EAPI void *
|
||||||
|
ephysics_world_event_callback_del_full(EPhysics_World *world, EPhysics_Callback_Type type, EPhysics_World_Event_Cb func, void *data)
|
||||||
|
{
|
||||||
|
EPhysics_World_Callback *cb;
|
||||||
|
void *cb_data;
|
||||||
|
|
||||||
|
if (!world)
|
||||||
|
{
|
||||||
|
ERR("Can't delete world event callback, world is null.");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
EINA_INLIST_FOREACH(world->callbacks, cb)
|
||||||
|
{
|
||||||
|
if ((cb->type == type) && (cb->func == func) && (cb->data == data)) {
|
||||||
|
cb_data = cb->data;
|
||||||
|
world->callbacks = eina_inlist_remove(world->callbacks,
|
||||||
|
EINA_INLIST_GET(cb));
|
||||||
|
free(cb);
|
||||||
|
return cb_data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
EAPI const Eina_List *
|
EAPI const Eina_List *
|
||||||
ephysics_world_bodies_get(const EPhysics_World *world)
|
ephysics_world_bodies_get(const EPhysics_World *world)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue