summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-03 14:03:49 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 14:03:49 +0000
commit088df1425e5ee03f3f26ce209b2040985e8231c5 (patch)
tree8392f28ad2068908d4edeef73c23642c97f91813
parent1c72554acc7b7390e65b487d2a428b6faea068b8 (diff)
Adjust according to recent Eo4 changes.
-rw-r--r--src/bin/about.c17
-rw-r--r--src/bin/font_effect_blur_alpha.c2
-rw-r--r--src/bin/font_effect_blur_color.c2
-rw-r--r--src/bin/image_blend_border.c14
-rw-r--r--src/bin/image_blend_border_recolor.c16
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c14
-rw-r--r--src/bin/image_blend_fade_unscaled.c13
-rw-r--r--src/bin/image_blend_many_smooth_same_scaled.c15
-rw-r--r--src/bin/image_blend_nearest_same_scaled.c14
-rw-r--r--src/bin/image_blend_nearest_scaled.c14
-rw-r--r--src/bin/image_blend_nearest_solid_same_scaled.c14
-rw-r--r--src/bin/image_blend_nearest_solid_scaled.c14
-rw-r--r--src/bin/image_blend_occlude1.c16
-rw-r--r--src/bin/image_blend_occlude1_few.c16
-rw-r--r--src/bin/image_blend_occlude1_many.c16
-rw-r--r--src/bin/image_blend_occlude1_very_many.c16
-rw-r--r--src/bin/image_blend_occlude2.c16
-rw-r--r--src/bin/image_blend_occlude2_few.c16
-rw-r--r--src/bin/image_blend_occlude2_many.c16
-rw-r--r--src/bin/image_blend_occlude2_very_many.c16
-rw-r--r--src/bin/image_blend_occlude3.c16
-rw-r--r--src/bin/image_blend_occlude3_few.c16
-rw-r--r--src/bin/image_blend_occlude3_many.c16
-rw-r--r--src/bin/image_blend_occlude3_very_many.c16
-rw-r--r--src/bin/image_blend_smooth_same_scaled.c14
-rw-r--r--src/bin/image_blend_smooth_scaled.c14
-rw-r--r--src/bin/image_blend_smooth_solid_same_scaled.c14
-rw-r--r--src/bin/image_blend_smooth_solid_scaled.c14
-rw-r--r--src/bin/image_blend_solid_border.c14
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c14
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c14
-rw-r--r--src/bin/image_blend_solid_middle_border.c16
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c15
-rw-r--r--src/bin/image_blend_solid_unscaled.c11
-rw-r--r--src/bin/image_blend_unscaled.c11
-rw-r--r--src/bin/image_crossfade.c20
-rw-r--r--src/bin/image_data_argb.c31
-rw-r--r--src/bin/image_data_argb_alpha.c31
-rw-r--r--src/bin/image_data_ycbcr601pl.c26
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c24
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c22
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c34
-rw-r--r--src/bin/image_map_3d_1.c24
-rw-r--r--src/bin/image_map_3d_2.c22
-rw-r--r--src/bin/image_map_3d_3.c20
-rw-r--r--src/bin/image_map_3d_4.c18
-rw-r--r--src/bin/image_map_3d_5.c24
-rw-r--r--src/bin/image_map_3d_6.c24
-rw-r--r--src/bin/image_map_3d_flow.c40
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c16
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c16
-rw-r--r--src/bin/image_map_color_alpha_rotate.c14
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c14
-rw-r--r--src/bin/image_map_color_nearest_rotate.c16
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c16
-rw-r--r--src/bin/image_map_color_rotate.c14
-rw-r--r--src/bin/image_map_color_solid_rotate.c14
-rw-r--r--src/bin/image_map_nearest_rotate.c16
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c16
-rw-r--r--src/bin/image_map_rotate.c12
-rw-r--r--src/bin/image_map_solid_rotate.c14
-rw-r--r--src/bin/image_mask.c26
-rw-r--r--src/bin/image_mask_10.c31
-rw-r--r--src/bin/image_mask_11.c33
-rw-r--r--src/bin/image_mask_12.c35
-rw-r--r--src/bin/image_mask_13.c35
-rw-r--r--src/bin/image_mask_2.c26
-rw-r--r--src/bin/image_mask_3.c26
-rw-r--r--src/bin/image_mask_4.c28
-rw-r--r--src/bin/image_mask_5.c28
-rw-r--r--src/bin/image_mask_6.c28
-rw-r--r--src/bin/image_mask_7.c35
-rw-r--r--src/bin/image_mask_8.c28
-rw-r--r--src/bin/image_mask_9.c33
-rw-r--r--src/bin/image_quality_scale.c14
-rw-r--r--src/bin/line_blend.c14
-rw-r--r--src/bin/poly_blend.c56
-rw-r--r--src/bin/proxy_image.c20
-rw-r--r--src/bin/proxy_image_offscreen.c18
-rw-r--r--src/bin/proxy_text_fixed.c34
-rw-r--r--src/bin/proxy_text_random.c37
-rw-r--r--src/bin/rect_blend.c10
-rw-r--r--src/bin/rect_blend_few.c8
-rw-r--r--src/bin/rect_blend_pow2.c10
-rw-r--r--src/bin/rect_blend_pow2_few.c8
-rw-r--r--src/bin/rect_solid.c10
-rw-r--r--src/bin/rect_solid_few.c8
-rw-r--r--src/bin/snapshot_widgets_file_icons.c47
-rw-r--r--src/bin/text_basic.c12
-rw-r--r--src/bin/text_change.c14
-rw-r--r--src/bin/text_styles.c23
-rw-r--r--src/bin/text_styles_different_strings.c22
-rw-r--r--src/bin/textblock_auto_align.c22
-rw-r--r--src/bin/textblock_basic.c44
-rw-r--r--src/bin/textblock_intl.c22
-rw-r--r--src/bin/textblock_text_append.c21
-rw-r--r--src/bin/ui.c188
-rw-r--r--src/bin/vg_basic_circle.c20
-rw-r--r--src/bin/vg_basic_gradient.c31
-rw-r--r--src/bin/vg_basic_rect.c20
-rw-r--r--src/bin/vg_scaled.c50
-rw-r--r--src/bin/widgets_file_icons.c26
-rw-r--r--src/bin/widgets_file_icons_2.c22
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c26
-rw-r--r--src/bin/widgets_file_icons_2_same.c22
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c24
-rw-r--r--src/bin/widgets_file_icons_3.c22
-rw-r--r--src/bin/widgets_file_icons_4.c22
-rw-r--r--src/bin/widgets_list_1.c24
-rw-r--r--src/bin/widgets_list_1_grouped.c28
-rw-r--r--src/bin/widgets_list_2.c24
-rw-r--r--src/bin/widgets_list_2_grouped.c28
-rw-r--r--src/bin/widgets_list_3.c36
-rw-r--r--src/bin/widgets_list_3_grouped.c44
-rw-r--r--src/bin/widgets_list_4.c36
-rw-r--r--src/bin/widgets_list_4_grouped.c44
116 files changed, 1217 insertions, 1416 deletions
diff --git a/src/bin/about.c b/src/bin/about.c
index 19eb272..f225b4a 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -9,9 +9,9 @@ _setup(void)
9 Evas_Textblock_Style *st; 9 Evas_Textblock_Style *st;
10 10
11 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 11 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
12 eo_do(o, efl_gfx_position_set(10, 40), 12 efl_gfx_position_set(o, 10, 40);
13 efl_gfx_size_set(win_w - 20, win_h - 50), 13 efl_gfx_size_set(o, win_w - 20, win_h - 50);
14 efl_gfx_visible_set(EINA_TRUE)); 14 efl_gfx_visible_set(o, EINA_TRUE);
15 st = evas_textblock_style_new(); 15 st = evas_textblock_style_new();
16 evas_textblock_style_set 16 evas_textblock_style_set
17 (st, 17 (st,
@@ -21,10 +21,10 @@ _setup(void)
21 "p='+ font=Vera font_size=10 align=left'" 21 "p='+ font=Vera font_size=10 align=left'"
22 "/p='- \n \n'" 22 "/p='- \n \n'"
23 ); 23 );
24 eo_do(o, evas_obj_textblock_style_set(st), 24 evas_obj_textblock_style_set(o, st);
25 evas_obj_textblock_clear(), 25 evas_obj_textblock_clear(o);
26 evas_obj_textblock_text_markup_set 26 evas_obj_textblock_text_markup_set
27 ("<center>" 27 (o, "<center>"
28 "Enlightenment used to be a window manager project, but " 28 "Enlightenment used to be a window manager project, but "
29 "since has changed a lot to become a miniature desktop and mobile " 29 "since has changed a lot to become a miniature desktop and mobile "
30 "device environment all of its own. It is now made up of many " 30 "device environment all of its own. It is now made up of many "
@@ -40,8 +40,7 @@ _setup(void)
40 "DirectFB and other targets to boot. It handles high level graphic " 40 "DirectFB and other targets to boot. It handles high level graphic "
41 "layout descriptions that applications set up, dealing with the hard " 41 "layout descriptions that applications set up, dealing with the hard "
42 "work of doing the drawing for them." 42 "work of doing the drawing for them."
43 "</center>" 43 "</center>");
44 ));
45 evas_textblock_style_free(st); 44 evas_textblock_style_free(st);
46 o_text = o; 45 o_text = o;
47 ui_fps(0.0); 46 ui_fps(0.0);
diff --git a/src/bin/font_effect_blur_alpha.c b/src/bin/font_effect_blur_alpha.c
index 14563e1..9e9598d 100644
--- a/src/bin/font_effect_blur_alpha.c
+++ b/src/bin/font_effect_blur_alpha.c
@@ -54,7 +54,7 @@ static void _loop(double t, int f)
54 char buf[256]; 54 char buf[256];
55 char *str = "padding_set({ %d });blur({%d,color=black });"; 55 char *str = "padding_set({ %d });blur({%d,color=black });";
56 sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1)); 56 sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
57 eo_do(text, efl_gfx_filter_program_set(buf, "test")); 57 efl_gfx_filter_program_set(text, buf, "test");
58 58
59 FPS_STD(NAME); 59 FPS_STD(NAME);
60} 60}
diff --git a/src/bin/font_effect_blur_color.c b/src/bin/font_effect_blur_color.c
index 8f405e0..0f7db29 100644
--- a/src/bin/font_effect_blur_color.c
+++ b/src/bin/font_effect_blur_color.c
@@ -56,7 +56,7 @@ static void _loop(double t, int f)
56 char buf[256]; 56 char buf[256];
57 char *str = "a = buffer({ 'rgba' }); padding_set({ %d }); blend({dst=a, color=darkblue});blur({%d,src=a});"; 57 char *str = "a = buffer({ 'rgba' }); padding_set({ %d }); blend({dst=a, color=darkblue});blur({%d,src=a});";
58 sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1)); 58 sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
59 eo_do(text, efl_gfx_filter_program_set(buf, "test")); 59 efl_gfx_filter_program_set(text, buf, "test");
60 60
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 27534a1..9cff6df 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("bar.png"), NULL);
29 efl_file_set(build_path("bar.png"), NULL), 29 evas_obj_image_border_set(o, 6, 6, 6, 6);
30 evas_obj_image_border_set(6, 6, 6, 6), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 54336cb..806cab7 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -25,11 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("pan.png"), NULL);
29 efl_file_set(build_path("pan.png"), NULL), 29 efl_gfx_color_set(o, 64, 64, 64, 255);
30 efl_gfx_color_set(64, 64, 64, 255), 30 evas_obj_image_border_set(o, 3, 3, 3, 3);
31 evas_obj_image_border_set(3, 3, 3, 3), 31 efl_gfx_visible_set(o, EINA_TRUE);
32 efl_gfx_visible_set(EINA_TRUE));
33 } 32 }
34 done = 0; 33 done = 0;
35} 34}
@@ -56,10 +55,9 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
57 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
59 eo_do(o_images[i], 58 efl_gfx_position_set(o_images[i], x, y);
60 efl_gfx_position_set(x, y), 59 efl_gfx_size_set(o_images[i], w, h);
61 efl_gfx_size_set(w, h), 60 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
62 efl_gfx_fill_set(0, 0, w, h));
63 } 61 }
64 FPS_STD(NAME); 62 FPS_STD(NAME);
65} 63}
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 2a5fe82..48964bf 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -27,15 +27,13 @@ static void _setup(void)
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 efl_file_set(o, build_path("logo.png"), NULL);
31 efl_file_set(build_path("logo.png"), NULL), 31 efl_gfx_fill_set(o, 0, 0, 120, 160);
32 efl_gfx_fill_set(0, 0, 120, 160), 32 efl_gfx_size_set(o, 120, 160);
33 efl_gfx_size_set(120, 160));
34 a = 256 - (1 << ((rnd() % 8) + 1)); 33 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 34 if (a < 128) a = 128;
36 eo_do(o, 35 efl_gfx_color_set(o, a, a, a, a);
37 efl_gfx_color_set(a, a, a, a), 36 efl_gfx_visible_set(o, EINA_TRUE);
38 efl_gfx_visible_set(EINA_TRUE));
39 } 37 }
40 done = 0; 38 done = 0;
41} 39}
@@ -60,7 +58,7 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 eo_do(o_images[i], efl_gfx_position_set(x, y)); 61 efl_gfx_position_set(o_images[i], x, y);
64 } 62 }
65 FPS_STD(NAME); 63 FPS_STD(NAME);
66} 64}
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index a96cdb8..479e133 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -27,12 +27,11 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 a = rnd()&0xff; 29 a = rnd()&0xff;
30 eo_do(o, 30 efl_file_set(o, build_path("logo.png"), NULL);
31 efl_file_set(build_path("logo.png"), NULL), 31 efl_gfx_fill_set(o, 0, 0, 120, 160);
32 efl_gfx_fill_set(0, 0, 120, 160), 32 efl_gfx_size_set(o, 120, 160);
33 efl_gfx_size_set(120, 160), 33 efl_gfx_color_set(o, a, a, a, a);
34 efl_gfx_color_set(a, a, a, a), 34 efl_gfx_visible_set(o, EINA_TRUE);
35 efl_gfx_visible_set(EINA_TRUE));
36 } 35 }
37 done = 0; 36 done = 0;
38} 37}
@@ -57,7 +56,7 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
58 y = (win_h / 2) - (h / 2); 57 y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
60 eo_do(o_images[i], efl_gfx_position_set(x, y)); 59 efl_gfx_position_set(o_images[i], x, y);
61 } 60 }
62 FPS_STD(NAME); 61 FPS_STD(NAME);
63} 62}
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 3e1a6e4..7fb6d5e 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -30,12 +30,11 @@ static void _setup(void)
30 n = rnd() % 100; 30 n = rnd() % 100;
31 w = 3 + ((n * (60 - 3)) / 100); 31 w = 3 + ((n * (60 - 3)) / 100);
32 h = 4 + ((n * (80 - 4)) / 100); 32 h = 4 + ((n * (80 - 4)) / 100);
33 eo_do(o, 33 efl_file_set(o, build_path("logo.png"), NULL);
34 efl_file_set(build_path("logo.png"), NULL), 34 efl_image_smooth_scale_set(o, 1);
35 efl_image_smooth_scale_set(1), 35 efl_gfx_size_set(o, w, h);
36 efl_gfx_size_set(w, h), 36 efl_gfx_fill_set(o, 0, 0, w, h);
37 efl_gfx_fill_set(0, 0, w, h), 37 efl_gfx_visible_set(o, EINA_TRUE);
38 efl_gfx_visible_set(EINA_TRUE));
39 } 38 }
40 done = 0; 39 done = 0;
41} 40}
@@ -54,12 +53,12 @@ static void _loop(double t, int f)
54 Evas_Coord x, y, w, h; 53 Evas_Coord x, y, w, h;
55 for (i = 0; i < MANYNUM; i++) 54 for (i = 0; i < MANYNUM; i++)
56 { 55 {
57 eo_do(o_images[i], efl_gfx_size_get(&w, &h)); 56 efl_gfx_size_get(o_images[i], &w, &h);
58 x = (win_w / 2) - (w / 2); 57 x = (win_w / 2) - (w / 2);
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
60 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
62 eo_do(o_images[i], efl_gfx_position_set(x, y)); 61 efl_gfx_position_set(o_images[i], x, y);
63 } 62 }
64 FPS_STD(NAME); 63 FPS_STD(NAME);
65} 64}
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 4db67f2..46dc638 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_image_smooth_scale_set(o, 0);
30 efl_image_smooth_scale_set(0), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index cf78b4a..43b0fa1 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_image_smooth_scale_set(o, 0);
30 efl_image_smooth_scale_set(0), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index afbc2aa..99fad1c 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_file_set(build_path("image.png"), NULL), 29 efl_image_smooth_scale_set(o, 0);
30 efl_image_smooth_scale_set(0), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 87912a2..561c52d 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_file_set(build_path("image.png"), NULL), 29 efl_image_smooth_scale_set(o, 0);
30 efl_image_smooth_scale_set(0), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index a1b4032..1a7c59d 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i < (OBNUM / 2)) 29 if (i < (OBNUM / 2))
30 { 30 {
31 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 31 efl_file_set(o, build_path("logo.png"), NULL);
32 } 32 }
33 else 33 else
34 { 34 {
@@ -36,14 +36,12 @@ static void _setup(void)
36 36
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 efl_file_set(o, build_path("image.png"), NULL);
40 efl_file_set(build_path("image.png"), NULL), 40 efl_gfx_position_set(o, x, y);
41 efl_gfx_position_set(x, y));
42 } 41 }
43 eo_do(o, 42 efl_gfx_fill_set(o, 0, 0, 120, 160);
44 efl_gfx_fill_set(0, 0, 120, 160), 43 efl_gfx_size_set(o, 120, 160);
45 efl_gfx_size_set(120, 160), 44 efl_gfx_visible_set(o, EINA_TRUE);
46 efl_gfx_visible_set(EINA_TRUE));
47 } 45 }
48 done = 0; 46 done = 0;
49} 47}
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
71 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
73 eo_do(o_images[i], efl_gfx_position_set(x, y)); 71 efl_gfx_position_set(o_images[i], x, y);
74 } 72 }
75 } 73 }
76 FPS_STD(NAME); 74 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index 97aad3b..bec28f5 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL)); 34 efl_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
43 efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index a876067..00c988b 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 34 efl_file_set(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_file_set(build_path("image.png"), NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 3a97476..65f7b77 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 34 efl_file_set(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_file_set(build_path("image.png"), NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 70fc10e..7853fcd 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i & 0x1) 29 if (i & 0x1)
30 { 30 {
31 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 31 efl_file_set(o, build_path("logo.png"), NULL);
32 } 32 }
33 else 33 else
34 { 34 {
@@ -36,14 +36,12 @@ static void _setup(void)
36 36
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 efl_file_set(o, build_path("image.png"), NULL);
40 efl_file_set(build_path("image.png"), NULL), 40 efl_gfx_position_set(o, x, y);
41 efl_gfx_position_set(x, y));
42 } 41 }
43 eo_do(o, 42 efl_gfx_fill_set(o, 0, 0, 120, 160);
44 efl_gfx_fill_set(0, 0, 120, 160), 43 efl_gfx_size_set(o, 120, 160);
45 efl_gfx_size_set(120, 160), 44 efl_gfx_visible_set(o, EINA_TRUE);
46 efl_gfx_visible_set(EINA_TRUE));
47 } 45 }
48 done = 0; 46 done = 0;
49} 47}
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
71 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
73 eo_do(o_images[i], efl_gfx_position_set(x, y)); 71 efl_gfx_position_set(o_images[i], x, y);
74 } 72 }
75 } 73 }
76 FPS_STD(NAME); 74 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 1de6e1e..4d5668d 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 34 efl_file_set(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_file_set(build_path("image.png"), NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index cf9bea0..b5e643a 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 34 efl_file_set(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_file_set(build_path("image.png"), NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index e3ec9eb..3db2b7f 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 34 efl_file_set(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_file_set(build_path("image.png"), NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index 0e80e66..6c60261 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i > (OBNUM / 2)) 29 if (i > (OBNUM / 2))
30 { 30 {
31 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 31 efl_file_set(o, build_path("logo.png"), NULL);
32 } 32 }
33 else 33 else
34 { 34 {
@@ -36,14 +36,12 @@ static void _setup(void)
36 36
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 efl_file_set(o, build_path("image.png"), NULL);
40 efl_file_set(build_path("image.png"), NULL), 40 efl_gfx_position_set(o, x, y);
41 efl_gfx_position_set(x, y));
42 } 41 }
43 eo_do(o, 42 efl_gfx_fill_set(o, 0, 0, 120, 160);
44 efl_gfx_fill_set(0, 0, 120, 160), 43 efl_gfx_size_set(o, 120, 160);
45 efl_gfx_size_set(120, 160), 44 efl_gfx_visible_set(o, EINA_TRUE);
46 efl_gfx_visible_set(EINA_TRUE));
47 } 45 }
48 done = 0; 46 done = 0;
49} 47}
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
71 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
73 eo_do(o_images[i], efl_gfx_position_set(x, y)); 71 efl_gfx_position_set(o_images[i], x, y);
74 } 72 }
75 } 73 }
76 FPS_STD(NAME); 74 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index ff4aab0..daf4e68 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 34 efl_file_set(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_file_set(build_path("image.png"), NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index a126ee7..9485048 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 34 efl_file_set(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_file_set(build_path("image.png"), NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index de06622..2b1423f 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 34 efl_file_set(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,14 +39,12 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_file_set(build_path("image.png"), NULL), 43 efl_gfx_position_set(o, x, y);
44 efl_gfx_position_set(x, y));
45 } 44 }
46 eo_do(o, 45 efl_gfx_fill_set(o, 0, 0, 120, 160);
47 efl_gfx_fill_set(0, 0, 120, 160), 46 efl_gfx_size_set(o, 120, 160);
48 efl_gfx_size_set(120, 160), 47 efl_gfx_visible_set(o, EINA_TRUE);
49 efl_gfx_visible_set(EINA_TRUE));
50 } 48 }
51 done = 0; 49 done = 0;
52} 50}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], efl_gfx_position_set(x, y)); 74 efl_gfx_position_set(o_images[i], x, y);
77 } 75 }
78 } 76 }
79 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 4f3090b..a71d5dc 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_image_smooth_scale_set(o, 1);
30 efl_image_smooth_scale_set(1), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index b0fafef..f6ccf32 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_image_smooth_scale_set(o, 1);
30 efl_image_smooth_scale_set(1), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index a62e6fd..54512d1 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_file_set(build_path("image.png"), NULL), 29 efl_image_smooth_scale_set(o, 1);
30 efl_image_smooth_scale_set(1), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index d9f9418..6e3078a 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_file_set(build_path("image.png"), NULL), 29 efl_image_smooth_scale_set(o, 1);
30 efl_image_smooth_scale_set(1), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index eaec1c7..15430dc 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -25,10 +25,9 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("frame.png"), NULL);
29 efl_file_set(build_path("frame.png"), NULL), 29 evas_obj_image_border_set(o, 8, 8, 8, 8);
30 evas_obj_image_border_set(8, 8, 8, 8), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 } 31 }
33 done = 0; 32 done = 0;
34} 33}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 57 efl_gfx_position_set(o_images[i], x, y);
59 efl_gfx_position_set(x, y), 58 efl_gfx_size_set(o_images[i], w, h);
60 efl_gfx_size_set(w, h), 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 } 60 }
63 FPS_STD(NAME); 61 FPS_STD(NAME);
64} 62}
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 20a39b9..74cf9ba 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -27,15 +27,13 @@ static void _setup(void)
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 efl_file_set(o, build_path("image.png"), NULL);
31 efl_file_set(build_path("image.png"), NULL), 31 efl_gfx_fill_set(o, 0, 0, 120, 160);
32 efl_gfx_fill_set(0, 0, 120, 160), 32 efl_gfx_size_set(o, 120, 160);
33 efl_gfx_size_set(120, 160));
34 a = 256 - (1 << ((rnd() % 8) + 1)); 33 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 34 if (a < 128) a = 128;
36 eo_do(o, 35 efl_gfx_color_set(o, a, a, a, a);
37 efl_gfx_color_set(a, a, a, a), 36 efl_gfx_visible_set(o, EINA_TRUE);
38 efl_gfx_visible_set(EINA_TRUE));
39 } 37 }
40 done = 0; 38 done = 0;
41} 39}
@@ -60,7 +58,7 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 eo_do(o_images[i], efl_gfx_position_set(x, y)); 61 efl_gfx_position_set(o_images[i], x, y);
64 } 62 }
65 FPS_STD(NAME); 63 FPS_STD(NAME);
66} 64}
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index eab9455..a0f35d4 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -27,14 +27,12 @@ static void _setup(void)
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 efl_file_set(o, build_path("image.png"), NULL);
31 efl_file_set(build_path("image.png"), NULL), 31 efl_gfx_fill_set(o, 0, 0, 120, 160);
32 efl_gfx_fill_set(0, 0, 120, 160), 32 efl_gfx_size_set(o, 120, 160);
33 efl_gfx_size_set(120, 160));
34 a = rnd()&0xff; 33 a = rnd()&0xff;
35 eo_do(o, 34 efl_gfx_color_set(o, a, a, a, a);
36 efl_gfx_color_set(a, a, a, a), 35 efl_gfx_visible_set(o, EINA_TRUE);
37 efl_gfx_visible_set(EINA_TRUE));
38 } 36 }
39 done = 0; 37 done = 0;
40} 38}
@@ -59,7 +57,7 @@ static void _loop(double t, int f)
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
60 y = (win_h / 2) - (h / 2); 58 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
62 eo_do(o_images[i], efl_gfx_position_set(x, y)); 60 efl_gfx_position_set(o_images[i], x, y);
63 } 61 }
64 FPS_STD(NAME); 62 FPS_STD(NAME);
65} 63}
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 7c38815..bf5636f 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -25,11 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("bar.png"), NULL);
29 efl_file_set(build_path("bar.png"), NULL), 29 evas_obj_image_border_set(o, 6, 6, 6, 6);
30 evas_obj_image_border_set(6, 6, 6, 6), 30 evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
31 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID), 31 efl_gfx_visible_set(o, EINA_TRUE);
32 efl_gfx_visible_set(EINA_TRUE));
33 } 32 }
34 done = 0; 33 done = 0;
35} 34}
@@ -56,10 +55,9 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
57 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
59 eo_do(o_images[i], 58 efl_gfx_position_set(o_images[i], x, y);
60 efl_gfx_position_set(x, y), 59 efl_gfx_size_set(o_images[i], w, h);
61 efl_gfx_size_set(w, h), 60 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
62 efl_gfx_fill_set(0, 0, w, h));
63 } 61 }
64 FPS_STD(NAME); 62 FPS_STD(NAME);
65} 63}
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 631f013..d607b25 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -25,13 +25,12 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_size_set(120, 160), 31 evas_obj_image_border_set(o, 43, 48, 48, 83);
32 evas_obj_image_border_set(43, 48, 48, 83), 32 evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
33 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID), 33 efl_gfx_visible_set(o, EINA_TRUE);
34 efl_gfx_visible_set(EINA_TRUE));
35 } 34 }
36 done = 0; 35 done = 0;
37} 36}
@@ -56,7 +55,7 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
57 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
59 eo_do(o_images[i], efl_gfx_position_set(x, y)); 58 efl_gfx_position_set(o_images[i], x, y);
60 } 59 }
61 FPS_STD(NAME); 60 FPS_STD(NAME);
62} 61}
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 0efbbb7..7ad5f02 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -25,11 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_file_set(build_path("image.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_size_set(120, 160), 31 efl_gfx_visible_set(o, EINA_TRUE);
32 efl_gfx_visible_set(EINA_TRUE));
33 } 32 }
34 done = 0; 33 done = 0;
35} 34}
@@ -54,7 +53,7 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
55 y = (win_h / 2) - (h / 2); 54 y = (win_h / 2) - (h / 2);
56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
57 eo_do(o_images[i], efl_gfx_position_set(x, y)); 56 efl_gfx_position_set(o_images[i], x, y);
58 } 57 }
59 FPS_STD(NAME); 58 FPS_STD(NAME);
60} 59}
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 27c82bd..139f565 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -25,11 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_size_set(120, 160), 31 efl_gfx_visible_set(o, EINA_TRUE);
32 efl_gfx_visible_set(EINA_TRUE));
33 } 32 }
34 done = 0; 33 done = 0;
35} 34}
@@ -54,7 +53,7 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
55 y = (win_h / 2) - (h / 2); 54 y = (win_h / 2) - (h / 2);
56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
57 eo_do(o_images[i], efl_gfx_position_set(x, y)); 56 efl_gfx_position_set(o_images[i], x, y);
58 } 57 }
59 FPS_STD(NAME); 58 FPS_STD(NAME);
60} 59}
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 98a9da3..2345130 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -24,19 +24,17 @@ static void _setup(void)
24 24
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, evas);
26 o_images[0] = o; 26 o_images[0] = o;
27 eo_do(o, 27 efl_file_set(o, build_path("im1.png"), NULL);
28 efl_file_set(build_path("im1.png"), NULL), 28 efl_gfx_fill_set(o, 0, 0, 720, 420);
29 efl_gfx_fill_set(0, 0, 720, 420), 29 efl_gfx_size_set(o, 720, 420);
30 efl_gfx_size_set(720, 420), 30 efl_gfx_visible_set(o, EINA_TRUE);
31 efl_gfx_visible_set(EINA_TRUE));
32 31
33 o = eo_add(EVAS_IMAGE_CLASS, evas); 32 o = eo_add(EVAS_IMAGE_CLASS, evas);
34 o_images[1] = o; 33 o_images[1] = o;
35 eo_do(o, 34 efl_file_set(o, build_path("im2.png"), NULL);
36 efl_file_set(build_path("im2.png"), NULL), 35 efl_gfx_fill_set(o, 0, 0, 720, 420);
37 efl_gfx_fill_set(0, 0, 720, 420), 36 efl_gfx_size_set(o, 720, 420);
38 efl_gfx_size_set(720, 420), 37 efl_gfx_visible_set(o, EINA_TRUE);
39 efl_gfx_visible_set(EINA_TRUE));
40 38
41 done = 0; 39 done = 0;
42} 40}
@@ -55,7 +53,7 @@ static void _loop(double t, int f)
55 53
56 a = f & 0x1f; 54 a = f & 0x1f;
57 a = ((a << 3) | (a >> 2)) & 0xff; 55 a = ((a << 3) | (a >> 2)) & 0xff;
58 eo_do(o_images[1], efl_gfx_color_set(a, a, a, a)); 56 efl_gfx_color_set(o_images[1], a, a, a, a);
59 FPS_STD(NAME); 57 FPS_STD(NAME);
60} 58}
61 59
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 47d74a1..9d1bca5 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -26,14 +26,13 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 30 evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 31 efl_gfx_view_size_set(o, 640, 480);
32 efl_gfx_view_size_set(640, 480), 32 evas_obj_image_alpha_set(o, 0);
33 evas_obj_image_alpha_set(0), 33 efl_gfx_fill_set(o, 0, 0, 640, 480);
34 efl_gfx_fill_set(0, 0, 640, 480), 34 efl_gfx_size_set(o, 640, 480);
35 efl_gfx_size_set(640, 480), 35 efl_gfx_visible_set(o, EINA_TRUE);
36 efl_gfx_visible_set(EINA_TRUE));
37 } 36 }
38 done = 0; 37 done = 0;
39} 38}
@@ -58,12 +57,11 @@ static void _loop(double t, int f)
58 h = 480; 57 h = 480;
59 x = (win_w / 2) - (w / 2); 58 x = (win_w / 2) - (w / 2);
60 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
61 eo_do(o_images[i], 60 efl_gfx_position_set(o_images[i], x, y);
62 efl_gfx_position_set(x, y), 61 efl_gfx_size_set(o_images[i], w, h);
63 efl_gfx_size_set(w, h), 62 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
64 efl_gfx_fill_set(0, 0, w, h), 63 data = evas_obj_image_data_get(o_images[i], 1);
65 data = evas_obj_image_data_get(1), 64 st = evas_obj_image_stride_get(o_images[i]);
66 st = evas_obj_image_stride_get());
67 st = st >> 2; 65 st = st >> 2;
68 p = data; 66 p = data;
69 for (y = 0; y < h; y++) 67 for (y = 0; y < h; y++)
@@ -75,9 +73,8 @@ static void _loop(double t, int f)
75 } 73 }
76 p += (st - w); 74 p += (st - w);
77 } 75 }
78 eo_do(o_images[i], 76 evas_obj_image_data_set(o_images[i], data);
79 evas_obj_image_data_set(data), 77 evas_obj_image_data_update_add(o_images[i], 0, 0, w, h);
80 evas_obj_image_data_update_add( 0, 0, w, h));
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
83} 80}
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index d20e9f9..714e092 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -26,14 +26,13 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 30 evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 31 efl_gfx_view_size_set(o, 640, 480);
32 efl_gfx_view_size_set(640, 480), 32 evas_obj_image_alpha_set(o, 1);
33 evas_obj_image_alpha_set(1), 33 efl_gfx_fill_set(o, 0, 0, 640, 480);
34 efl_gfx_fill_set(0, 0, 640, 480), 34 efl_gfx_size_set(o, 640, 480);
35 efl_gfx_size_set(640, 480), 35 efl_gfx_visible_set(o, EINA_TRUE);
36 efl_gfx_visible_set(EINA_TRUE));
37 } 36 }
38 done = 0; 37 done = 0;
39} 38}
@@ -58,12 +57,11 @@ static void _loop(double t, int f)
58 h = 480; 57 h = 480;
59 x = (win_w / 2) - (w / 2); 58 x = (win_w / 2) - (w / 2);
60 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
61 eo_do(o_images[i], 60 efl_gfx_position_set(o_images[i], x, y);
62 efl_gfx_position_set(x, y), 61 efl_gfx_size_set(o_images[i], w, h);
63 efl_gfx_size_set(w, h), 62 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
64 efl_gfx_fill_set(0, 0, w, h), 63 data = evas_obj_image_data_get(o_images[i], 1);
65 data = evas_obj_image_data_get(1), 64 st = evas_obj_image_stride_get(o_images[i]);
66 st = evas_obj_image_stride_get());
67 st = st >> 2; 65 st = st >> 2;
68 p = data; 66 p = data;
69 for (y = 0; y < h; y++) 67 for (y = 0; y < h; y++)
@@ -86,9 +84,8 @@ static void _loop(double t, int f)
86 } 84 }
87 p += (st - w); 85 p += (st - w);
88 } 86 }
89 eo_do(o_images[i], 87 evas_obj_image_data_set(o_images[i], data);
90 evas_obj_image_data_set(data), 88 evas_obj_image_data_update_add(o_images[i], 0, 0, w, h);
91 evas_obj_image_data_update_add( 0, 0, w, h));
92 } 89 }
93 FPS_STD(NAME); 90 FPS_STD(NAME);
94} 91}
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index 4318162..42a20a5 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -29,14 +29,13 @@ static void _setup(void)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 eo_do(o, 32 evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 efl_gfx_view_size_set(o, 640, 480);
35 efl_gfx_view_size_set(640, 480), 35 evas_obj_image_alpha_set(o, 0);
36 evas_obj_image_alpha_set(0), 36 efl_gfx_fill_set(o, 0, 0, 640, 480);
37 efl_gfx_fill_set(0, 0, 640, 480), 37 efl_gfx_size_set(o, 640, 480);
38 efl_gfx_size_set(640, 480), 38 efl_gfx_visible_set(o, EINA_TRUE);
39 efl_gfx_visible_set(EINA_TRUE));
40 yp = malloc(640 * 480); 39 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 40 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 41 vp = malloc(320 * 240);
@@ -65,7 +64,7 @@ static void _setup(void)
65 *lp = vp + (y * 320); 64 *lp = vp + (y * 320);
66 lp++; 65 lp++;
67 } 66 }
68 eo_do(o_images[i], evas_obj_image_data_set(data)); 67 evas_obj_image_data_set(o_images[i], data);
69 } 68 }
70 done = 0; 69 done = 0;
71} 70}
@@ -91,11 +90,10 @@ static void _loop(double t, int f)
91 h = 480; 90 h = 480;
92 x = (win_w / 2) - (w / 2); 91 x = (win_w / 2) - (w / 2);
93 y = (win_h / 2) - (h / 2); 92 y = (win_h / 2) - (h / 2);
94 eo_do(o_images[i], 93 efl_gfx_position_set(o_images[i], x, y);
95 efl_gfx_position_set(x, y), 94 efl_gfx_size_set(o_images[i], w, h);
96 efl_gfx_size_set(w, h), 95 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
97 efl_gfx_fill_set(0, 0, w, h), 96 evas_obj_image_data_update_add(o_images[i], 0, 0, 640, 480);
98 evas_obj_image_data_update_add( 0, 0, 640, 480));
99 } 97 }
100 FPS_STD(NAME); 98 FPS_STD(NAME);
101} 99}
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 14f4575..bc9840c 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -29,15 +29,14 @@ static void _setup(void)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 eo_do(o, 32 evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 efl_gfx_view_size_set(o, 640, 480);
35 efl_gfx_view_size_set(640, 480), 35 evas_obj_image_alpha_set(o, 0);
36 evas_obj_image_alpha_set(0), 36 efl_gfx_fill_set(o, 0, 0, 640, 480);
37 efl_gfx_fill_set(0, 0, 640, 480), 37 efl_gfx_size_set(o, 640, 480);
38 efl_gfx_size_set(640, 480), 38 efl_image_smooth_scale_set(o, 0);
39 efl_image_smooth_scale_set(0), 39 efl_gfx_visible_set(o, EINA_TRUE);
40 efl_gfx_visible_set(EINA_TRUE));
41 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
42 up = malloc(320 * 240); 41 up = malloc(320 * 240);
43 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
@@ -66,7 +65,7 @@ static void _setup(void)
66 *lp = vp + (y * 320); 65 *lp = vp + (y * 320);
67 lp++; 66 lp++;
68 } 67 }
69 eo_do(o_images[i], evas_obj_image_data_set(data)); 68 evas_obj_image_data_set(o_images[i], data);
70 } 69 }
71 done = 0; 70 done = 0;
72} 71}
@@ -100,9 +99,8 @@ static void _loop(double t, int f)
100 99
101 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 100 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
102 101
103 eo_do(o_images[i], 102 evas_obj_map_enable_set(o_images[i], 1);
104 evas_obj_map_enable_set(1), 103 evas_obj_map_set(o_images[i], m);
105 evas_obj_map_set(m));
106 } 104 }
107 FPS_STD(NAME); 105 FPS_STD(NAME);
108} 106}
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 536d65d..c6e60bc 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -29,14 +29,13 @@ static void _setup(void)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 eo_do(o, 32 evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 efl_gfx_view_size_set(o, 640, 480);
35 efl_gfx_view_size_set(640, 480), 35 evas_obj_image_alpha_set(o, 0);
36 evas_obj_image_alpha_set(0), 36 efl_gfx_fill_set(o, 0, 0, 640, 480);
37 efl_gfx_fill_set(0, 0, 640, 480), 37 efl_gfx_size_set(o, 640, 480);
38 efl_gfx_size_set(640, 480), 38 efl_gfx_visible_set(o, EINA_TRUE);
39 efl_gfx_visible_set(EINA_TRUE));
40 yp = malloc(640 * 480); 39 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 40 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 41 vp = malloc(320 * 240);
@@ -65,7 +64,7 @@ static void _setup(void)
65 *lp = vp + (y * 320); 64 *lp = vp + (y * 320);
66 lp++; 65 lp++;
67 } 66 }
68 eo_do(o_images[i], evas_obj_image_data_set(data)); 67 evas_obj_image_data_set(o_images[i], data);
69 } 68 }
70 done = 0; 69 done = 0;
71} 70}
@@ -98,9 +97,8 @@ static void _loop(double t, int f)
98 97
99 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 98 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
100 99
101 eo_do(o_images[i], 100 evas_obj_map_enable_set(o_images[i], 1);
102 evas_obj_map_enable_set(1), 101 evas_obj_map_set(o_images[i], m);
103 evas_obj_map_set(m));
104 } 102 }
105 FPS_STD(NAME); 103 FPS_STD(NAME);
106} 104}
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 65bf564..f6690b9 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -29,14 +29,13 @@ static void _setup(void)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 eo_do(o, 32 evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 efl_gfx_view_size_set(o, 320, 480);
35 efl_gfx_view_size_set(320, 480), 35 evas_obj_image_alpha_set(o, 0);
36 evas_obj_image_alpha_set(0), 36 efl_gfx_fill_set(o, 0, 0, 640, 480);
37 efl_gfx_fill_set(0, 0, 640, 480), 37 efl_gfx_size_set(o, 640, 480);
38 efl_gfx_size_set(640, 480), 38 efl_gfx_visible_set(o, EINA_TRUE);
39 efl_gfx_visible_set(EINA_TRUE));
40 yp = malloc(640 * 480); 39 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 40 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 41 vp = malloc(320 * 240);
@@ -67,9 +66,8 @@ static void _setup(void)
67 *lp = vp + (y * 320); 66 *lp = vp + (y * 320);
68 lp++; 67 lp++;
69 } 68 }
70 eo_do(o_images[i], 69 evas_obj_image_data_set(o_images[i], data);
71 evas_obj_image_data_set(data), 70 evas_obj_image_data_update_add(o_images[i], 0, 0, 320, 480);
72 evas_obj_image_data_update_add( 0, 0, 320, 480));
73 } 71 }
74 } 72 }
75 done = 0; 73 done = 0;
@@ -98,10 +96,9 @@ static void _loop(double t, int f)
98 h = 480; 96 h = 480;
99 x = (win_w / 2) - (w / 2); 97 x = (win_w / 2) - (w / 2);
100 y = (win_h / 2) - (h / 2); 98 y = (win_h / 2) - (h / 2);
101 eo_do(o_images[i], 99 efl_gfx_position_set(o_images[i], x, y);
102 efl_gfx_position_set(x, y), 100 efl_gfx_size_set(o_images[i], w, h);
103 efl_gfx_size_set(w, h), 101 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
104 efl_gfx_fill_set(0, 0, w, h));
105 102
106 w = 320 - 16 + f; 103 w = 320 - 16 + f;
107 if (w < 1) w = 1; 104 if (w < 1) w = 1;
@@ -109,7 +106,7 @@ static void _loop(double t, int f)
109 106
110 w &= ~0x1; 107 w &= ~0x1;
111 108
112 eo_do(o_images[i], efl_gfx_view_size_set(w, 480)); 109 efl_gfx_view_size_set(o_images[i], w, 480);
113 data = evas_object_image_data_get(o_images[i], 1); 110 data = evas_object_image_data_get(o_images[i], 1);
114 if (data) 111 if (data)
115 { 112 {
@@ -129,9 +126,8 @@ static void _loop(double t, int f)
129 *lp = vp + (y * 320); 126 *lp = vp + (y * 320);
130 lp++; 127 lp++;
131 } 128 }
132 eo_do(o_images[i], 129 evas_obj_image_data_set(o_images[i], data);
133 evas_obj_image_data_set(data), 130 evas_obj_image_data_update_add(o_images[i], 0, 0, w, 480);
134 evas_obj_image_data_update_add( 0, 0, w, 480));
135 } 131 }
136 } 132 }
137 FPS_STD(NAME); 133 FPS_STD(NAME);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 569885e..03f0986 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -57,12 +57,11 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 efl_file_set(o, build_path(buf), NULL);
61 efl_file_set(build_path(buf), NULL), 61 efl_gfx_fill_set(o, 0, 0, 256, 256);
62 efl_gfx_fill_set(0, 0, 256, 256), 62 efl_gfx_size_set(o, 256, 256);
63 efl_gfx_size_set(256, 256), 63 efl_image_smooth_scale_set(o, 0);
64 efl_image_smooth_scale_set(0), 64 efl_gfx_visible_set(o, EINA_TRUE);
65 efl_gfx_visible_set(EINA_TRUE));
66 } 65 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 256, 0); 67 POINT(0, 1, w, -h, -d, 256, 0);
@@ -131,14 +130,13 @@ _cube_pos(Cube *c,
131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
132 if (evas_map_util_clockwise_get(m)) 131 if (evas_map_util_clockwise_get(m))
133 { 132 {
134 eo_do(c->side[i].o, 133 evas_obj_map_enable_set(c->side[i].o, 1);
135 evas_obj_map_enable_set(1), 134 evas_obj_map_set(c->side[i].o, m);
136 evas_obj_map_set(m), 135 efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
137 efl_gfx_visible_set(EINA_TRUE));
138 } 136 }
139 else 137 else
140 { 138 {
141 eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE)); 139 efl_gfx_visible_set(c->side[i].o, EINA_FALSE);
142 } 140 }
143 141
144 order[i] = i; 142 order[i] = i;
@@ -163,9 +161,9 @@ _cube_pos(Cube *c,
163 } 161 }
164 while (!sorted); 162 while (!sorted);
165 163
166 eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); 164 efl_gfx_stack_raise(c->side[order[0]].o);
167 for (i = 1; i < 6; i++) 165 for (i = 1; i < 6; i++)
168 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); 166 efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
169} 167}
170 168
171static void 169static void
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 4a1a80c..e925987 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -57,11 +57,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 efl_file_set(o, build_path(buf), NULL);
61 efl_file_set(build_path(buf), NULL), 61 efl_gfx_fill_set(o, 0, 0, 256, 256);
62 efl_gfx_fill_set(0, 0, 256, 256), 62 efl_gfx_size_set(o, 256, 256);
63 efl_gfx_size_set(256, 256), 63 efl_gfx_visible_set(o, EINA_TRUE);
64 efl_gfx_visible_set(EINA_TRUE));
65 } 64 }
66 POINT(0, 0, -w, -h, -d, 0, 0); 65 POINT(0, 0, -w, -h, -d, 0, 0);
67 POINT(0, 1, w, -h, -d, 256, 0); 66 POINT(0, 1, w, -h, -d, 256, 0);
@@ -129,14 +128,13 @@ _cube_pos(Cube *c,
129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
130 if (evas_map_util_clockwise_get(m)) 129 if (evas_map_util_clockwise_get(m))
131 { 130 {
132 eo_do(c->side[i].o, 131 evas_obj_map_enable_set(c->side[i].o, 1);
133 evas_obj_map_enable_set(1), 132 evas_obj_map_set(c->side[i].o, m);
134 evas_obj_map_set(m), 133 efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
135 efl_gfx_visible_set(EINA_TRUE));
136 } 134 }
137 else 135 else
138 { 136 {
139 eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE)); 137 efl_gfx_visible_set(c->side[i].o, EINA_FALSE);
140 } 138 }
141 139
142 order[i] = i; 140 order[i] = i;
@@ -161,9 +159,9 @@ _cube_pos(Cube *c,
161 } 159 }
162 while (!sorted); 160 while (!sorted);
163 161
164 eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); 162 efl_gfx_stack_raise(c->side[order[0]].o);
165 for (i = 1; i < 6; i++) 163 for (i = 1; i < 6; i++)
166 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); 164 efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
167} 165}
168 166
169static void 167static void
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index f0d7d77..c7acb0f 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -57,12 +57,11 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 efl_file_set(o, build_path(buf), NULL);
61 efl_file_set(build_path(buf), NULL), 61 efl_gfx_fill_set(o, 0, 0, 256, 256);
62 efl_gfx_fill_set(0, 0, 256, 256), 62 efl_gfx_size_set(o, 256, 256);
63 efl_gfx_size_set(256, 256), 63 efl_image_smooth_scale_set(o, 0);
64 efl_image_smooth_scale_set(0), 64 efl_gfx_visible_set(o, EINA_TRUE);
65 efl_gfx_visible_set(EINA_TRUE));
66 } 65 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 256, 0); 67 POINT(0, 1, w, -h, -d, 256, 0);
@@ -129,9 +128,8 @@ _cube_pos(Cube *c,
129 255, 255, 255, 128 255, 255, 255,
130 20, 20, 20); 129 20, 20, 20);
131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
132 eo_do(c->side[i].o, 131 evas_obj_map_enable_set(c->side[i].o, 1);
133 evas_obj_map_enable_set(1), 132 evas_obj_map_set(c->side[i].o, m);
134 evas_obj_map_set(m));
135 133
136 order[i] = i; 134 order[i] = i;
137 for (j = 0; j < 4; j++) 135 for (j = 0; j < 4; j++)
@@ -155,9 +153,9 @@ _cube_pos(Cube *c,
155 } 153 }
156 while (!sorted); 154 while (!sorted);
157 155
158 eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); 156 efl_gfx_stack_raise(c->side[order[0]].o);
159 for (i = 1; i < 6; i++) 157 for (i = 1; i < 6; i++)
160 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); 158 efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
161} 159}
162 160
163static void 161static void
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 7d2cd0c..3ccf903 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -57,11 +57,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 efl_file_set(o, build_path(buf), NULL);
61 efl_file_set(build_path(buf), NULL), 61 efl_gfx_fill_set(o, 0, 0, 256, 256);
62 efl_gfx_fill_set(0, 0, 256, 256), 62 efl_gfx_size_set(o, 256, 256);
63 efl_gfx_size_set(256, 256), 63 efl_gfx_visible_set(o, EINA_TRUE);
64 efl_gfx_visible_set(EINA_TRUE));
65 } 64 }
66 POINT(0, 0, -w, -h, -d, 0, 0); 65 POINT(0, 0, -w, -h, -d, 0, 0);
67 POINT(0, 1, w, -h, -d, 256, 0); 66 POINT(0, 1, w, -h, -d, 256, 0);
@@ -127,9 +126,8 @@ _cube_pos(Cube *c,
127 255, 255, 255, 126 255, 255, 255,
128 20, 20, 20); 127 20, 20, 20);
129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
130 eo_do(c->side[i].o, 129 evas_obj_map_enable_set(c->side[i].o, 1);
131 evas_obj_map_enable_set(1), 130 evas_obj_map_set(c->side[i].o, m);
132 evas_obj_map_set(m));
133 131
134 order[i] = i; 132 order[i] = i;
135 for (j = 0; j < 4; j++) 133 for (j = 0; j < 4; j++)
@@ -153,9 +151,9 @@ _cube_pos(Cube *c,
153 } 151 }
154 while (!sorted); 152 while (!sorted);
155 153
156 eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); 154 efl_gfx_stack_raise(c->side[order[0]].o);
157 for (i = 1; i < 6; i++) 155 for (i = 1; i < 6; i++)
158 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); 156 efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
159} 157}
160 158
161static void 159static void
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 5090a83..529104c 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -57,12 +57,11 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 eo_do(o, 60 efl_file_set(o, build_path(buf), NULL);
61 efl_file_set(build_path(buf), NULL), 61 efl_gfx_fill_set(o, 0, 0, 720, 420);
62 efl_gfx_fill_set(0, 0, 720, 420), 62 efl_gfx_size_set(o, 720, 420);
63 efl_gfx_size_set(720, 420), 63 efl_image_smooth_scale_set(o, 0);
64 efl_image_smooth_scale_set(0), 64 efl_gfx_visible_set(o, EINA_TRUE);
65 efl_gfx_visible_set(EINA_TRUE));
66 } 65 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 720, 0); 67 POINT(0, 1, w, -h, -d, 720, 0);
@@ -131,14 +130,13 @@ _cube_pos(Cube *c,
131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); 130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
132 if (evas_map_util_clockwise_get(m)) 131 if (evas_map_util_clockwise_get(m))
133 { 132 {
134 eo_do(c->side[i].o, 133 evas_obj_map_enable_set(c->side[i].o, 1);
135 evas_obj_map_enable_set(1), 134 evas_obj_map_set(c->side[i].o, m);
136 evas_obj_map_set(m), 135 efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
137 efl_gfx_visible_set(EINA_TRUE));
138 } 136 }
139 else 137 else
140 { 138 {
141 eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE)); 139 efl_gfx_visible_set(c->side[i].o, EINA_FALSE);
142 } 140 }
143 141
144 order[i] = i; 142 order[i] = i;
@@ -163,9 +161,9 @@ _cube_pos(Cube *c,
163 } 161 }
164 while (!sorted); 162 while (!sorted);
165 163
166 eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); 164 efl_gfx_stack_raise(c->side[order[0]].o);
167 for (i = 1; i < 6; i++) 165 for (i = 1; i < 6; i++)
168 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); 166 efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
169} 167}
170 168
171static void 169static void
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index e38b157..a6c84cf 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -57,12 +57,11 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 eo_do(o, 60 efl_file_set(o, build_path(buf), NULL);
61 efl_file_set(build_path(buf), NULL), 61 efl_gfx_fill_set(o, 0, 0, 720, 420);
62 efl_gfx_fill_set(0, 0, 720, 420), 62 efl_gfx_size_set(o, 720, 420);
63 efl_gfx_size_set(720, 420), 63 efl_image_smooth_scale_set(o, 0);
64 efl_image_smooth_scale_set(0), 64 efl_gfx_visible_set(o, EINA_TRUE);
65 efl_gfx_visible_set(EINA_TRUE));
66 } 65 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 720, 0); 67 POINT(0, 1, w, -h, -d, 720, 0);
@@ -128,14 +127,13 @@ _cube_pos(Cube *c,
128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); 127 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
129 if (evas_map_util_clockwise_get(m)) 128 if (evas_map_util_clockwise_get(m))
130 { 129 {
131 eo_do(c->side[i].o, 130 evas_obj_map_enable_set(c->side[i].o, 1);
132 evas_obj_map_enable_set(1), 131 evas_obj_map_set(c->side[i].o, m);
133 evas_obj_map_set(m), 132 efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
134 efl_gfx_visible_set(EINA_TRUE));
135 } 133 }
136 else 134 else
137 { 135 {
138 eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE)); 136 efl_gfx_visible_set(c->side[i].o, EINA_FALSE);
139 } 137 }
140 138
141 order[i] = i; 139 order[i] = i;
@@ -160,9 +158,9 @@ _cube_pos(Cube *c,
160 } 158 }
161 while (!sorted); 159 while (!sorted);
162 160
163 eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); 161 efl_gfx_stack_raise(c->side[order[0]].o);
164 for (i = 1; i < 6; i++) 162 for (i = 1; i < 6; i++)
165 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); 163 efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
166} 164}
167 165
168static void 166static void
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index f380e7f..6f60976 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -32,22 +32,20 @@ static void _setup(void)
32 o = eo_add(EVAS_IMAGE_CLASS, evas); 32 o = eo_add(EVAS_IMAGE_CLASS, evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
35 eo_do(o, 35 efl_file_set(o, build_path(buf), NULL);
36 efl_file_set(build_path(buf), NULL), 36 efl_gfx_fill_set(o, 0, 0, 256, 256);
37 efl_gfx_fill_set(0, 0, 256, 256), 37 efl_gfx_size_set(o, 256, 256);
38 efl_gfx_size_set(256, 256), 38 efl_image_smooth_scale_set(o, 0);
39 efl_image_smooth_scale_set(0), 39 efl_gfx_visible_set(o, EINA_TRUE);
40 efl_gfx_visible_set(EINA_TRUE));
41 40
42 o = eo_add(EVAS_IMAGE_CLASS, evas); 41 o = eo_add(EVAS_IMAGE_CLASS, evas);
43 o_reflec[i] = o; 42 o_reflec[i] = o;
44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 43 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
45 eo_do(o, 44 efl_file_set(o, build_path(buf), NULL);
46 efl_file_set(build_path(buf), NULL), 45 efl_gfx_fill_set(o, 0, 0, 256, 256);
47 efl_gfx_fill_set(0, 0, 256, 256), 46 efl_gfx_size_set(o, 256, 256);
48 efl_gfx_size_set(256, 256), 47 efl_image_smooth_scale_set(o, 0);
49 efl_image_smooth_scale_set(0), 48 efl_gfx_visible_set(o, EINA_TRUE);
50 efl_gfx_visible_set(EINA_TRUE));
51 } 49 }
52 done = 0; 50 done = 0;
53} 51}
@@ -130,13 +128,13 @@ static void _loop(double t, int f)
130 128
131 if (c <= 0) 129 if (c <= 0)
132 { 130 {
133 eo_do(o_images[i], efl_gfx_stack_raise()); 131 efl_gfx_stack_raise(o_images[i]);
134 eo_do(o_reflec[i], efl_gfx_stack_raise()); 132 efl_gfx_stack_raise(o_reflec[i]);
135 } 133 }
136 else 134 else
137 { 135 {
138 eo_do(o_images[i], efl_gfx_stack_lower()); 136 efl_gfx_stack_lower(o_images[i]);
139 eo_do(o_reflec[i], efl_gfx_stack_lower()); 137 efl_gfx_stack_lower(o_reflec[i]);
140 } 138 }
141 139
142 evas_map_point_coord_set (m, 0, x, y, -z); 140 evas_map_point_coord_set (m, 0, x, y, -z);
@@ -159,9 +157,8 @@ static void _loop(double t, int f)
159 x + (w / 2), y + (h / 2), 0); 157 x + (w / 2), y + (h / 2), 0);
160 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); 158 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
161 159
162 eo_do(o_images[i], 160 evas_obj_map_enable_set(o_images[i], 1);
163 evas_obj_map_enable_set(1), 161 evas_obj_map_set(o_images[i], m);
164 evas_obj_map_set(m));
165 162
166 evas_map_point_coord_set (m, 0, x, yy, -z); 163 evas_map_point_coord_set (m, 0, x, yy, -z);
167 evas_map_point_image_uv_set(m, 0, 0, 256); 164 evas_map_point_image_uv_set(m, 0, 0, 256);
@@ -183,9 +180,8 @@ static void _loop(double t, int f)
183 x + (w / 2), y + (h / 2), 0); 180 x + (w / 2), y + (h / 2), 0);
184 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); 181 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
185 182
186 eo_do(o_reflec[i], 183 evas_obj_map_enable_set(o_reflec[i], 1);
187 evas_obj_map_enable_set(1), 184 evas_obj_map_set(o_reflec[i], m);
188 evas_obj_map_set(m));
189 } 185 }
190 186
191 FPS_STD(NAME); 187 FPS_STD(NAME);
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 55601b3..c59442b 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -26,12 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_image_smooth_scale_set(o, 0);
33 efl_image_smooth_scale_set(0), 33 efl_gfx_visible_set(o, EINA_TRUE);
34 efl_gfx_visible_set(EINA_TRUE));
35 } 34 }
36 done = 0; 35 done = 0;
37} 36}
@@ -69,9 +68,8 @@ static void _loop(double t, int f)
69 68
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 70
72 eo_do(o_images[i], 71 evas_obj_map_enable_set(o_images[i], 1);
73 evas_obj_map_enable_set(1), 72 evas_obj_map_set(o_images[i], m);
74 evas_obj_map_set(m));
75 } 73 }
76 FPS_STD(NAME); 74 FPS_STD(NAME);
77} 75}
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index 289c027..230bf90 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -26,12 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_file_set(build_path("image.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_image_smooth_scale_set(o, 0);
33 efl_image_smooth_scale_set(0), 33 efl_gfx_visible_set(o, EINA_TRUE);
34 efl_gfx_visible_set(EINA_TRUE));
35 } 34 }
36 done = 0; 35 done = 0;
37} 36}
@@ -69,9 +68,8 @@ static void _loop(double t, int f)
69 68
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 70
72 eo_do(o_images[i], 71 evas_obj_map_enable_set(o_images[i], 1);
73 evas_obj_map_enable_set(1), 72 evas_obj_map_set(o_images[i], m);
74 evas_obj_map_set(m));
75 } 73 }
76 FPS_STD(NAME); 74 FPS_STD(NAME);
77} 75}
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index bec6b37..7483e2e 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -26,11 +26,10 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 } 33 }
35 done = 0; 34 done = 0;
36} 35}
@@ -67,9 +66,8 @@ static void _loop(double t, int f)
67 66
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 68
70 eo_do(o_images[i], 69 evas_obj_map_enable_set(o_images[i], 1);
71 evas_obj_map_enable_set(1), 70 evas_obj_map_set(o_images[i], m);
72 evas_obj_map_set(m));
73 } 71 }
74 FPS_STD(NAME); 72 FPS_STD(NAME);
75} 73}
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 6decf13..075a10a 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -26,11 +26,10 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_file_set(build_path("image.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 } 33 }
35 done = 0; 34 done = 0;
36} 35}
@@ -66,9 +65,8 @@ static void _loop(double t, int f)
66 evas_map_point_color_set(m, 3, 0, 0, 0, 0); 65 evas_map_point_color_set(m, 3, 0, 0, 0, 0);
67 66
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 eo_do(o_images[i], 68 evas_obj_map_enable_set(o_images[i], 1);
70 evas_obj_map_enable_set(1), 69 evas_obj_map_set(o_images[i], m);
71 evas_obj_map_set(m));
72 } 70 }
73 FPS_STD(NAME); 71 FPS_STD(NAME);
74} 72}
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 0c6297c..e1b0038 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -26,12 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_image_smooth_scale_set(o, 0);
33 efl_image_smooth_scale_set(0), 33 efl_gfx_visible_set(o, EINA_TRUE);
34 efl_gfx_visible_set(EINA_TRUE));
35 } 34 }
36 done = 0; 35 done = 0;
37} 36}
@@ -69,9 +68,8 @@ static void _loop(double t, int f)
69 68
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 70
72 eo_do(o_images[i], 71 evas_obj_map_enable_set(o_images[i], 1);
73 evas_obj_map_enable_set(1), 72 evas_obj_map_set(o_images[i], m);
74 evas_obj_map_set(m));
75 } 73 }
76 FPS_STD(NAME); 74 FPS_STD(NAME);
77} 75}
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index a412ac9..c776155 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -26,12 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_file_set(build_path("image.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_image_smooth_scale_set(o, 0);
33 efl_image_smooth_scale_set(0), 33 efl_gfx_visible_set(o, EINA_TRUE);
34 efl_gfx_visible_set(EINA_TRUE));
35 } 34 }
36 done = 0; 35 done = 0;
37} 36}
@@ -69,9 +68,8 @@ static void _loop(double t, int f)
69 68
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 70
72 eo_do(o_images[i], 71 evas_obj_map_enable_set(o_images[i], 1);
73 evas_obj_map_enable_set(1), 72 evas_obj_map_set(o_images[i], m);
74 evas_obj_map_set(m));
75 } 73 }
76 FPS_STD(NAME); 74 FPS_STD(NAME);
77} 75}
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 3d33ef9..2f5053c 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -26,11 +26,10 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 } 33 }
35 done = 0; 34 done = 0;
36} 35}
@@ -67,9 +66,8 @@ static void _loop(double t, int f)
67 66
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 68
70 eo_do(o_images[i], 69 evas_obj_map_enable_set(o_images[i], 1);
71 evas_obj_map_enable_set(1), 70 evas_obj_map_set(o_images[i], m);
72 evas_obj_map_set(m));
73 } 71 }
74 FPS_STD(NAME); 72 FPS_STD(NAME);
75} 73}
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 02f93b3..ad7690e 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -26,11 +26,10 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_file_set(build_path("image.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 } 33 }
35 done = 0; 34 done = 0;
36} 35}
@@ -67,9 +66,8 @@ static void _loop(double t, int f)
67 66
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 68
70 eo_do(o_images[i], 69 evas_obj_map_enable_set(o_images[i], 1);
71 evas_obj_map_enable_set(1), 70 evas_obj_map_set(o_images[i], m);
72 evas_obj_map_set(m));
73 } 71 }
74 FPS_STD(NAME); 72 FPS_STD(NAME);
75} 73}
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index e412145..ead9e9b 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -26,12 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_image_smooth_scale_set(o, 0);
33 efl_image_smooth_scale_set(0), 33 efl_gfx_visible_set(o, EINA_TRUE);
34 efl_gfx_visible_set(EINA_TRUE));
35 } 34 }
36 done = 0; 35 done = 0;
37} 36}
@@ -64,9 +63,8 @@ static void _loop(double t, int f)
64 63
65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
66 65
67 eo_do(o_images[i], 66 evas_obj_map_enable_set(o_images[i], 1);
68 evas_obj_map_enable_set(1), 67 evas_obj_map_set(o_images[i], m);
69 evas_obj_map_set(m));
70 } 68 }
71 FPS_STD(NAME); 69 FPS_STD(NAME);
72} 70}
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 3a1c62a..08f4db2 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -26,12 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_file_set(build_path("image.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_image_smooth_scale_set(o, 0);
33 efl_image_smooth_scale_set(0), 33 efl_gfx_visible_set(o, EINA_TRUE);
34 efl_gfx_visible_set(EINA_TRUE));
35 } 34 }
36 done = 0; 35 done = 0;
37} 36}
@@ -64,9 +63,8 @@ static void _loop(double t, int f)
64 63
65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
66 65
67 eo_do(o_images[i], 66 evas_obj_map_enable_set(o_images[i], 1);
68 evas_obj_map_enable_set(1), 67 evas_obj_map_set(o_images[i], m);
69 evas_obj_map_set(m));
70 } 68 }
71 FPS_STD(NAME); 69 FPS_STD(NAME);
72} 70}
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 28bcb0b..2289781 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -26,10 +26,10 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_size_set(120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_visible_set(EINA_TRUE)); 32 efl_gfx_visible_set(o, EINA_TRUE);
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
61 61
62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
63 63
64 eo_do(o_images[i], evas_obj_map_enable_set(1), 64 evas_obj_map_enable_set(o_images[i], 1);
65 evas_obj_map_set(m)); 65 evas_obj_map_set(o_images[i], m);
66 } 66 }
67 FPS_STD(NAME); 67 FPS_STD(NAME);
68} 68}
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index cd8f372..38302b2 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -26,11 +26,10 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_file_set(build_path("image.png"), NULL), 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_size_set(o, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 } 33 }
35 done = 0; 34 done = 0;
36} 35}
@@ -62,9 +61,8 @@ static void _loop(double t, int f)
62 61
63 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
64 63
65 eo_do(o_images[i], 64 evas_obj_map_enable_set(o_images[i], 1);
66 evas_obj_map_enable_set(1), 65 evas_obj_map_set(o_images[i], m);
67 evas_obj_map_set(m));
68 } 66 }
69 FPS_STD(NAME); 67 FPS_STD(NAME);
70} 68}
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 94caae4..b757324 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -25,21 +25,19 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_file_set(build_path("image.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_size_set(120, 160), 31 efl_gfx_visible_set(o, EINA_TRUE);
32 efl_gfx_visible_set(EINA_TRUE));
33 32
34 o = eo_add(EVAS_IMAGE_CLASS,evas); 33 o = eo_add(EVAS_IMAGE_CLASS, evas);
35 o_images[i + 1] = o; 34 o_images[i + 1] = o;
36 eo_do(o, 35 efl_file_set(o, build_path("e-logo.png"), NULL);
37 efl_file_set(build_path("e-logo.png"), NULL), 36 efl_gfx_fill_set(o, 0, 0, 120, 160);
38 efl_gfx_fill_set(0, 0, 120, 160), 37 efl_gfx_size_set(o, 120, 160);
39 efl_gfx_size_set(120, 160), 38 efl_gfx_visible_set(o, EINA_TRUE);
40 efl_gfx_visible_set(EINA_TRUE));
41 39
42 eo_do(o_images[i], evas_obj_clip_set(o)); 40 evas_obj_clip_set(o_images[i], o);
43 } 41 }
44 done = 0; 42 done = 0;
45} 43}
@@ -64,8 +62,8 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], efl_gfx_position_set(x, y)); 65 efl_gfx_position_set(o_images[i], x, y);
68 eo_do(o_images[i + 1], efl_gfx_position_set(x, y)); 66 efl_gfx_position_set(o_images[i + 1], x, y);
69 } 67 }
70 FPS_STD(NAME); 68 FPS_STD(NAME);
71} 69}
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index 793bea2..03862d8 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -23,25 +23,23 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
30 efl_gfx_fill_set(0, 0, 720, 420), 30 efl_gfx_size_set(o, 720, 420);
31 efl_gfx_size_set(720, 420), 31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("texture.png"), NULL);
40 efl_file_set(build_path("texture.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4);
41 efl_gfx_fill_set(0, 0, win_w * 4, win_h * 4), 40 efl_gfx_size_set(o, win_w * 4, win_h * 4);
42 efl_gfx_size_set(win_w * 4, win_h * 4), 41 evas_obj_clip_set(o, o_mask);
43 evas_obj_clip_set(o_mask), 42 efl_gfx_visible_set(o, EINA_TRUE);
44 efl_gfx_visible_set(EINA_TRUE));
45 } 43 }
46 done = 0; 44 done = 0;
47} 45}
@@ -72,9 +70,8 @@ static void _loop(double t, int f)
72 win_w * 4, win_h * 4, 0); 70 win_w * 4, win_h * 4, 0);
73 evas_map_util_rotate(m, f, win_w / 2, win_h / 2); 71 evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
74 72
75 eo_do(o_images[i], 73 evas_obj_map_enable_set(o_images[i], 1);
76 evas_obj_map_enable_set(1), 74 evas_obj_map_set(o_images[i], m);
77 evas_obj_map_set(m));
78 } 75 }
79 FPS_STD(NAME); 76 FPS_STD(NAME);
80} 77}
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index d7e52ea..eadacb4 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -23,25 +23,23 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
30 efl_gfx_fill_set(0, 0, 720, 420), 30 efl_gfx_size_set(o, 720, 420);
31 efl_gfx_size_set(720, 420), 31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("logo.png"), NULL);
40 efl_file_set(build_path("logo.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
41 efl_gfx_fill_set(0, 0, 120, 160), 40 efl_gfx_size_set(o, 120, 160);
42 efl_gfx_size_set(120, 160), 41 evas_obj_clip_set(o, o_mask);
43 evas_obj_clip_set(o_mask), 42 efl_gfx_visible_set(o, EINA_TRUE);
44 efl_gfx_visible_set(EINA_TRUE));
45 } 43 }
46 done = 0; 44 done = 0;
47} 45}
@@ -68,7 +66,7 @@ static void _loop(double t, int f)
68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
69 y = (win_h / 2) - (h / 2); 67 y = (win_h / 2) - (h / 2);
70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
71 eo_do(o_images[i], efl_gfx_position_set(x, y)); 69 efl_gfx_position_set(o_images[i], x, y);
72 } 70 }
73 if (!m) m = evas_map_new(4); 71 if (!m) m = evas_map_new(4);
74 evas_map_util_points_populate_from_geometry(m, 72 evas_map_util_points_populate_from_geometry(m,
@@ -77,9 +75,8 @@ static void _loop(double t, int f)
77 720, 420, 0); 75 720, 420, 0);
78 evas_map_util_rotate(m, f, win_w / 2, win_h / 2); 76 evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
79 77
80 eo_do(o_mask, 78 evas_obj_map_enable_set(o_mask, 1);
81 evas_obj_map_enable_set(1), 79 evas_obj_map_set(o_mask, m);
82 evas_obj_map_set(m));
83 FPS_STD(NAME); 80 FPS_STD(NAME);
84} 81}
85 82
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index 32a0e1a..bba8768 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -23,26 +23,24 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
30 efl_gfx_fill_set(0, 0, 720, 420), 30 efl_gfx_size_set(o, 720, 420);
31 efl_gfx_size_set(720, 420), 31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("logo.png"), NULL);
40 efl_file_set(build_path("logo.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
41 efl_gfx_fill_set(0, 0, 120, 160), 40 efl_gfx_size_set(o, 120, 160);
42 efl_gfx_size_set(120, 160), 41 efl_image_smooth_scale_set(o, 1);
43 efl_image_smooth_scale_set(1), 42 evas_obj_clip_set(o, o_mask);
44 evas_obj_clip_set(o_mask), 43 efl_gfx_visible_set(o, EINA_TRUE);
45 efl_gfx_visible_set(EINA_TRUE));
46 } 44 }
47 done = 0; 45 done = 0;
48} 46}
@@ -71,10 +69,9 @@ static void _loop(double t, int f)
71 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
73 71
74 eo_do(o_images[i], 72 efl_gfx_position_set(o_images[i], x, y);
75 efl_gfx_position_set(x, y), 73 efl_gfx_size_set(o_images[i], w, h);
76 efl_gfx_size_set(w, h), 74 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
77 efl_gfx_fill_set(0, 0, w, h));
78 } 75 }
79 FPS_STD(NAME); 76 FPS_STD(NAME);
80} 77}
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index d7ec341..979b0a0 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -23,26 +23,24 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
30 efl_gfx_fill_set(0, 0, 720, 420), 30 efl_gfx_size_set(o, 720, 420);
31 efl_gfx_size_set(720, 420), 31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("logo.png"), NULL);
40 efl_file_set(build_path("logo.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
41 efl_gfx_fill_set(0, 0, 120, 160), 40 efl_gfx_size_set(o, 120, 160);
42 efl_gfx_size_set(120, 160), 41 efl_image_smooth_scale_set(o, 0);
43 efl_image_smooth_scale_set(0), 42 evas_obj_clip_set(o, o_mask);
44 evas_obj_clip_set(o_mask), 43 efl_gfx_visible_set(o, EINA_TRUE);
45 efl_gfx_visible_set(EINA_TRUE));
46 } 44 }
47 done = 0; 45 done = 0;
48} 46}
@@ -71,10 +69,9 @@ static void _loop(double t, int f)
71 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
73 71
74 eo_do(o_images[i], 72 efl_gfx_position_set(o_images[i], x, y);
75 efl_gfx_position_set(x, y), 73 efl_gfx_size_set(o_images[i], w, h);
76 efl_gfx_size_set(w, h), 74 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
77 efl_gfx_fill_set(0, 0, w, h));
78 } 75 }
79 FPS_STD(NAME); 76 FPS_STD(NAME);
80} 77}
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index b3ef3a5..db87b90 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -25,21 +25,19 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_file_set(build_path("image.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_size_set(120, 160), 31 efl_gfx_visible_set(o, EINA_TRUE);
32 efl_gfx_visible_set(EINA_TRUE));
33 32
34 o = eo_add(EVAS_IMAGE_CLASS,evas); 33 o = eo_add(EVAS_IMAGE_CLASS, evas);
35 o_images[i + 1] = o; 34 o_images[i + 1] = o;
36 eo_do(o, 35 efl_file_set(o, build_path("e-logo-2.png"), NULL);
37 efl_file_set(build_path("e-logo-2.png"), NULL), 36 efl_gfx_fill_set(o, 0, 0, 120, 160);
38 efl_gfx_fill_set(0, 0, 120, 160), 37 efl_gfx_size_set(o, 120, 160);
39 efl_gfx_size_set(120, 160), 38 efl_gfx_visible_set(o, EINA_TRUE);
40 efl_gfx_visible_set(EINA_TRUE));
41 39
42 eo_do(o_images[i], evas_obj_clip_set(o)); 40 evas_obj_clip_set(o_images[i], o);
43 } 41 }
44 done = 0; 42 done = 0;
45} 43}
@@ -64,8 +62,8 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], efl_gfx_position_set(x, y)); 65 efl_gfx_position_set(o_images[i], x, y);
68 eo_do(o_images[i + 1], efl_gfx_position_set(x, y)); 66 efl_gfx_position_set(o_images[i + 1], x, y);
69 } 67 }
70 FPS_STD(NAME); 68 FPS_STD(NAME);
71} 69}
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 6274a18..a3075af 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -25,21 +25,19 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_file_set(build_path("e-logo-2.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_size_set(120, 160), 31 efl_gfx_visible_set(o, EINA_TRUE);
32 efl_gfx_visible_set(EINA_TRUE));
33 32
34 o = eo_add(EVAS_IMAGE_CLASS,evas); 33 o = eo_add(EVAS_IMAGE_CLASS, evas);
35 o_images[i + 1] = o; 34 o_images[i + 1] = o;
36 eo_do(o, 35 efl_file_set(o, build_path("logo.png"), NULL);
37 efl_file_set(build_path("logo.png"), NULL), 36 efl_gfx_fill_set(o, 0, 0, 120, 160);
38 efl_gfx_fill_set(0, 0, 120, 160), 37 efl_gfx_size_set(o, 120, 160);
39 efl_gfx_size_set(120, 160), 38 efl_gfx_visible_set(o, EINA_TRUE);
40 efl_gfx_visible_set(EINA_TRUE));
41 39
42 eo_do(o_images[i], evas_obj_clip_set(o)); 40 evas_obj_clip_set(o_images[i], o);
43 } 41 }
44 done = 0; 42 done = 0;
45} 43}
@@ -64,8 +62,8 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], efl_gfx_position_set(x, y)); 65 efl_gfx_position_set(o_images[i], x, y);
68 eo_do(o_images[i + 1], efl_gfx_position_set(x, y)); 66 efl_gfx_position_set(o_images[i + 1], x, y);
69 } 67 }
70 FPS_STD(NAME); 68 FPS_STD(NAME);
71} 69}
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index e8fc66b..90ab4b5 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -23,25 +23,23 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
30 efl_gfx_fill_set(0, 0, 720, 420), 30 efl_gfx_size_set(o, 720, 420);
31 efl_gfx_size_set(720, 420), 31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("logo.png"), NULL);
40 efl_file_set(build_path("logo.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
41 efl_gfx_fill_set(0, 0, 120, 160), 40 efl_gfx_size_set(o, 120, 160);
42 efl_gfx_size_set(120, 160), 41 evas_obj_clip_set(o, o_mask);
43 evas_obj_clip_set(o_mask), 42 efl_gfx_visible_set(o, EINA_TRUE);
44 efl_gfx_visible_set(EINA_TRUE));
45 } 43 }
46 done = 0; 44 done = 0;
47} 45}
@@ -67,7 +65,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 66 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], efl_gfx_position_set(x, y)); 68 efl_gfx_position_set(o_images[i], x, y);
71 } 69 }
72 FPS_STD(NAME); 70 FPS_STD(NAME);
73} 71}
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index 2ca680e..53fa584 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -23,25 +23,23 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_file_set(build_path("e-logo-2.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_size_set(120, 160), 31 efl_gfx_position_set(o, (win_w - 120) / 2, (win_h - 160) / 2);
32 efl_gfx_position_set((win_w - 120) / 2, (win_h - 160) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("logo.png"), NULL);
40 efl_file_set(build_path("logo.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
41 efl_gfx_fill_set(0, 0, 120, 160), 40 efl_gfx_size_set(o, 120, 160);
42 efl_gfx_size_set(120, 160), 41 evas_obj_clip_set(o, o_mask);
43 evas_obj_clip_set(o_mask), 42 efl_gfx_visible_set(o, EINA_TRUE);
44 efl_gfx_visible_set(EINA_TRUE));
45 } 43 }
46 done = 0; 44 done = 0;
47} 45}
@@ -67,7 +65,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 66 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], efl_gfx_position_set(x, y)); 68 efl_gfx_position_set(o_images[i], x, y);
71 } 69 }
72 FPS_STD(NAME); 70 FPS_STD(NAME);
73} 71}
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index 4db7699..8e5684d 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -23,25 +23,23 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
30 efl_gfx_fill_set(0, 0, 720, 420), 30 efl_gfx_size_set(o, 720, 420);
31 efl_gfx_size_set(720, 420), 31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("logo.png"), NULL);
40 efl_file_set(build_path("logo.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2);
41 efl_gfx_fill_set(0, 0, 120 / 2, 160 / 2), 40 efl_gfx_size_set(o, 120 / 2, 160 / 2);
42 efl_gfx_size_set(120 / 2, 160 / 2), 41 evas_obj_clip_set(o, o_mask);
43 evas_obj_clip_set(o_mask), 42 efl_gfx_visible_set(o, EINA_TRUE);
44 efl_gfx_visible_set(EINA_TRUE));
45 } 43 }
46 done = 0; 44 done = 0;
47} 45}
@@ -67,7 +65,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 66 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], efl_gfx_position_set(x, y)); 68 efl_gfx_position_set(o_images[i], x, y);
71 } 69 }
72 FPS_STD(NAME); 70 FPS_STD(NAME);
73} 71}
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index 58ee03b..13c8d76 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -23,25 +23,23 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_file_set(build_path("e-logo-2.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_fill_set(0, 0, 120, 160), 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_size_set(120, 160), 31 efl_gfx_position_set(o, (win_w - 120) / 2, (win_h - 160) / 2);
32 efl_gfx_position_set((win_w - 120) / 2, (win_h - 160) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("logo.png"), NULL);
40 efl_file_set(build_path("logo.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
41 efl_gfx_fill_set(0, 0, 120, 160), 40 efl_gfx_size_set(o, 120, 160);
42 efl_gfx_size_set(120, 160), 41 evas_obj_clip_set(o, o_mask);
43 evas_obj_clip_set(o_mask), 42 efl_gfx_visible_set(o, EINA_TRUE);
44 efl_gfx_visible_set(EINA_TRUE));
45 } 43 }
46 done = 0; 44 done = 0;
47} 45}
@@ -67,14 +65,13 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 66 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], efl_gfx_position_set(x, y)); 68 efl_gfx_position_set(o_images[i], x, y);
71 } 69 }
72 w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW)))); 70 w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW))));
73 h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW)))); 71 h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW))));
74 eo_do(o_mask, 72 efl_gfx_fill_set(o_mask, 0, 0, w, h);
75 efl_gfx_fill_set(0, 0, w, h), 73 efl_gfx_size_set(o_mask, w, h);
76 efl_gfx_size_set(w, h), 74 efl_gfx_position_set(o_mask, (win_w - w) / 2, (win_h - h) / 2);
77 efl_gfx_position_set((win_w - w) / 2, (win_h - h) / 2));
78 FPS_STD(NAME); 75 FPS_STD(NAME);
79} 76}
80 77
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index a9adc86..b31c624 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -23,25 +23,23 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
30 efl_gfx_fill_set(0, 0, 720, 420), 30 efl_gfx_size_set(o, 720, 420);
31 efl_gfx_size_set(720, 420), 31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("texture.png"), NULL);
40 efl_file_set(build_path("texture.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 500, 444);
41 efl_gfx_fill_set(0, 0, 500, 444), 40 efl_gfx_size_set(o, win_w * 4, win_h * 4);
42 efl_gfx_size_set(win_w * 4, win_h * 4), 41 evas_obj_clip_set(o, o_mask);
43 evas_obj_clip_set(o_mask), 42 efl_gfx_visible_set(o, EINA_TRUE);
44 efl_gfx_visible_set(EINA_TRUE));
45 } 43 }
46 done = 0; 44 done = 0;
47} 45}
@@ -67,7 +65,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
68 y = (win_h / 2) - (h / 2); 66 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
70 eo_do(o_images[i], efl_gfx_position_set(x, y)); 68 efl_gfx_position_set(o_images[i], x, y);
71 } 69 }
72 FPS_STD(NAME); 70 FPS_STD(NAME);
73} 71}
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 8bc63e1..9289952 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -23,25 +23,23 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EVAS_IMAGE_CLASS,evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
30 efl_gfx_fill_set(0, 0, 720, 420), 30 efl_gfx_size_set(o, 720, 420);
31 efl_gfx_size_set(720, 420), 31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_visible_set(o, EINA_TRUE);
33 efl_gfx_visible_set(EINA_TRUE));
34 33
35 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
36 { 35 {
37 o = eo_add(EVAS_IMAGE_CLASS,evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
38 o_images[i] = o; 37 o_images[i] = o;
39 eo_do(o, 38 efl_file_set(o, build_path("texture.png"), NULL);
40 efl_file_set(build_path("texture.png"), NULL), 39 efl_gfx_fill_set(o, 0, 0, 500, 444);
41 efl_gfx_fill_set(0, 0, 500, 444), 40 efl_gfx_size_set(o, win_w * 4, win_h * 4);
42 efl_gfx_size_set(win_w * 4, win_h * 4), 41 evas_obj_clip_set(o, o_mask);
43 evas_obj_clip_set(o_mask), 42 efl_gfx_visible_set(o, EINA_TRUE);
44 efl_gfx_visible_set(EINA_TRUE));
45 } 43 }
46 done = 0; 44 done = 0;
47} 45}
@@ -68,7 +66,7 @@ static void _loop(double t, int f)
68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2); 66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
69 y = (win_h / 2) - (h / 2); 67 y = (win_h / 2) - (h / 2);
70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2); 68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
71 eo_do(o_images[i], efl_gfx_position_set(x, y)); 69 efl_gfx_position_set(o_images[i], x, y);
72 } 70 }
73 if (!m) m = evas_map_new(4); 71 if (!m) m = evas_map_new(4);
74 72
@@ -78,9 +76,8 @@ static void _loop(double t, int f)
78 720, 420, 0); 76 720, 420, 0);
79 evas_map_util_rotate(m, f, win_w / 2, win_h / 2); 77 evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
80 78
81 eo_do(o_mask, 79 evas_obj_map_enable_set(o_mask, 1);
82 evas_obj_map_enable_set(1), 80 evas_obj_map_set(o_mask, m);
83 evas_obj_map_set(m));
84 FPS_STD(NAME); 81 FPS_STD(NAME);
85} 82}
86 83
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 039bb20..34f61fc 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -26,10 +26,10 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, efl_file_set(build_path("tp.png"), NULL), 29 efl_file_set(o, build_path("tp.png"), NULL);
30 efl_gfx_fill_set(0, 0, 640, 480), 30 efl_gfx_fill_set(o, 0, 0, 640, 480);
31 efl_gfx_size_set(640, 480), 31 efl_gfx_size_set(o, 640, 480);
32 efl_gfx_visible_set(EINA_TRUE)); 32 efl_gfx_visible_set(o, EINA_TRUE);
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 h *= (f / 100.0) * 4.0; 54 h *= (f / 100.0) * 4.0;
55 x = (win_w / 2) - (w / 2); 55 x = (win_w / 2) - (w / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 eo_do(o_images[i], efl_gfx_position_set(x, y), 57 efl_gfx_position_set(o_images[i], x, y);
58 efl_gfx_size_set(w, h), 58 efl_gfx_size_set(o_images[i], w, h);
59 efl_gfx_fill_set(0, 0, w, h)); 59 efl_gfx_fill_set(o_images[i], 0, 0, w, h);
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index 5ccc566..9deeb18 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -32,13 +32,9 @@ static void _setup(void)
32 r = ((rnd()&0xff) * a) / 255; 32 r = ((rnd()&0xff) * a) / 255;
33 g = ((rnd()&0xff) * a) / 255; 33 g = ((rnd()&0xff) * a) / 255;
34 b = ((rnd()&0xff) * a) / 255; 34 b = ((rnd()&0xff) * a) / 255;
35 eo_do(o, 35 efl_gfx_color_set(o, r, g, b, a);
36 efl_gfx_color_set(r, g, b, a), 36 evas_obj_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2));
37 evas_obj_line_xy_set(((win_w / 2) * (rnd()&0xff)) / 255, 37 efl_gfx_visible_set(o, EINA_TRUE);
38 ((win_h / 2) * (rnd()&0xff)) / 255,
39 ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2),
40 ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)),
41 efl_gfx_visible_set(EINA_TRUE));
42 38
43 39
44 } 40 }
@@ -91,11 +87,11 @@ static void _loop(double t, int f)
91 for (i = 0; i < OBNUM; i++) 87 for (i = 0; i < OBNUM; i++)
92 { 88 {
93 o = o_images[i]; 89 o = o_images[i];
94 eo_do(o, evas_obj_line_xy_get(&ox1, &oy1, &ox2, &oy2)); 90 evas_obj_line_xy_get(o, &ox1, &oy1, &ox2, &oy2);
95 91
96 _rotate_point(&ox1, &oy1, i); 92 _rotate_point(&ox1, &oy1, i);
97 _rotate_point(&ox2, &oy2, i); 93 _rotate_point(&ox2, &oy2, i);
98 eo_do(o, evas_obj_line_xy_set(ox1, oy1, ox2, oy2)); 94 evas_obj_line_xy_set(o, ox1, oy1, ox2, oy2);
99 } 95 }
100 FPS_STD(NAME); 96 FPS_STD(NAME);
101} 97}
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 1ea46c2..54b6951 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -20,43 +20,43 @@ static void
20poly(Evas_Object *o, int type, Evas_Coord x, Evas_Coord y) 20poly(Evas_Object *o, int type, Evas_Coord x, Evas_Coord y)
21{ 21{
22 if (o) 22 if (o)
23 eo_do(o, evas_obj_polygon_points_clear()); 23 evas_obj_polygon_points_clear(o);
24 switch (type % 4) 24 switch (type % 4)
25 { 25 {
26 case 0: /* triangle */ 26 case 0: /* triangle */
27 if (o) 27 if (o)
28 eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0), 28 evas_obj_polygon_point_add(o, x + 50, y + 0);
29 evas_obj_polygon_point_add(x + 100, y + 100), 29 evas_obj_polygon_point_add(o, x + 100, y + 100);
30 evas_obj_polygon_point_add(x + 0 , y + 100)); 30 evas_obj_polygon_point_add(o, x + 0, y + 100);
31 break; 31 break;
32 case 1: /* square */ 32 case 1: /* square */
33 if (o) 33 if (o)
34 eo_do(o, evas_obj_polygon_point_add(x + 0 , y + 0), 34 evas_obj_polygon_point_add(o, x + 0, y + 0);
35 evas_obj_polygon_point_add(x + 100, y + 0), 35 evas_obj_polygon_point_add(o, x + 100, y + 0);
36 evas_obj_polygon_point_add(x + 100, y + 100), 36 evas_obj_polygon_point_add(o, x + 100, y + 100);
37 evas_obj_polygon_point_add(x + 0 , y + 100)); 37 evas_obj_polygon_point_add(o, x + 0, y + 100);
38 break; 38 break;
39 case 2: /* hex */ 39 case 2: /* hex */
40 if (o) 40 if (o)
41 eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0), 41 evas_obj_polygon_point_add(o, x + 50, y + 0);
42 evas_obj_polygon_point_add(x + 100, y + 30), 42 evas_obj_polygon_point_add(o, x + 100, y + 30);
43 evas_obj_polygon_point_add(x + 100, y + 70), 43 evas_obj_polygon_point_add(o, x + 100, y + 70);
44 evas_obj_polygon_point_add(x + 50 , y + 100), 44 evas_obj_polygon_point_add(o, x + 50, y + 100);
45 evas_obj_polygon_point_add(x + 0 , y + 70), 45 evas_obj_polygon_point_add(o, x + 0, y + 70);
46 evas_obj_polygon_point_add(x + 0 , y + 30)); 46 evas_obj_polygon_point_add(o, x + 0, y + 30);
47 break; 47 break;
48 case 3: /* star */ 48 case 3: /* star */
49 if (o) 49 if (o)
50 eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0), 50 evas_obj_polygon_point_add(o, x + 50, y + 0);
51 evas_obj_polygon_point_add(x + 60 , y + 40), 51 evas_obj_polygon_point_add(o, x + 60, y + 40);
52 evas_obj_polygon_point_add(x + 90 , y + 30), 52 evas_obj_polygon_point_add(o, x + 90, y + 30);
53 evas_obj_polygon_point_add(x + 70 , y + 60), 53 evas_obj_polygon_point_add(o, x + 70, y + 60);
54 evas_obj_polygon_point_add(x + 90 , y + 100), 54 evas_obj_polygon_point_add(o, x + 90, y + 100);
55 evas_obj_polygon_point_add(x + 50 , y + 70), 55 evas_obj_polygon_point_add(o, x + 50, y + 70);
56 evas_obj_polygon_point_add(x + 10 , y + 100), 56 evas_obj_polygon_point_add(o, x + 10, y + 100);
57 evas_obj_polygon_point_add(x + 30 , y + 60), 57 evas_obj_polygon_point_add(o, x + 30, y + 60);
58 evas_obj_polygon_point_add(x + 10 , y + 30), 58 evas_obj_polygon_point_add(o, x + 10, y + 30);
59 evas_obj_polygon_point_add(x + 40 , y + 40)); 59 evas_obj_polygon_point_add(o, x + 40, y + 40);
60 break; 60 break;
61 default: 61 default:
62 break; 62 break;
@@ -80,8 +80,8 @@ static void _setup(void)
80 g = ((rnd()&0xff) * a) / 255; 80 g = ((rnd()&0xff) * a) / 255;
81 b = ((rnd()&0xff) * a) / 255; 81 b = ((rnd()&0xff) * a) / 255;
82 if (o) 82 if (o)
83 eo_do(o, efl_gfx_color_set(r, g, b, a), 83 efl_gfx_color_set(o, r, g, b, a);
84 efl_gfx_visible_set(EINA_TRUE)); 84 efl_gfx_visible_set(o, EINA_TRUE);
85 poly(o, i, 0, 0); 85 poly(o, i, 0, 0);
86 } 86 }
87 done = 0; 87 done = 0;
@@ -105,13 +105,13 @@ static void _loop(double t, int f)
105 { 105 {
106 o = o_images[i]; 106 o = o_images[i];
107 if (o) 107 if (o)
108 eo_do(o, efl_gfx_size_get(&w, &h)); 108 efl_gfx_size_get(o, &w, &h);
109 x = (win_w / 2) - (w / 2); 109 x = (win_w / 2) - (w / 2);
110 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4); 110 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4);
111 y = (win_h / 2) - (h / 2); 111 y = (win_h / 2) - (h / 2);
112 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4); 112 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4);
113 if (o) 113 if (o)
114 eo_do(o, efl_gfx_position_set(x, y)); 114 efl_gfx_position_set(o, x, y);
115 } 115 }
116 FPS_STD(NAME); 116 FPS_STD(NAME);
117} 117}
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index b520a11..df2b4ab 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -23,11 +23,10 @@ static void _setup(void)
23 Evas_Object *o,*src; 23 Evas_Object *o,*src;
24 24
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, evas);
26 eo_do(o, 26 efl_file_set(o, build_path("logo.png"), NULL);
27 efl_file_set(build_path("logo.png"), NULL), 27 efl_gfx_fill_set(o, 0, 0, 120, 160);
28 efl_gfx_fill_set(0, 0, 120, 160), 28 efl_gfx_size_set(o, 120, 160);
29 efl_gfx_size_set(120, 160), 29 efl_gfx_visible_set(o, EINA_TRUE);
30 efl_gfx_visible_set(EINA_TRUE));
31 src = o; 30 src = o;
32 o_images[0] = src; 31 o_images[0] = src;
33 32
@@ -35,11 +34,10 @@ static void _setup(void)
35 { 34 {
36 o = eo_add(EVAS_IMAGE_CLASS, evas); 35 o = eo_add(EVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 36 o_images[i] = o;
38 eo_do(o, 37 evas_obj_image_source_set(o, src);
39 evas_obj_image_source_set(src), 38 efl_gfx_size_set(o, 120, 160);
40 efl_gfx_size_set(120, 160), 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
41 efl_gfx_fill_set(0,0,120,160), 40 efl_gfx_visible_set(o, EINA_TRUE);
42 efl_gfx_visible_set(EINA_TRUE));
43 } 41 }
44 done = 0; 42 done = 0;
45} 43}
@@ -64,7 +62,7 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], efl_gfx_position_set(x, y)); 65 efl_gfx_position_set(o_images[i], x, y);
68 } 66 }
69 FPS_STD(NAME); 67 FPS_STD(NAME);
70} 68}
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 8cfe51c..5e4fb80 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -27,20 +27,20 @@ static void _setup(void)
27 Evas_Object *o,*src; 27 Evas_Object *o,*src;
28 28
29 o = eo_add(EVAS_IMAGE_CLASS, evas); 29 o = eo_add(EVAS_IMAGE_CLASS, evas);
30 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 30 efl_file_set(o, build_path("logo.png"), NULL);
31 efl_gfx_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(o, 0, 0, 120, 160);
32 efl_gfx_size_set(120, 160), 32 efl_gfx_size_set(o, 120, 160);
33 efl_gfx_position_set(-400, -300)); 33 efl_gfx_position_set(o, -400, -300);
34 src = o; 34 src = o;
35 35
36 for (i = 0; i < OBNUM / 2; i++) 36 for (i = 0; i < OBNUM / 2; i++)
37 { 37 {
38 o = eo_add(EVAS_IMAGE_CLASS, evas); 38 o = eo_add(EVAS_IMAGE_CLASS, evas);
39 o_images[i] = o; 39 o_images[i] = o;
40 eo_do(o, evas_obj_image_source_set(src, NULL), 40 evas_obj_image_source_set(o, src, NULL);
41 efl_gfx_size_set(120, 160), 41 efl_gfx_size_set(o, 120, 160);
42 efl_gfx_fill_set(0,0,120,160), 42 efl_gfx_fill_set(o, 0, 0, 120, 160);
43 efl_gfx_visible_set(EINA_TRUE)); 43 efl_gfx_visible_set(o, EINA_TRUE);
44 } 44 }
45 done = 0; 45 done = 0;
46} 46}
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
66 y = (win_h / 2) - (h / 2); 66 y = (win_h / 2) - (h / 2);
67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
68 eo_do(o_images[i], efl_gfx_position_set(x, y)); 68 efl_gfx_position_set(o_images[i], x, y);
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index b391a0a..0d8ec83 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -29,16 +29,15 @@ static void _setup(void)
29 { 29 {
30 o = eo_add(EVAS_TEXT_CLASS, evas); 30 o = eo_add(EVAS_TEXT_CLASS, evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 eo_do(o, 32 efl_text_properties_font_set(o, "Vera-Bold", 20);
33 efl_text_properties_font_set("Vera-Bold", 20), 33 efl_text_set(o, "This is a test string");
34 efl_text_set("This is a test string"), 34 evas_obj_text_style_set(o, st);
35 evas_obj_text_style_set(st), 35 efl_gfx_color_set(o, 255, 255, 255, 255);
36 efl_gfx_color_set(255, 255, 255, 255), 36 evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
37 evas_obj_text_shadow_color_set(0, 0, 0, 24), 37 evas_obj_text_glow_color_set(o, 100, 80, 40, 100);
38 evas_obj_text_glow_color_set(100, 80, 40, 100), 38 evas_obj_text_glow2_color_set(o, 50, 10, 5, 50);
39 evas_obj_text_glow2_color_set(50, 10, 5, 50), 39 evas_obj_text_outline_color_set(o, 0, 0, 0, 255);
40 evas_obj_text_outline_color_set(0, 0, 0, 255), 40 efl_gfx_visible_set(o, EINA_TRUE);
41 efl_gfx_visible_set(EINA_TRUE));
42 st++; 41 st++;
43 } 42 }
44 st = i; 43 st = i;
@@ -48,13 +47,12 @@ static void _setup(void)
48 s = o_texts[i % st]; 47 s = o_texts[i % st];
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 48 o = eo_add(EVAS_IMAGE_CLASS, evas);
50 o_texts[i] = o; 49 o_texts[i] = o;
51 eo_do(o, evas_obj_image_source_set(s)); 50 evas_obj_image_source_set(o, s);
52 /* FIXME s == NULL*/ 51 /* FIXME s == NULL*/
53 eo_do(s, efl_gfx_size_get(&w, &h)); 52 efl_gfx_size_get(s, &w, &h);
54 eo_do(o, 53 efl_gfx_size_set(o, w, h);
55 efl_gfx_size_set(w, h), 54 efl_gfx_fill_set(o, 0, 0, w, h);
56 efl_gfx_fill_set(0, 0, w, h), 55 efl_gfx_visible_set(o, EINA_TRUE);
57 efl_gfx_visible_set(EINA_TRUE));
58 } 56 }
59 57
60 done = 0; 58 done = 0;
@@ -74,12 +72,12 @@ static void _loop(double t, int f)
74 Evas_Coord x, y, w, h; 72 Evas_Coord x, y, w, h;
75 for (i = 0; i < OBNUM; i++) 73 for (i = 0; i < OBNUM; i++)
76 { 74 {
77 eo_do(o_texts[i], efl_gfx_size_get(&w, &h)); 75 efl_gfx_size_get(o_texts[i], &w, &h);
78 x = (win_w / 2) - (w / 2); 76 x = (win_w / 2) - (w / 2);
79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
80 y = (win_h / 2) - (h / 2); 78 y = (win_h / 2) - (h / 2);
81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
82 eo_do(o_texts[i], efl_gfx_position_set(x, y)); 80 efl_gfx_position_set(o_texts[i], x, y);
83 } 81 }
84 FPS_STD(NAME); 82 FPS_STD(NAME);
85} 83}
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index f2f2670..eed870c 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -38,33 +38,30 @@ static void _setup(void)
38 strs[rnd() % (sizeof(strs) / sizeof(char *))], 38 strs[rnd() % (sizeof(strs) / sizeof(char *))],
39 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 39 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
40 40
41 eo_do(o, 41 efl_text_properties_font_set(o, "Vera-Bold", 20);
42 efl_text_properties_font_set("Vera-Bold", 20), 42 efl_text_set(o, buf);
43 efl_text_set(buf), 43 efl_gfx_color_set(o, 0, 0, 0, 255);
44 efl_gfx_color_set(0, 0, 0, 255), 44 efl_gfx_size_get(o, &w, &h);
45 efl_gfx_size_get(&w, &h));
46 x = (win_w / 2) - (w / 2); 45 x = (win_w / 2) - (w / 2);
47 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 46 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
48 y = (win_h / 2) - (h / 2); 47 y = (win_h / 2) - (h / 2);
49 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 48 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
50 eo_do(o, 49 efl_gfx_position_set(o, x, y);
51 efl_gfx_position_set(x, y), 50 efl_gfx_visible_set(o, EINA_TRUE);
52 efl_gfx_visible_set(EINA_TRUE));
53 for (i = 1 ; i < OBNUM ; i ++) 51 for (i = 1 ; i < OBNUM ; i ++)
54 { 52 {
55 o = eo_add(EVAS_IMAGE_CLASS, evas); 53 o = eo_add(EVAS_IMAGE_CLASS, evas);
56 o_texts[i] = o; 54 o_texts[i] = o;
57 eo_do(o, 55 evas_obj_image_source_set(o, o_texts[0]);
58 evas_obj_image_source_set(o_texts[0])); 56 efl_gfx_size_get(o_texts[0], &w, &h);
59 eo_do(o_texts[0], efl_gfx_size_get(&w, &h)); 57 efl_gfx_size_set(o, w, h);
60 eo_do(o, efl_gfx_size_set(w, h), 58 efl_gfx_fill_set(o, 0, 0, w, h);
61 efl_gfx_fill_set(0, 0, w, h));
62 x = (win_w / 2) - (w / 2); 59 x = (win_w / 2) - (w / 2);
63 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 60 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
64 y = (win_h / 2) - (h / 2); 61 y = (win_h / 2) - (h / 2);
65 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 62 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
66 eo_do(o, efl_gfx_position_set(x, y), 63 efl_gfx_position_set(o, x, y);
67 efl_gfx_visible_set(EINA_TRUE)); 64 efl_gfx_visible_set(o, EINA_TRUE);
68 } 65 }
69 66
70 done = 0; 67 done = 0;