forked from enlightenment/efl
parent
1a2daa057d
commit
f9293909d9
|
@ -100,6 +100,12 @@ _world_stopped_cb(void *data, EPhysics_World *world __UNUSED__, void *event_info
|
||||||
INF("World stopped\n");
|
INF("World stopped\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_world_update_cb(void *data __UNUSED__, EPhysics_World *world __UNUSED__, void *event_info __UNUSED__)
|
||||||
|
{
|
||||||
|
INF("World update\n");
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
test_jumping_balls(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
test_jumping_balls(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||||
{
|
{
|
||||||
|
@ -130,6 +136,8 @@ test_jumping_balls(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
|
||||||
test_data->data = bt;
|
test_data->data = bt;
|
||||||
ephysics_world_event_callback_add(world, EPHYSICS_CALLBACK_WORLD_STOPPED,
|
ephysics_world_event_callback_add(world, EPHYSICS_CALLBACK_WORLD_STOPPED,
|
||||||
_world_stopped_cb, bt);
|
_world_stopped_cb, bt);
|
||||||
|
ephysics_world_event_callback_add(world, EPHYSICS_CALLBACK_WORLD_UPDATE,
|
||||||
|
_world_update_cb, NULL);
|
||||||
|
|
||||||
boundary = ephysics_body_bottom_boundary_add(test_data->world);
|
boundary = ephysics_body_bottom_boundary_add(test_data->world);
|
||||||
ephysics_body_restitution_set(boundary, 0.65);
|
ephysics_body_restitution_set(boundary, 0.65);
|
||||||
|
|
|
@ -893,6 +893,7 @@ typedef enum _EPhysics_Callback_World_Type
|
||||||
EPHYSICS_CALLBACK_WORLD_DEL, /**< World being deleted (called before free) */
|
EPHYSICS_CALLBACK_WORLD_DEL, /**< World being deleted (called before free) */
|
||||||
EPHYSICS_CALLBACK_WORLD_STOPPED, /**< no objects are moving any more */
|
EPHYSICS_CALLBACK_WORLD_STOPPED, /**< no objects are moving any more */
|
||||||
EPHYSICS_CALLBACK_WORLD_CAMERA_MOVED, /**< camera position changed */
|
EPHYSICS_CALLBACK_WORLD_CAMERA_MOVED, /**< camera position changed */
|
||||||
|
EPHYSICS_CALLBACK_WORLD_UPDATE, /**< world being updated */
|
||||||
EPHYSICS_CALLBACK_WORLD_LAST, /**< kept as sentinel, not really an event */
|
EPHYSICS_CALLBACK_WORLD_LAST, /**< kept as sentinel, not really an event */
|
||||||
} EPhysics_Callback_World_Type;
|
} EPhysics_Callback_World_Type;
|
||||||
|
|
||||||
|
|
|
@ -266,6 +266,9 @@ _ephysics_world_tick(btDynamicsWorld *dynamics_world)
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
body_del:
|
body_del:
|
||||||
|
if (world_active)
|
||||||
|
_ephysics_world_event_callback_call(world, EPHYSICS_CALLBACK_WORLD_UPDATE,
|
||||||
|
NULL);
|
||||||
world->pending_ticks--;
|
world->pending_ticks--;
|
||||||
if (!world->pending_ticks)
|
if (!world->pending_ticks)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue