enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

EPhysics: soft button improvements 

Use a bigger image to soft button tests, add light on/off button,
use of anchor hardness API.

--This line, and those below, will be ignored--


SVN revision: 80108
This commit is contained in:
Leandro Dorileo 2012-12-03 21:29:42 +00:00
parent d449396bed
commit 7df4546acf
4 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/ephysics/data/themes/Makefile.am
View File

@ -52,6 +52,7 @@ TEST_FILES = \
images/collisionL.png \
images/cube-blue.png \
images/cube-purple.png \
images/cube-purple420.png \
images/cube_back.png \
images/cube_bottom.png \
images/cube_front.png \

1
legacy/ephysics/data/themes/cubes.edc
View File

@ -20,6 +20,7 @@
ADD_CUBE(blue-cube, cube-blue);
ADD_CUBE(purple-cube, cube-purple);
ADD_CUBE(purple-cube420, cube-purple420);
ADD_CUBE(cube_top, cube_top);
ADD_CUBE(cube_bottom, cube_bottom);
ADD_CUBE(cube_front, cube_front);

BIN
legacy/ephysics/data/themes/images/cube-purple420.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

58
legacy/ephysics/src/bin/test_soft_button.c
View File

@ -15,17 +15,17 @@ _mouse_down_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, v
ephysics_body_geometry_get(body, NULL, NULL, &z, NULL, NULL, &d);
w = 70;
h = 70;
w = 80;
h = 80;
x = mdown->output.x - (w / 2);
y = mdown->output.y - (h / 2);
zz = z + (d / 2);
d = z;
d = d / 2;
triangles = ephysics_body_soft_body_triangles_inside_get(body, x, y, zz,
w, h, d);
ephysics_body_soft_body_triangle_list_impulse_apply(body, triangles, 0, 0,
-100);
200);
EINA_LIST_FREE(triangles, ldata)
free(ldata);
}
@ -37,23 +37,30 @@ _soft_ellipsoid_add(Test_Data *test_data, Evas_Object *front_face, Evas_Object *
Evas_Coord w, h;
body = ephysics_body_soft_ellipsoid_add(test_data->world, 100);
body = ephysics_body_soft_ellipsoid_add(test_data->world, 500);
ephysics_body_soft_body_position_iterations_set(body, 16);
ephysics_body_soft_body_anchor_hardness_set(body, 0);
ephysics_body_soft_body_hardness_set(body, 3);
ephysics_body_face_evas_object_set(body,
EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT, front_face, EINA_TRUE);
EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_FRONT,
front_face, EINA_TRUE);
ephysics_body_face_evas_object_set(body,
EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK, back_face, EINA_TRUE);
EPHYSICS_BODY_SOFT_ELLIPSOID_FACE_BACK,
back_face, EINA_TRUE);
ephysics_body_geometry_get(body, NULL, NULL, NULL, &w, &h, NULL);
ephysics_body_resize(body, w, h, h);
test_data->bodies = eina_list_append(test_data->bodies, body);
ephysics_body_linear_movement_enable_set(body, EINA_FALSE, EINA_FALSE,
EINA_FALSE);
ephysics_body_angular_movement_enable_set(body, EINA_FALSE, EINA_FALSE,
EINA_FALSE);
test_data->bodies = eina_list_append(test_data->bodies, body);
evas_object_event_callback_add(front_face, EVAS_CALLBACK_MOUSE_DOWN,
_mouse_down_cb, body);
@ -68,17 +75,19 @@ _world_populate(Test_Data *test_data)
front_face = elm_image_add(test_data->win);
elm_image_file_set(
front_face, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "blue-cube");
evas_object_move(front_face, WIDTH / 2 - 35, HEIGHT / 2 - 35);
evas_object_resize(front_face, 70, 70);
front_face, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj",
"purple-cube420");
evas_object_move(front_face, WIDTH / 4, HEIGHT / 4);
evas_object_resize(front_face, 280, 280);
evas_object_show(front_face);
test_data->evas_objs = eina_list_append(test_data->evas_objs, front_face);
back_face = elm_image_add(test_data->win);
elm_image_file_set(
back_face, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "blue-cube");
evas_object_move(back_face, WIDTH / 2 - 35, HEIGHT / 2 - 35);
evas_object_resize(back_face, 70, 70);
back_face, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj",
"purple-cube420");
evas_object_move(back_face, WIDTH / 4, HEIGHT / 4);
evas_object_resize(back_face, 280, 280);
evas_object_show(back_face);
test_data->evas_objs = eina_list_append(test_data->evas_objs, back_face);
@ -95,11 +104,19 @@ _restart(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED_
_world_populate(test_data);
}
static void
_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
EPhysics_World *world = data;
ephysics_world_light_all_bodies_set(world, elm_check_state_get(obj));
}
void
test_soft_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
EPhysics_World *world;
Test_Data *test_data;
Evas_Object *tg;
if (!ephysics_init())
return;
@ -111,13 +128,24 @@ test_soft_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
_restart, test_data);
elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test");
tg = elm_check_add(test_data->win);
elm_object_style_set(tg, "ephysics-test");
evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, 0.5);
elm_check_state_set(tg, EINA_FALSE);
evas_object_show(tg);
elm_layout_content_set(test_data->layout, "extra_input", tg);
world = ephysics_world_new();
ephysics_world_simulation_set(world, 1/150.f, 5);
ephysics_world_simulation_set(world, 1/260.f, 5);
ephysics_world_render_geometry_set(world, 50, 40, -50,
WIDTH - 100, FLOOR_Y - 40, DEPTH);
test_data->world = world;
ephysics_world_point_light_position_set(world, 300, 50, -200);
ephysics_camera_perspective_enabled_set(ephysics_world_camera_get(world),
EINA_TRUE);
evas_object_smart_callback_add(tg, "changed", _changed_cb, world);
_world_populate(test_data);
}