summaryrefslogtreecommitdiff
path: root/legacy/ephysics
diff options
context:
space:
mode:
authorLeandro Dorileo <dorileo@profusion.mobi>2012-12-11 21:10:53 +0000
committerLeandro Dorileo <dorileo@profusion.mobi>2012-12-11 21:10:53 +0000
commitc90d6c58426c40ebbd15e7d409fb61c195eecb31 (patch)
tree198ad6e15dd86c35efe9c867d802557145d0d65c /legacy/ephysics
parent2903b1f122650f333853ed7fdb0a7b3f1796bd49 (diff)
EPhysics: ephysics_body_circle_add() becomes ephysics_body_cylinder_add()
SVN revision: 80716
Diffstat (limited to 'legacy/ephysics')
-rw-r--r--legacy/ephysics/src/bin/ephysics_logo.c2
-rw-r--r--legacy/ephysics/src/bin/ephysics_sandbox.c4
-rw-r--r--legacy/ephysics/src/bin/test_bouncing_ball.c2
-rw-r--r--legacy/ephysics/src/bin/test_camera.c4
-rw-r--r--legacy/ephysics/src/bin/test_camera_track.c2
-rw-r--r--legacy/ephysics/src/bin/test_coins.c2
-rw-r--r--legacy/ephysics/src/bin/test_colliding_balls.c2
-rw-r--r--legacy/ephysics/src/bin/test_collision_detection.c4
-rw-r--r--legacy/ephysics/src/bin/test_collision_filter.c2
-rw-r--r--legacy/ephysics/src/bin/test_collision_speed.c2
-rw-r--r--legacy/ephysics/src/bin/test_delete.c4
-rw-r--r--legacy/ephysics/src/bin/test_growing_balls.c2
-rw-r--r--legacy/ephysics/src/bin/test_heavy.c2
-rw-r--r--legacy/ephysics/src/bin/test_jumping_balls.c5
-rw-r--r--legacy/ephysics/src/bin/test_light.c2
-rw-r--r--legacy/ephysics/src/bin/test_material.c2
-rw-r--r--legacy/ephysics/src/bin/test_sleeping_threshold.c4
-rw-r--r--legacy/ephysics/src/bin/test_soft_body.c2
-rw-r--r--legacy/ephysics/src/bin/test_velocity.c2
-rw-r--r--legacy/ephysics/src/bin/test_win_resize.c2
-rw-r--r--legacy/ephysics/src/lib/EPhysics.h34
-rw-r--r--legacy/ephysics/src/lib/ephysics_body.cpp6
22 files changed, 47 insertions, 46 deletions
diff --git a/legacy/ephysics/src/bin/ephysics_logo.c b/legacy/ephysics/src/bin/ephysics_logo.c
index 423908aa8c..2d055662f8 100644
--- a/legacy/ephysics/src/bin/ephysics_logo.c
+++ b/legacy/ephysics/src/bin/ephysics_logo.c
@@ -164,7 +164,7 @@ _letter_body_box_add(EPhysics_World *world, Evas_Object *image)
164static EPhysics_Body * 164static EPhysics_Body *
165_letter_body_circle_add(EPhysics_World *world, Evas_Object *image) 165_letter_body_circle_add(EPhysics_World *world, Evas_Object *image)
166{ 166{
167 EPhysics_Body *body = ephysics_body_circle_add(world); 167 EPhysics_Body *body = ephysics_body_cylinder_add(world);
168 168
169 _letter_body_setup_common(body, image); 169 _letter_body_setup_common(body, image);
170 170
diff --git a/legacy/ephysics/src/bin/ephysics_sandbox.c b/legacy/ephysics/src/bin/ephysics_sandbox.c
index a7c544a0e2..9a56094063 100644
--- a/legacy/ephysics/src/bin/ephysics_sandbox.c
+++ b/legacy/ephysics/src/bin/ephysics_sandbox.c
@@ -146,7 +146,7 @@ _type_set_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
146 } 146 }
147 else 147 else
148 { 148 {
149 body = ephysics_body_circle_add(world); 149 body = ephysics_body_cylinder_add(world);
150 elm_object_disabled_set(bd->controls.hardness, EINA_TRUE); 150 elm_object_disabled_set(bd->controls.hardness, EINA_TRUE);
151 } 151 }
152 152
@@ -937,7 +937,7 @@ _body_add(Evas_Object *win, EPhysics_World *world, int x, int y)
937 evas_object_move(body_image, x, y); 937 evas_object_move(body_image, x, y);
938 evas_object_show(body_image); 938 evas_object_show(body_image);
939 939
940 body = ephysics_body_circle_add(world); 940 body = ephysics_body_cylinder_add(world);
941 ephysics_body_evas_object_set(body, body_image, EINA_TRUE); 941 ephysics_body_evas_object_set(body, body_image, EINA_TRUE);
942 ephysics_body_mass_set(body, INITIAL_MASS); 942 ephysics_body_mass_set(body, INITIAL_MASS);
943 ephysics_body_event_callback_add(body, EPHYSICS_CALLBACK_BODY_DEL, 943 ephysics_body_event_callback_add(body, EPHYSICS_CALLBACK_BODY_DEL,
diff --git a/legacy/ephysics/src/bin/test_bouncing_ball.c b/legacy/ephysics/src/bin/test_bouncing_ball.c
index acf21f8cfc..74b8e6959b 100644
--- a/legacy/ephysics/src/bin/test_bouncing_ball.c
+++ b/legacy/ephysics/src/bin/test_bouncing_ball.c
@@ -47,7 +47,7 @@ _world_populate(Test_Data *test_data)
47 evas_object_show(sphere); 47 evas_object_show(sphere);
48 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 48 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
49 49
50 fall_body = ephysics_body_circle_add(test_data->world); 50 fall_body = ephysics_body_cylinder_add(test_data->world);
51 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE); 51 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE);
52 ephysics_body_restitution_set(fall_body, 0.95); 52 ephysics_body_restitution_set(fall_body, 0.95);
53 ephysics_body_friction_set(fall_body, 0.1); 53 ephysics_body_friction_set(fall_body, 0.1);
diff --git a/legacy/ephysics/src/bin/test_camera.c b/legacy/ephysics/src/bin/test_camera.c
index 92fc181c50..88787344ab 100644
--- a/legacy/ephysics/src/bin/test_camera.c
+++ b/legacy/ephysics/src/bin/test_camera.c
@@ -95,7 +95,7 @@ _world_populate(Camera_Data *camera_data)
95 camera_data->base.evas_objs = eina_list_append(camera_data->base.evas_objs, 95 camera_data->base.evas_objs = eina_list_append(camera_data->base.evas_objs,
96 sphere); 96 sphere);
97 97
98 fall_body = ephysics_body_circle_add(camera_data->base.world); 98 fall_body = ephysics_body_cylinder_add(camera_data->base.world);
99 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE); 99 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE);
100 ephysics_body_restitution_set(fall_body, 0.2); 100 ephysics_body_restitution_set(fall_body, 0.2);
101 ephysics_body_friction_set(fall_body, 0.5); 101 ephysics_body_friction_set(fall_body, 0.5);
@@ -123,7 +123,7 @@ _world_populate(Camera_Data *camera_data)
123 camera_data->base.evas_objs = eina_list_append(camera_data->base.evas_objs, 123 camera_data->base.evas_objs = eina_list_append(camera_data->base.evas_objs,
124 sphere); 124 sphere);
125 125
126 fall_body = ephysics_body_circle_add(camera_data->base.world); 126 fall_body = ephysics_body_cylinder_add(camera_data->base.world);
127 ephysics_body_mass_set(fall_body, 3.7); 127 ephysics_body_mass_set(fall_body, 3.7);
128 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE); 128 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE);
129 ephysics_body_restitution_set(fall_body, 0.12); 129 ephysics_body_restitution_set(fall_body, 0.12);
diff --git a/legacy/ephysics/src/bin/test_camera_track.c b/legacy/ephysics/src/bin/test_camera_track.c
index 5bc5b534b7..5d39fddcc5 100644
--- a/legacy/ephysics/src/bin/test_camera_track.c
+++ b/legacy/ephysics/src/bin/test_camera_track.c
@@ -126,7 +126,7 @@ _world_populate(Track_Data *track_data)
126 track_data->base.evas_objs = eina_list_append(track_data->base.evas_objs, 126 track_data->base.evas_objs = eina_list_append(track_data->base.evas_objs,
127 sphere); 127 sphere);
128 128
129 body = ephysics_body_circle_add(track_data->base.world); 129 body = ephysics_body_cylinder_add(track_data->base.world);
130 ephysics_body_evas_object_set(body, sphere, EINA_TRUE); 130 ephysics_body_evas_object_set(body, sphere, EINA_TRUE);
131 ephysics_body_restitution_set(body, 0.95); 131 ephysics_body_restitution_set(body, 0.95);
132 ephysics_body_friction_set(body, 1); 132 ephysics_body_friction_set(body, 1);
diff --git a/legacy/ephysics/src/bin/test_coins.c b/legacy/ephysics/src/bin/test_coins.c
index b3d8fc7a64..7d06179660 100644
--- a/legacy/ephysics/src/bin/test_coins.c
+++ b/legacy/ephysics/src/bin/test_coins.c
@@ -37,7 +37,7 @@ _coin_add(Test_Data *test_data, Evas_Coord x, Evas_Coord y)
37 front = _obj_face_add(test_data, "coin0", x, y); 37 front = _obj_face_add(test_data, "coin0", x, y);
38 back = _obj_face_add(test_data, "coin1", x, y); 38 back = _obj_face_add(test_data, "coin1", x, y);
39 39
40 coin = ephysics_body_circle_add(test_data->world); 40 coin = ephysics_body_cylinder_add(test_data->world);
41 ephysics_body_resize(coin, 1, 1, 1); 41 ephysics_body_resize(coin, 1, 1, 1);
42 ephysics_body_face_evas_object_set(coin, 42 ephysics_body_face_evas_object_set(coin,
43 EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT, 43 EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT,
diff --git a/legacy/ephysics/src/bin/test_colliding_balls.c b/legacy/ephysics/src/bin/test_colliding_balls.c
index 4d00ad07a5..11987d4f42 100644
--- a/legacy/ephysics/src/bin/test_colliding_balls.c
+++ b/legacy/ephysics/src/bin/test_colliding_balls.c
@@ -36,7 +36,7 @@ _world_populate(Test_Data *test_data)
36 evas_object_show(sphere); 36 evas_object_show(sphere);
37 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 37 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
38 38
39 fall_body = ephysics_body_circle_add(test_data->world); 39 fall_body = ephysics_body_cylinder_add(test_data->world);
40 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE); 40 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE);
41 ephysics_body_event_callback_add(fall_body, 41 ephysics_body_event_callback_add(fall_body,
42 EPHYSICS_CALLBACK_BODY_UPDATE, 42 EPHYSICS_CALLBACK_BODY_UPDATE,
diff --git a/legacy/ephysics/src/bin/test_collision_detection.c b/legacy/ephysics/src/bin/test_collision_detection.c
index 6978d3dafd..70d86e4a2b 100644
--- a/legacy/ephysics/src/bin/test_collision_detection.c
+++ b/legacy/ephysics/src/bin/test_collision_detection.c
@@ -58,7 +58,7 @@ _world_populate(Collision_Data *collision_data)
58 collision_data->base.evas_objs = eina_list_append( 58 collision_data->base.evas_objs = eina_list_append(
59 collision_data->base.evas_objs, sphere1); 59 collision_data->base.evas_objs, sphere1);
60 60
61 sphere_body1 = ephysics_body_circle_add(collision_data->base.world); 61 sphere_body1 = ephysics_body_cylinder_add(collision_data->base.world);
62 ephysics_body_evas_object_set(sphere_body1, sphere1, EINA_TRUE); 62 ephysics_body_evas_object_set(sphere_body1, sphere1, EINA_TRUE);
63 ephysics_body_event_callback_add(sphere_body1, 63 ephysics_body_event_callback_add(sphere_body1,
64 EPHYSICS_CALLBACK_BODY_UPDATE, 64 EPHYSICS_CALLBACK_BODY_UPDATE,
@@ -88,7 +88,7 @@ _world_populate(Collision_Data *collision_data)
88 collision_data->base.evas_objs = eina_list_append( 88 collision_data->base.evas_objs = eina_list_append(
89 collision_data->base.evas_objs, sphere2); 89 collision_data->base.evas_objs, sphere2);
90 90
91 sphere_body2 = ephysics_body_circle_add(collision_data->base.world); 91 sphere_body2 = ephysics_body_cylinder_add(collision_data->base.world);
92 ephysics_body_evas_object_set(sphere_body2, sphere2, EINA_TRUE); 92 ephysics_body_evas_object_set(sphere_body2, sphere2, EINA_TRUE);
93 ephysics_body_event_callback_add(sphere_body2, 93 ephysics_body_event_callback_add(sphere_body2,
94 EPHYSICS_CALLBACK_BODY_UPDATE, 94 EPHYSICS_CALLBACK_BODY_UPDATE,
diff --git a/legacy/ephysics/src/bin/test_collision_filter.c b/legacy/ephysics/src/bin/test_collision_filter.c
index 5b92135c87..3a0b5a07da 100644
--- a/legacy/ephysics/src/bin/test_collision_filter.c
+++ b/legacy/ephysics/src/bin/test_collision_filter.c
@@ -29,7 +29,7 @@ _world_populate(Test_Data *test_data)
29 evas_object_show(sphere); 29 evas_object_show(sphere);
30 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 30 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
31 31
32 fall_body = ephysics_body_circle_add(test_data->world); 32 fall_body = ephysics_body_cylinder_add(test_data->world);
33 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE); 33 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE);
34 ephysics_body_restitution_set(fall_body, 0.95); 34 ephysics_body_restitution_set(fall_body, 0.95);
35 ephysics_body_friction_set(fall_body, 0.1); 35 ephysics_body_friction_set(fall_body, 0.1);
diff --git a/legacy/ephysics/src/bin/test_collision_speed.c b/legacy/ephysics/src/bin/test_collision_speed.c
index 39e4180fa0..c95e70ab11 100644
--- a/legacy/ephysics/src/bin/test_collision_speed.c
+++ b/legacy/ephysics/src/bin/test_collision_speed.c
@@ -50,7 +50,7 @@ _world_populate(Speed_Data *speed_data)
50 speed_data->base.evas_objs = eina_list_append(speed_data->base.evas_objs, 50 speed_data->base.evas_objs = eina_list_append(speed_data->base.evas_objs,
51 sphere); 51 sphere);
52 52
53 ball = ephysics_body_circle_add(speed_data->base.world); 53 ball = ephysics_body_cylinder_add(speed_data->base.world);
54 ephysics_body_evas_object_set(ball, sphere, EINA_TRUE); 54 ephysics_body_evas_object_set(ball, sphere, EINA_TRUE);
55 ephysics_body_restitution_set(ball, 0.8); 55 ephysics_body_restitution_set(ball, 0.8);
56 ephysics_body_friction_set(ball, 0.2); 56 ephysics_body_friction_set(ball, 0.2);
diff --git a/legacy/ephysics/src/bin/test_delete.c b/legacy/ephysics/src/bin/test_delete.c
index 086386ed3e..25deaff70f 100644
--- a/legacy/ephysics/src/bin/test_delete.c
+++ b/legacy/ephysics/src/bin/test_delete.c
@@ -75,7 +75,7 @@ _world_populate(Collision_Data *collision_data)
75 collision_data->base.evas_objs = eina_list_append( 75 collision_data->base.evas_objs = eina_list_append(
76 collision_data->base.evas_objs, sphere1); 76 collision_data->base.evas_objs, sphere1);
77 77
78 sphere_body1 = ephysics_body_circle_add(collision_data->base.world); 78 sphere_body1 = ephysics_body_cylinder_add(collision_data->base.world);
79 ephysics_body_evas_object_set(sphere_body1, sphere1, EINA_TRUE); 79 ephysics_body_evas_object_set(sphere_body1, sphere1, EINA_TRUE);
80 ephysics_body_event_callback_add(sphere_body1, 80 ephysics_body_event_callback_add(sphere_body1,
81 EPHYSICS_CALLBACK_BODY_UPDATE, 81 EPHYSICS_CALLBACK_BODY_UPDATE,
@@ -108,7 +108,7 @@ _world_populate(Collision_Data *collision_data)
108 collision_data->base.evas_objs = eina_list_append( 108 collision_data->base.evas_objs = eina_list_append(
109 collision_data->base.evas_objs, sphere2); 109 collision_data->base.evas_objs, sphere2);
110 110
111 sphere_body2 = ephysics_body_circle_add(collision_data->base.world); 111 sphere_body2 = ephysics_body_cylinder_add(collision_data->base.world);
112 ephysics_body_evas_object_set(sphere_body2, sphere2, EINA_TRUE); 112 ephysics_body_evas_object_set(sphere_body2, sphere2, EINA_TRUE);
113 ephysics_body_event_callback_add(sphere_body2, 113 ephysics_body_event_callback_add(sphere_body2,
114 EPHYSICS_CALLBACK_BODY_UPDATE, 114 EPHYSICS_CALLBACK_BODY_UPDATE,
diff --git a/legacy/ephysics/src/bin/test_growing_balls.c b/legacy/ephysics/src/bin/test_growing_balls.c
index 0f252e6f89..b1f9ec1bb9 100644
--- a/legacy/ephysics/src/bin/test_growing_balls.c
+++ b/legacy/ephysics/src/bin/test_growing_balls.c
@@ -41,7 +41,7 @@ _add_sphere(Test_Data *test_data, const char *group, int size, int x, int y)
41 evas_object_show(sphere); 41 evas_object_show(sphere);
42 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 42 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
43 43
44 sphere_body = ephysics_body_circle_add(test_data->world); 44 sphere_body = ephysics_body_cylinder_add(test_data->world);
45 ephysics_body_evas_object_set(sphere_body, sphere, EINA_TRUE); 45 ephysics_body_evas_object_set(sphere_body, sphere, EINA_TRUE);
46 ephysics_body_restitution_set(sphere_body, 0.5); 46 ephysics_body_restitution_set(sphere_body, 0.5);
47 ephysics_body_central_impulse_apply(sphere_body, 300, 0, 0); 47 ephysics_body_central_impulse_apply(sphere_body, 300, 0, 0);
diff --git a/legacy/ephysics/src/bin/test_heavy.c b/legacy/ephysics/src/bin/test_heavy.c
index d0f530271f..ee4ab0f69f 100644
--- a/legacy/ephysics/src/bin/test_heavy.c
+++ b/legacy/ephysics/src/bin/test_heavy.c
@@ -19,7 +19,7 @@ _add_sphere(Test_Data *test_data, int i)
19 evas_object_show(sphere); 19 evas_object_show(sphere);
20 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 20 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
21 21
22 body = ephysics_body_circle_add(test_data->world); 22 body = ephysics_body_cylinder_add(test_data->world);
23 ephysics_body_restitution_set(body, 0.85); 23 ephysics_body_restitution_set(body, 0.85);
24 ephysics_body_evas_object_set(body, sphere, EINA_TRUE); 24 ephysics_body_evas_object_set(body, sphere, EINA_TRUE);
25 test_data->bodies = eina_list_append(test_data->bodies, body); 25 test_data->bodies = eina_list_append(test_data->bodies, body);
diff --git a/legacy/ephysics/src/bin/test_jumping_balls.c b/legacy/ephysics/src/bin/test_jumping_balls.c
index 999a6bb219..47c402ed17 100644
--- a/legacy/ephysics/src/bin/test_jumping_balls.c
+++ b/legacy/ephysics/src/bin/test_jumping_balls.c
@@ -59,8 +59,9 @@ _add_sphere(Test_Data *test_data, int i)
59 evas_object_show(sphere); 59 evas_object_show(sphere);
60 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 60 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
61 61
62 fall_body = ephysics_body_circle_add(test_data->world); 62 fall_body = ephysics_body_cylinder_add(test_data->world);
63 ephysics_body_linear_movement_enable_set(fall_body, EINA_TRUE, EINA_TRUE, EINA_TRUE); 63 ephysics_body_linear_movement_enable_set(fall_body, EINA_TRUE, EINA_TRUE,
64 EINA_TRUE);
64 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE); 65 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE);
65 ephysics_body_event_callback_add(fall_body, EPHYSICS_CALLBACK_BODY_UPDATE, 66 ephysics_body_event_callback_add(fall_body, EPHYSICS_CALLBACK_BODY_UPDATE,
66 update_object_cb, shadow); 67 update_object_cb, shadow);
diff --git a/legacy/ephysics/src/bin/test_light.c b/legacy/ephysics/src/bin/test_light.c
index 240e8f4ba9..81de0e803c 100644
--- a/legacy/ephysics/src/bin/test_light.c
+++ b/legacy/ephysics/src/bin/test_light.c
@@ -33,7 +33,7 @@ _ball_add(Test_Data *test_data, int x)
33 evas_object_show(sphere); 33 evas_object_show(sphere);
34 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 34 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
35 35
36 ball = ephysics_body_circle_add(test_data->world); 36 ball = ephysics_body_cylinder_add(test_data->world);
37 ephysics_body_evas_object_set(ball, sphere, EINA_TRUE); 37 ephysics_body_evas_object_set(ball, sphere, EINA_TRUE);
38 ephysics_body_restitution_set(ball, 0.95); 38 ephysics_body_restitution_set(ball, 0.95);
39 ephysics_body_friction_set(ball, 0.1); 39 ephysics_body_friction_set(ball, 0.1);
diff --git a/legacy/ephysics/src/bin/test_material.c b/legacy/ephysics/src/bin/test_material.c
index aa043a074c..57c766a33e 100644
--- a/legacy/ephysics/src/bin/test_material.c
+++ b/legacy/ephysics/src/bin/test_material.c
@@ -56,7 +56,7 @@ _world_populate(Test_Data *test_data)
56 evas_object_show(sphere); 56 evas_object_show(sphere);
57 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 57 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
58 58
59 fall_body = ephysics_body_circle_add(test_data->world); 59 fall_body = ephysics_body_cylinder_add(test_data->world);
60 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE); 60 ephysics_body_evas_object_set(fall_body, sphere, EINA_TRUE);
61 ephysics_body_event_callback_add(fall_body, EPHYSICS_CALLBACK_BODY_UPDATE, 61 ephysics_body_event_callback_add(fall_body, EPHYSICS_CALLBACK_BODY_UPDATE,
62 update_object_cb, shadow); 62 update_object_cb, shadow);
diff --git a/legacy/ephysics/src/bin/test_sleeping_threshold.c b/legacy/ephysics/src/bin/test_sleeping_threshold.c
index 195f291907..bf38fb2ca3 100644
--- a/legacy/ephysics/src/bin/test_sleeping_threshold.c
+++ b/legacy/ephysics/src/bin/test_sleeping_threshold.c
@@ -27,7 +27,7 @@ _world_populate(Test_Data *test_data)
27 evas_object_show(sphere1); 27 evas_object_show(sphere1);
28 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere1); 28 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere1);
29 29
30 sphere_body1 = ephysics_body_circle_add(test_data->world); 30 sphere_body1 = ephysics_body_cylinder_add(test_data->world);
31 ephysics_body_evas_object_set(sphere_body1, sphere1, EINA_TRUE); 31 ephysics_body_evas_object_set(sphere_body1, sphere1, EINA_TRUE);
32 ephysics_body_event_callback_add(sphere_body1, 32 ephysics_body_event_callback_add(sphere_body1,
33 EPHYSICS_CALLBACK_BODY_UPDATE, 33 EPHYSICS_CALLBACK_BODY_UPDATE,
@@ -55,7 +55,7 @@ _world_populate(Test_Data *test_data)
55 evas_object_show(sphere2); 55 evas_object_show(sphere2);
56 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere2); 56 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere2);
57 57
58 sphere_body2 = ephysics_body_circle_add(test_data->world); 58 sphere_body2 = ephysics_body_cylinder_add(test_data->world);
59 ephysics_body_evas_object_set(sphere_body2, sphere2, EINA_TRUE); 59 ephysics_body_evas_object_set(sphere_body2, sphere2, EINA_TRUE);
60 ephysics_body_event_callback_add(sphere_body2, 60 ephysics_body_event_callback_add(sphere_body2,
61 EPHYSICS_CALLBACK_BODY_UPDATE, 61 EPHYSICS_CALLBACK_BODY_UPDATE,
diff --git a/legacy/ephysics/src/bin/test_soft_body.c b/legacy/ephysics/src/bin/test_soft_body.c
index b9dd5bcae1..b595a31542 100644
--- a/legacy/ephysics/src/bin/test_soft_body.c
+++ b/legacy/ephysics/src/bin/test_soft_body.c
@@ -76,7 +76,7 @@ _world_populate(Test_Data *test_data)
76 evas_object_show(evas_obj); 76 evas_object_show(evas_obj);
77 test_data->evas_objs = eina_list_append(test_data->evas_objs, evas_obj); 77 test_data->evas_objs = eina_list_append(test_data->evas_objs, evas_obj);
78 78
79 fall_body = ephysics_body_circle_add(test_data->world); 79 fall_body = ephysics_body_cylinder_add(test_data->world);
80 ephysics_body_mass_set(fall_body, 2); 80 ephysics_body_mass_set(fall_body, 2);
81 ephysics_body_evas_object_set(fall_body, evas_obj, EINA_TRUE); 81 ephysics_body_evas_object_set(fall_body, evas_obj, EINA_TRUE);
82 ephysics_body_restitution_set(fall_body, 0.95); 82 ephysics_body_restitution_set(fall_body, 0.95);
diff --git a/legacy/ephysics/src/bin/test_velocity.c b/legacy/ephysics/src/bin/test_velocity.c
index 4cfa1c2e75..9f3d4a5d67 100644
--- a/legacy/ephysics/src/bin/test_velocity.c
+++ b/legacy/ephysics/src/bin/test_velocity.c
@@ -106,7 +106,7 @@ _world_populate(Velocity_Data *velocity_data)
106 velocity_data->base.evas_objs = eina_list_append( 106 velocity_data->base.evas_objs = eina_list_append(
107 velocity_data->base.evas_objs, sphere); 107 velocity_data->base.evas_objs, sphere);
108 108
109 sphere_body = ephysics_body_circle_add(velocity_data->base.world); 109 sphere_body = ephysics_body_cylinder_add(velocity_data->base.world);
110 ephysics_body_evas_object_set(sphere_body, sphere, EINA_TRUE); 110 ephysics_body_evas_object_set(sphere_body, sphere, EINA_TRUE);
111 ephysics_body_restitution_set(sphere_body, 0.8); 111 ephysics_body_restitution_set(sphere_body, 0.8);
112 ephysics_body_friction_set(sphere_body, 1); 112 ephysics_body_friction_set(sphere_body, 1);
diff --git a/legacy/ephysics/src/bin/test_win_resize.c b/legacy/ephysics/src/bin/test_win_resize.c
index 6c4b0c4779..e790608230 100644
--- a/legacy/ephysics/src/bin/test_win_resize.c
+++ b/legacy/ephysics/src/bin/test_win_resize.c
@@ -136,7 +136,7 @@ _world_populate(Test_Data *test_data)
136 evas_object_show(sphere); 136 evas_object_show(sphere);
137 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere); 137 test_data->evas_objs = eina_list_append(test_data->evas_objs, sphere);
138 138
139 sphere_body = ephysics_body_circle_add(test_data->world); 139 sphere_body = ephysics_body_cylinder_add(test_data->world);
140 ephysics_body_evas_object_set(sphere_body, sphere, EINA_TRUE); 140 ephysics_body_evas_object_set(sphere_body, sphere, EINA_TRUE);
141 ephysics_body_restitution_set(sphere_body, 1.0); 141 ephysics_body_restitution_set(sphere_body, 1.0);
142 ephysics_body_event_callback_add(sphere_body, EPHYSICS_CALLBACK_BODY_UPDATE, 142 ephysics_body_event_callback_add(sphere_body, EPHYSICS_CALLBACK_BODY_UPDATE,
diff --git a/legacy/ephysics/src/lib/EPhysics.h b/legacy/ephysics/src/lib/EPhysics.h
index 072f40974b..ec6d79981e 100644
--- a/legacy/ephysics/src/lib/EPhysics.h
+++ b/legacy/ephysics/src/lib/EPhysics.h
@@ -450,7 +450,7 @@ EAPI double ephysics_quaternion_length2_get(const EPhysics_Quaternion *quat);
450 * @{ 450 * @{
451 * 451 *
452 * Shapes are used to create bodies with shapes that differ from primitive 452 * Shapes are used to create bodies with shapes that differ from primitive
453 * ones, like box and circle. 453 * ones, like box and cylinder.
454 * 454 *
455 * A shape consists in a group of points, the vertices of the body to be 455 * A shape consists in a group of points, the vertices of the body to be
456 * created later with @ref ephysics_body_shape_add(). 456 * created later with @ref ephysics_body_shape_add().
@@ -618,7 +618,7 @@ EAPI Eina_Bool ephysics_shape_save(const EPhysics_Shape *shape, const char *file
618 * Body handle, represents an object on EPhysics world. 618 * Body handle, represents an object on EPhysics world.
619 * 619 *
620 * Many types of bodies can be created: 620 * Many types of bodies can be created:
621 * @li @ref ephysics_body_circle_add() 621 * @li @ref ephysics_body_cylinder_add()
622 * @li @ref ephysics_body_box_add() 622 * @li @ref ephysics_body_box_add()
623 * @li @ref ephysics_body_shape_add() 623 * @li @ref ephysics_body_shape_add()
624 * @li @ref ephysics_body_soft_circle_add() 624 * @li @ref ephysics_body_soft_circle_add()
@@ -1291,7 +1291,7 @@ EAPI double ephysics_world_rate_get(const EPhysics_World *world);
1291 * 1291 *
1292 * @note The list should be freed after usage. 1292 * @note The list should be freed after usage.
1293 * 1293 *
1294 * @see ephysics_body_circle_add(). 1294 * @see ephysics_body_cylinder_add().
1295 * @see ephysics_body_box_add(). 1295 * @see ephysics_body_box_add().
1296 * @see ephysics_body_del(). 1296 * @see ephysics_body_del().
1297 * 1297 *
@@ -1952,7 +1952,7 @@ EAPI Eina_Bool ephysics_world_stack_enable_get(const EPhysics_World *world);
1952 * A body is a representation of an object inside a physics world. 1952 * A body is a representation of an object inside a physics world.
1953 * 1953 *
1954 * Bodies can have different shapes that can be created with: 1954 * Bodies can have different shapes that can be created with:
1955 * @li @ref ephysics_body_circle_add(); 1955 * @li @ref ephysics_body_cylinder_add();
1956 * @li @ref ephysics_body_box_add(); 1956 * @li @ref ephysics_body_box_add();
1957 * @li or @ref ephysics_body_shape_add(). 1957 * @li or @ref ephysics_body_shape_add().
1958 * 1958 *
@@ -2670,17 +2670,17 @@ EAPI void ephysics_body_soft_body_bending_constraints_add(EPhysics_Body *body, i
2670 2670
2671/** 2671/**
2672 * @brief 2672 * @brief
2673 * Create a new circle physics body. 2673 * Create a new cylinder physics body.
2674 * 2674 *
2675 * Its collision shape will be a circle of diameter 1. To change it's size 2675 * Its collision shape will be a cylinder of diameter 1. To change it's size
2676 * @ref ephysics_body_geometry_set() should be used. 2676 * @ref ephysics_body_geometry_set() should be used.
2677 * 2677 *
2678 * Any evas object can be associated to it with 2678 * Any evas object can be associated to it with
2679 * @ref ephysics_body_evas_object_set(), 2679 * @ref ephysics_body_evas_object_set(),
2680 * and it will collide as a circle (even if you have an evas rectangle). 2680 * and it will collide as a cylinder (even if you have an evas rectangle).
2681 * 2681 *
2682 * If a circle that could have its shape deformed is required, use 2682 * If a cylinder that could have its shape deformed is required, use
2683 * @ref ephysics_body_soft_box_add(). 2683 * @ref ephysics_body_soft_circle_add().
2684 * 2684 *
2685 * @param world The world this body will belongs to. 2685 * @param world The world this body will belongs to.
2686 * @return a new body or @c NULL, on errors. 2686 * @return a new body or @c NULL, on errors.
@@ -2691,7 +2691,7 @@ EAPI void ephysics_body_soft_body_bending_constraints_add(EPhysics_Body *body, i
2691 * 2691 *
2692 * @ingroup EPhysics_Body 2692 * @ingroup EPhysics_Body
2693 */ 2693 */
2694EAPI EPhysics_Body *ephysics_body_circle_add(EPhysics_World *world); 2694EAPI EPhysics_Body *ephysics_body_cylinder_add(EPhysics_World *world);
2695 2695
2696/** 2696/**
2697 * @brief 2697 * @brief
@@ -2711,7 +2711,7 @@ EAPI EPhysics_Body *ephysics_body_circle_add(EPhysics_World *world);
2711 * @note When working with soft bodies it's importante to adjust the 2711 * @note When working with soft bodies it's importante to adjust the
2712 * simulation's fixed time step due its multi point nature. 2712 * simulation's fixed time step due its multi point nature.
2713 * 2713 *
2714 * For a rigid circle, check @ref ephysics_body_circle_add(). 2714 * For a rigid cylinder, check @ref ephysics_body_cylinder_add().
2715 * 2715 *
2716 * @param world The world this body will belongs to. 2716 * @param world The world this body will belongs to.
2717 * @return a new body or @c NULL, on errors. 2717 * @return a new body or @c NULL, on errors.
@@ -2759,7 +2759,7 @@ EAPI EPhysics_Body *ephysics_body_box_add(EPhysics_World *world);
2759 * @note When working with soft bodies it's importante to adjust the 2759 * @note When working with soft bodies it's importante to adjust the
2760 * simulation's fixed time step due its multi point nature. 2760 * simulation's fixed time step due its multi point nature.
2761 * 2761 *
2762 * For a rigid circle, check @ref ephysics_body_circle_add(). 2762 * For a rigid cylinder, check @ref ephysics_body_cylinder_add().
2763 * 2763 *
2764 * @param world The world this body will belong to. 2764 * @param world The world this body will belong to.
2765 * @return a new body or @c NULL on errors. 2765 * @return a new body or @c NULL on errors.
@@ -3003,7 +3003,7 @@ EAPI EPhysics_Body *ephysics_body_back_boundary_add(EPhysics_World *world);
3003 * @param body The body to be deleted. 3003 * @param body The body to be deleted.
3004 * 3004 *
3005 * @see ephysics_body_box_add(). 3005 * @see ephysics_body_box_add().
3006 * @see ephysics_body_circle_add(). 3006 * @see ephysics_body_cylinder_add().
3007 * 3007 *
3008 * @ingroup EPhysics_Body 3008 * @ingroup EPhysics_Body
3009 */ 3009 */
@@ -3048,7 +3048,7 @@ EAPI EPhysics_World *ephysics_body_world_get(const EPhysics_Body *body);
3048 * 3048 *
3049 * @see ephysics_body_box_add(). 3049 * @see ephysics_body_box_add().
3050 * @see ephysics_body_soft_box_add(). 3050 * @see ephysics_body_soft_box_add().
3051 * @see ephysics_body_circle_add(). 3051 * @see ephysics_body_cylinder_add().
3052 * @see ephysics_body_soft_circle_add(). 3052 * @see ephysics_body_soft_circle_add().
3053 * @see ephysics_body_evas_object_unset(). 3053 * @see ephysics_body_evas_object_unset().
3054 * @see ephysics_world_rate_set(). 3054 * @see ephysics_world_rate_set().
@@ -3147,7 +3147,7 @@ EAPI Evas_Object *ephysics_body_face_evas_object_unset(EPhysics_Body *body, EPhy
3147 * @brief 3147 * @brief
3148 * Set physics body size. 3148 * Set physics body size.
3149 * 3149 *
3150 * By default circles have diameter equal to 1 meter * rate, boxes have 3150 * By default cylinders have diameter equal to 1 meter * rate, boxes have
3151 * dimensions 1 meter * rate on all the axes. 3151 * dimensions 1 meter * rate on all the axes.
3152 * 3152 *
3153 * There are three direct ways of modifying it's size: 3153 * There are three direct ways of modifying it's size:
@@ -3206,7 +3206,7 @@ EAPI void ephysics_body_move(EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Ev
3206 * Set physics body geometry. 3206 * Set physics body geometry.
3207 * 3207 *
3208 * All the physics bodies are created centered on origin (0, 0) and with 3208 * All the physics bodies are created centered on origin (0, 0) and with
3209 * canonical dimensions. Circles have diameter 1, boxes have dimensions 1 3209 * canonical dimensions. Cylinder have diameter 1, boxes have dimensions 1
3210 * on all the axes. 3210 * on all the axes.
3211 * 3211 *
3212 * There are four direct ways of modifying this geometry: 3212 * There are four direct ways of modifying this geometry:
@@ -4246,7 +4246,7 @@ EAPI void ephysics_body_forces_clear(EPhysics_Body *body);
4246 * mass at x component = 20, y component = 10 and z = 10, it will return 4246 * mass at x component = 20, y component = 10 and z = 10, it will return
4247 * @p x = 0.666, @p y = 0.5 and @p z = 0.5. 4247 * @p x = 0.666, @p y = 0.5 and @p z = 0.5.
4248 * 4248 *
4249 * For primitive shapes, like box and circle, the center of mass 4249 * For primitive shapes, like box and cylinder, the center of mass
4250 * is (0.5, 0.5, 0.5). 4250 * is (0.5, 0.5, 0.5).
4251 * 4251 *
4252 * This function can be useful when updating evas objects for bodies 4252 * This function can be useful when updating evas objects for bodies
diff --git a/legacy/ephysics/src/lib/ephysics_body.cpp b/legacy/ephysics/src/lib/ephysics_body.cpp
index 7fb263a927..5c7a061e60 100644
--- a/legacy/ephysics/src/lib/ephysics_body.cpp
+++ b/legacy/ephysics/src/lib/ephysics_body.cpp
@@ -2841,14 +2841,14 @@ no_collision_shape:
2841} 2841}
2842 2842
2843EAPI EPhysics_Body * 2843EAPI EPhysics_Body *
2844ephysics_body_circle_add(EPhysics_World *world) 2844ephysics_body_cylinder_add(EPhysics_World *world)
2845{ 2845{
2846 btCollisionShape *collision_shape; 2846 btCollisionShape *collision_shape;
2847 EPhysics_Body *body; 2847 EPhysics_Body *body;
2848 2848
2849 if (!world) 2849 if (!world)
2850 { 2850 {
2851 ERR("Can't add circle, world is null."); 2851 ERR("Can't add cylinder, world is null.");
2852 return NULL; 2852 return NULL;
2853 } 2853 }
2854 2854
@@ -2860,7 +2860,7 @@ ephysics_body_circle_add(EPhysics_World *world)
2860 } 2860 }
2861 2861
2862 ephysics_world_lock_take(world); 2862 ephysics_world_lock_take(world);
2863 body = _ephysics_body_rigid_body_add(world, collision_shape, "circle", 0.5, 2863 body = _ephysics_body_rigid_body_add(world, collision_shape, "cylinder", 0.5,
2864 0.5, 0.5); 2864 0.5, 0.5);
2865 body->shape = EPHYSICS_BODY_SHAPE_CYLINDER; 2865 body->shape = EPHYSICS_BODY_SHAPE_CYLINDER;
2866 ephysics_world_lock_release(world); 2866 ephysics_world_lock_release(world);