summaryrefslogtreecommitdiff
path: root/src/lib/ephysics/ephysics_body.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ephysics/ephysics_body.cpp')
-rw-r--r--src/lib/ephysics/ephysics_body.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/ephysics/ephysics_body.cpp b/src/lib/ephysics/ephysics_body.cpp
index c212026..98da084 100644
--- a/src/lib/ephysics/ephysics_body.cpp
+++ b/src/lib/ephysics/ephysics_body.cpp
@@ -890,7 +890,7 @@ err_body:
890} 890}
891 891
892static void 892static void
893_ephysics_body_evas_obj_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 893_ephysics_body_efl_canvas_object_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
894{ 894{
895 EPhysics_Body *body = (EPhysics_Body *) data; 895 EPhysics_Body *body = (EPhysics_Body *) data;
896 896
@@ -1214,7 +1214,7 @@ _ephysics_body_move(EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord
1214} 1214}
1215 1215
1216static void 1216static void
1217_ephysics_body_evas_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 1217_ephysics_body_efl_canvas_object_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
1218{ 1218{
1219 EPhysics_Body *body = (EPhysics_Body *) data; 1219 EPhysics_Body *body = (EPhysics_Body *) data;
1220 int w, h; 1220 int w, h;
@@ -1329,9 +1329,9 @@ _ephysics_body_del(EPhysics_Body *body)
1329 if (body->evas_obj) 1329 if (body->evas_obj)
1330 { 1330 {
1331 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL, 1331 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL,
1332 _ephysics_body_evas_obj_del_cb); 1332 _ephysics_body_efl_canvas_object_del_cb);
1333 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE, 1333 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
1334 _ephysics_body_evas_obj_resize_cb); 1334 _ephysics_body_efl_canvas_object_resize_cb);
1335 1335
1336 if (body->faces_slices) 1336 if (body->faces_slices)
1337 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESTACK, 1337 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESTACK,
@@ -1372,7 +1372,7 @@ _ephysics_body_del(EPhysics_Body *body)
1372} 1372}
1373 1373
1374static void 1374static void
1375_ephysics_body_evas_obj_map_apply(EPhysics_Body *body, Evas_Map *map, Evas_Object *obj, Eina_Bool bfc, Eina_Bool update_cw) 1375_ephysics_body_efl_canvas_object_map_apply(EPhysics_Body *body, Evas_Map *map, Evas_Object *obj, Eina_Bool bfc, Eina_Bool update_cw)
1376{ 1376{
1377 EPhysics_Camera *camera = ephysics_world_camera_get(body->world); 1377 EPhysics_Camera *camera = ephysics_world_camera_get(body->world);
1378 1378
@@ -1504,7 +1504,7 @@ _ephysics_cylinder_face_objs_update(EPhysics_Body *body)
1504 evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(), 1504 evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(),
1505 bx, by, z); 1505 bx, by, z);
1506 1506
1507 _ephysics_body_evas_obj_map_apply(body, map, obj, EINA_TRUE, 1507 _ephysics_body_efl_canvas_object_map_apply(body, map, obj, EINA_TRUE,
1508 EINA_FALSE); 1508 EINA_FALSE);
1509 } 1509 }
1510} 1510}
@@ -1624,7 +1624,7 @@ _ephysics_box_face_objs_update(EPhysics_Body *body)
1624 1624
1625 evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(), 1625 evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(),
1626 x, y, z); 1626 x, y, z);
1627 _ephysics_body_evas_obj_map_apply(body, map, obj, EINA_TRUE, 1627 _ephysics_body_efl_canvas_object_map_apply(body, map, obj, EINA_TRUE,
1628 EINA_FALSE); 1628 EINA_FALSE);
1629 } 1629 }
1630} 1630}
@@ -1680,7 +1680,7 @@ _ephysics_body_evas_object_update(EPhysics_Body *body, Evas_Object *evas_obj)
1680 evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(), 1680 evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(),
1681 bx, by, z); 1681 bx, by, z);
1682 1682
1683 _ephysics_body_evas_obj_map_apply(body, map, evas_obj, 1683 _ephysics_body_efl_canvas_object_map_apply(body, map, evas_obj,
1684 body->back_face_culling, EINA_TRUE); 1684 body->back_face_culling, EINA_TRUE);
1685} 1685}
1686 1686
@@ -3392,9 +3392,9 @@ ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_B
3392 { 3392 {
3393 evas_object_map_enable_set(body->evas_obj, EINA_FALSE); 3393 evas_object_map_enable_set(body->evas_obj, EINA_FALSE);
3394 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL, 3394 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL,
3395 _ephysics_body_evas_obj_del_cb); 3395 _ephysics_body_efl_canvas_object_del_cb);
3396 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE, 3396 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
3397 _ephysics_body_evas_obj_resize_cb); 3397 _ephysics_body_efl_canvas_object_resize_cb);
3398 if (body->default_face) 3398 if (body->default_face)
3399 { 3399 {
3400 evas_object_event_callback_del(body->evas_obj, 3400 evas_object_event_callback_del(body->evas_obj,
@@ -3406,7 +3406,7 @@ ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_B
3406 3406
3407 body->evas_obj = evas_obj; 3407 body->evas_obj = evas_obj;
3408 evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL, 3408 evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL,
3409 _ephysics_body_evas_obj_del_cb, body); 3409 _ephysics_body_efl_canvas_object_del_cb, body);
3410 3410
3411 if (body->soft_body) 3411 if (body->soft_body)
3412 { 3412 {
@@ -3430,7 +3430,7 @@ ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_B
3430 _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate); 3430 _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate);
3431 ephysics_world_lock_release(body->world); 3431 ephysics_world_lock_release(body->world);
3432 evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESIZE, 3432 evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESIZE,
3433 _ephysics_body_evas_obj_resize_cb, body); 3433 _ephysics_body_efl_canvas_object_resize_cb, body);
3434} 3434}
3435 3435
3436EAPI Evas_Object * 3436EAPI Evas_Object *
@@ -3450,9 +3450,9 @@ ephysics_body_evas_object_unset(EPhysics_Body *body)
3450 if (obj) 3450 if (obj)
3451 { 3451 {
3452 evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, 3452 evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
3453 _ephysics_body_evas_obj_del_cb); 3453 _ephysics_body_efl_canvas_object_del_cb);
3454 evas_object_event_callback_del(obj, EVAS_CALLBACK_RESIZE, 3454 evas_object_event_callback_del(obj, EVAS_CALLBACK_RESIZE,
3455 _ephysics_body_evas_obj_resize_cb); 3455 _ephysics_body_efl_canvas_object_resize_cb);
3456 evas_object_map_enable_set(obj, EINA_FALSE); 3456 evas_object_map_enable_set(obj, EINA_FALSE);
3457 } 3457 }
3458 3458
@@ -5162,7 +5162,7 @@ _ephysics_body_soft_sphere_face_evas_object_set(EPhysics_Body *body, EPhysics_Bo
5162 _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate); 5162 _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate);
5163 ephysics_world_lock_release(body->world); 5163 ephysics_world_lock_release(body->world);
5164 evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE, 5164 evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE,
5165 _ephysics_body_evas_obj_resize_cb, body); 5165 _ephysics_body_efl_canvas_object_resize_cb, body);
5166 5166
5167 DBG("Soft sphere's face evas object set."); 5167 DBG("Soft sphere's face evas object set.");
5168} 5168}