rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ephysics: update slices at each tick 

No reason to call it only when evas object moves.
Makes soft bodies animations smoother.



SVN revision: 78727
This commit is contained in:
Bruno Dilly 2012-10-31 21:02:55 +00:00
parent 9f04fdf723
commit 35b77df141
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
legacy/ephysics/src/lib/ephysics_body.cpp
View File

@ -17,8 +17,6 @@
extern "C" { extern "C" {
#endif #endif
#define BODY "body"
typedef struct _EPhysics_Body_Callback EPhysics_Body_Callback; typedef struct _EPhysics_Body_Callback EPhysics_Body_Callback;
typedef struct _EPhysics_Body_Evas_Stacking EPhysics_Body_Evas_Stacking; typedef struct _EPhysics_Body_Evas_Stacking EPhysics_Body_Evas_Stacking;
typedef struct _EPhysics_Body_Soft_Body_Slice EPhysics_Body_Soft_Body_Slice; typedef struct _EPhysics_Body_Soft_Body_Slice EPhysics_Body_Soft_Body_Slice;
@ -55,7 +53,7 @@ struct _EPhysics_Body_Soft_Body_Slice
}; };
static void static void
_ephysics_body_soft_body_slices_apply(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) _ephysics_body_soft_body_slices_apply(EPhysics_Body *body)
{ {
double rate; double rate;
void *list_data; void *list_data;
@ -65,7 +63,6 @@ _ephysics_body_soft_body_slices_apply(void *data __UNUSED__, Evas *e __UNUSED__,
btVector3 p0, p1, p2; btVector3 p0, p1, p2;
btSoftBody::tFaceArray faces; btSoftBody::tFaceArray faces;
EPhysics_Body_Soft_Body_Slice *slice; EPhysics_Body_Soft_Body_Slice *slice;
EPhysics_Body *body;
int lr, lg, lb, ar, ag, ab; int lr, lg, lb, ar, ag, ab;
Evas_Coord lx, ly, lz; Evas_Coord lx, ly, lz;
Eina_Bool light = EINA_FALSE; Eina_Bool light = EINA_FALSE;
@ -73,10 +70,8 @@ _ephysics_body_soft_body_slices_apply(void *data __UNUSED__, Evas *e __UNUSED__,
int px, py, pz, foc; int px, py, pz, foc;
Eina_Bool perspective = EINA_FALSE; Eina_Bool perspective = EINA_FALSE;
body = (EPhysics_Body *) evas_object_data_get(obj, BODY);
camera = ephysics_world_camera_get(body->world); camera = ephysics_world_camera_get(body->world);
rate = ephysics_world_rate_get(body->world); rate = ephysics_world_rate_get(body->world);
ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh, ephysics_world_render_geometry_get(body->world, NULL, &wy, NULL, NULL, &wh,
NULL); NULL);
evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h); evas_object_geometry_get(body->evas_obj, NULL, NULL, &w, &h);
@ -213,7 +208,6 @@ _ephysics_body_soft_body_slices_init(EPhysics_Body *body)
Evas *evas; Evas *evas;
evas = evas_object_evas_get(body->evas_obj); evas = evas_object_evas_get(body->evas_obj);
evas_object_data_set(body->evas_obj, BODY, body);
EINA_LIST_FOREACH(body->slices_list, l, slice_data) EINA_LIST_FOREACH(body->slices_list, l, slice_data)
{ {
@ -231,7 +225,7 @@ _ephysics_body_soft_body_slices_init(EPhysics_Body *body)
if (slice) if (slice)
evas_object_image_source_visible_set(slice->evas_obj, EINA_FALSE); evas_object_image_source_visible_set(slice->evas_obj, EINA_FALSE);
_ephysics_body_soft_body_slices_apply(NULL, NULL, body->evas_obj, NULL); _ephysics_body_soft_body_slices_apply(body);
} }
static void static void
@ -1091,7 +1085,10 @@ _ephysics_body_evas_object_default_update(EPhysics_Body *body)
} }
if (body->type != EPHYSICS_BODY_TYPE_RIGID) if (body->type != EPHYSICS_BODY_TYPE_RIGID)
return; {
_ephysics_body_soft_body_slices_apply(body);
return;
}
map = evas_map_new(4); map = evas_map_new(4);
evas_map_util_points_populate_from_object(map, body->evas_obj); evas_map_util_points_populate_from_object(map, body->evas_obj);
@ -2337,12 +2334,7 @@ ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_B
evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE, evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
_ephysics_body_evas_obj_resize_cb); _ephysics_body_evas_obj_resize_cb);
if (body->slices_list) if (body->slices_list)
{ _ephysics_body_soft_body_slices_clean(body);
_ephysics_body_soft_body_slices_clean(body);
evas_object_event_callback_del(
body->evas_obj, EVAS_CALLBACK_MOVE,
_ephysics_body_soft_body_slices_apply);
}
} }
body->evas_obj = evas_obj; body->evas_obj = evas_obj;
@ -2350,12 +2342,7 @@ ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_B
_ephysics_body_evas_obj_del_cb, body); _ephysics_body_evas_obj_del_cb, body);
if (body->soft_body) if (body->soft_body)
{ _ephysics_body_soft_body_slices_init(body);
_ephysics_body_soft_body_slices_init(body);
evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_MOVE,
_ephysics_body_soft_body_slices_apply,
NULL);
}
if (!use_obj_pos) if (!use_obj_pos)
return; return;
@ -2395,11 +2382,7 @@ ephysics_body_evas_object_unset(EPhysics_Body *body)
} }
if (body->slices_list) if (body->slices_list)
{ _ephysics_body_soft_body_slices_clean(body);
_ephysics_body_soft_body_slices_clean(body);
evas_object_event_callback_del(obj, EVAS_CALLBACK_MOVE,
_ephysics_body_soft_body_slices_apply);
}
return obj; return obj;
} }