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)
Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
- eo_do(o, efl_gfx_position_set(10, 40),
- efl_gfx_size_set(win_w - 20, win_h - 50),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_position_set(o, 10, 40);
+ efl_gfx_size_set(o, win_w - 20, win_h - 50);
+ efl_gfx_visible_set(o, EINA_TRUE);
st = evas_textblock_style_new();
evas_textblock_style_set
(st,
@@ -21,10 +21,10 @@ _setup(void)
"p='+ font=Vera font_size=10 align=left'"
"/p='- \n \n'"
);
- eo_do(o, evas_obj_textblock_style_set(st),
- evas_obj_textblock_clear(),
- evas_obj_textblock_text_markup_set
- ("
"
+ evas_obj_textblock_style_set(o, st);
+ evas_obj_textblock_clear(o);
+ evas_obj_textblock_text_markup_set
+ (o, ""
"Enlightenment used to be a window manager project, but "
"since has changed a lot to become a miniature desktop and mobile "
"device environment all of its own. It is now made up of many "
@@ -40,8 +40,7 @@ _setup(void)
"DirectFB and other targets to boot. It handles high level graphic "
"layout descriptions that applications set up, dealing with the hard "
"work of doing the drawing for them."
- ""
- ));
+ "");
evas_textblock_style_free(st);
o_text = o;
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)
char buf[256];
char *str = "padding_set({ %d });blur({%d,color=black });";
sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
- eo_do(text, efl_gfx_filter_program_set(buf, "test"));
+ efl_gfx_filter_program_set(text, buf, "test");
FPS_STD(NAME);
}
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)
char buf[256];
char *str = "a = buffer({ 'rgba' }); padding_set({ %d }); blend({dst=a, color=darkblue});blur({%d,src=a});";
sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
- eo_do(text, efl_gfx_filter_program_set(buf, "test"));
+ efl_gfx_filter_program_set(text, buf, "test");
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("bar.png"), NULL),
- evas_obj_image_border_set(6, 6, 6, 6),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("bar.png"), NULL);
+ evas_obj_image_border_set(o, 6, 6, 6, 6);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("pan.png"), NULL),
- efl_gfx_color_set(64, 64, 64, 255),
- evas_obj_image_border_set(3, 3, 3, 3),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("pan.png"), NULL);
+ efl_gfx_color_set(o, 64, 64, 64, 255);
+ evas_obj_image_border_set(o, 3, 3, 3, 3);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -56,10 +55,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128;
- eo_do(o,
- efl_gfx_color_set(a, a, a, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, a, a, a, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -60,7 +58,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
a = rnd()&0xff;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_color_set(a, a, a, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_color_set(o, a, a, a, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -57,7 +56,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
n = rnd() % 100;
w = 3 + ((n * (60 - 3)) / 100);
h = 4 + ((n * (80 - 4)) / 100);
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_image_smooth_scale_set(1),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_image_smooth_scale_set(o, 1);
+ efl_gfx_size_set(o, w, h);
+ efl_gfx_fill_set(o, 0, 0, w, h);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -54,12 +53,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < MANYNUM; i++)
{
- eo_do(o_images[i], efl_gfx_size_get(&w, &h));
+ efl_gfx_size_get(o_images[i], &w, &h);
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
o_images[i] = o;
if (i < (OBNUM / 2))
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -36,14 +36,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i < (OBNUM / 2))
{
- eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
+ efl_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i < (OBNUM / 2))
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i < (OBNUM / 2))
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i & 0x1)
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -36,14 +36,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i & 0x1)
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i & 0x1)
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i & 0x1)
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i > (OBNUM / 2))
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -36,14 +36,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -70,7 +68,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i > (OBNUM / 2))
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i > (OBNUM / 2))
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
o_images[i] = o;
if (i > (OBNUM / 2))
{
- eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+ efl_file_set(o, build_path("logo.png"), NULL);
}
else
{
@@ -39,14 +39,12 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_position_set(x, y));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_position_set(o, x, y);
}
- eo_do(o,
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -73,7 +71,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_image_smooth_scale_set(1),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_image_smooth_scale_set(o, 1);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_image_smooth_scale_set(1),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_image_smooth_scale_set(o, 1);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_image_smooth_scale_set(1),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_image_smooth_scale_set(o, 1);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_image_smooth_scale_set(1),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_image_smooth_scale_set(o, 1);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("frame.png"), NULL),
- evas_obj_image_border_set(8, 8, 8, 8),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("frame.png"), NULL);
+ evas_obj_image_border_set(o, 8, 8, 8, 8);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -55,10 +54,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128;
- eo_do(o,
- efl_gfx_color_set(a, a, a, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, a, a, a, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -60,7 +58,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
a = rnd()&0xff;
- eo_do(o,
- efl_gfx_color_set(a, a, a, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, a, a, a, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -59,7 +57,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("bar.png"), NULL),
- evas_obj_image_border_set(6, 6, 6, 6),
- evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("bar.png"), NULL);
+ evas_obj_image_border_set(o, 6, 6, 6, 6);
+ evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -56,10 +55,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- evas_obj_image_border_set(43, 48, 48, 83),
- evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ evas_obj_image_border_set(o, 43, 48, 48, 83);
+ evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -56,7 +55,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -54,7 +53,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -54,7 +53,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[0] = o;
- eo_do(o,
- efl_file_set(build_path("im1.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("im1.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_visible_set(o, EINA_TRUE);
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[1] = o;
- eo_do(o,
- efl_file_set(build_path("im2.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("im2.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_visible_set(o, EINA_TRUE);
done = 0;
}
@@ -55,7 +53,7 @@ static void _loop(double t, int f)
a = f & 0x1f;
a = ((a << 3) | (a >> 2)) & 0xff;
- eo_do(o_images[1], efl_gfx_color_set(a, a, a, a));
+ efl_gfx_color_set(o_images[1], a, a, a, a);
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
- evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
- efl_gfx_view_size_set(640, 480),
- evas_obj_image_alpha_set(0),
- efl_gfx_fill_set(0, 0, 640, 480),
- efl_gfx_size_set(640, 480),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+ evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
+ efl_gfx_view_size_set(o, 640, 480);
+ evas_obj_image_alpha_set(o, 0);
+ efl_gfx_fill_set(o, 0, 0, 640, 480);
+ efl_gfx_size_set(o, 640, 480);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -58,12 +57,11 @@ static void _loop(double t, int f)
h = 480;
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h),
- data = evas_obj_image_data_get(1),
- st = evas_obj_image_stride_get());
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
+ data = evas_obj_image_data_get(o_images[i], 1);
+ st = evas_obj_image_stride_get(o_images[i]);
st = st >> 2;
p = data;
for (y = 0; y < h; y++)
@@ -75,9 +73,8 @@ static void _loop(double t, int f)
}
p += (st - w);
}
- eo_do(o_images[i],
- evas_obj_image_data_set(data),
- evas_obj_image_data_update_add( 0, 0, w, h));
+ evas_obj_image_data_set(o_images[i], data);
+ evas_obj_image_data_update_add(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
- evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
- efl_gfx_view_size_set(640, 480),
- evas_obj_image_alpha_set(1),
- efl_gfx_fill_set(0, 0, 640, 480),
- efl_gfx_size_set(640, 480),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+ evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
+ efl_gfx_view_size_set(o, 640, 480);
+ evas_obj_image_alpha_set(o, 1);
+ efl_gfx_fill_set(o, 0, 0, 640, 480);
+ efl_gfx_size_set(o, 640, 480);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -58,12 +57,11 @@ static void _loop(double t, int f)
h = 480;
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h),
- data = evas_obj_image_data_get(1),
- st = evas_obj_image_stride_get());
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
+ data = evas_obj_image_data_get(o_images[i], 1);
+ st = evas_obj_image_stride_get(o_images[i]);
st = st >> 2;
p = data;
for (y = 0; y < h; y++)
@@ -86,9 +84,8 @@ static void _loop(double t, int f)
}
p += (st - w);
}
- eo_do(o_images[i],
- evas_obj_image_data_set(data),
- evas_obj_image_data_update_add( 0, 0, w, h));
+ evas_obj_image_data_set(o_images[i], data);
+ evas_obj_image_data_update_add(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
- evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
- efl_gfx_view_size_set(640, 480),
- evas_obj_image_alpha_set(0),
- efl_gfx_fill_set(0, 0, 640, 480),
- efl_gfx_size_set(640, 480),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+ evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+ efl_gfx_view_size_set(o, 640, 480);
+ evas_obj_image_alpha_set(o, 0);
+ efl_gfx_fill_set(o, 0, 0, 640, 480);
+ efl_gfx_size_set(o, 640, 480);
+ efl_gfx_visible_set(o, EINA_TRUE);
yp = malloc(640 * 480);
up = malloc(320 * 240);
vp = malloc(320 * 240);
@@ -65,7 +64,7 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
- eo_do(o_images[i], evas_obj_image_data_set(data));
+ evas_obj_image_data_set(o_images[i], data);
}
done = 0;
}
@@ -91,11 +90,10 @@ static void _loop(double t, int f)
h = 480;
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h),
- evas_obj_image_data_update_add( 0, 0, 640, 480));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
+ evas_obj_image_data_update_add(o_images[i], 0, 0, 640, 480);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
- evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
- efl_gfx_view_size_set(640, 480),
- evas_obj_image_alpha_set(0),
- efl_gfx_fill_set(0, 0, 640, 480),
- efl_gfx_size_set(640, 480),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+ evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+ efl_gfx_view_size_set(o, 640, 480);
+ evas_obj_image_alpha_set(o, 0);
+ efl_gfx_fill_set(o, 0, 0, 640, 480);
+ efl_gfx_size_set(o, 640, 480);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
yp = malloc(640 * 480);
up = malloc(320 * 240);
vp = malloc(320 * 240);
@@ -66,7 +65,7 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
- eo_do(o_images[i], evas_obj_image_data_set(data));
+ evas_obj_image_data_set(o_images[i], data);
}
done = 0;
}
@@ -100,9 +99,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
- evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
- efl_gfx_view_size_set(640, 480),
- evas_obj_image_alpha_set(0),
- efl_gfx_fill_set(0, 0, 640, 480),
- efl_gfx_size_set(640, 480),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+ evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+ efl_gfx_view_size_set(o, 640, 480);
+ evas_obj_image_alpha_set(o, 0);
+ efl_gfx_fill_set(o, 0, 0, 640, 480);
+ efl_gfx_size_set(o, 640, 480);
+ efl_gfx_visible_set(o, EINA_TRUE);
yp = malloc(640 * 480);
up = malloc(320 * 240);
vp = malloc(320 * 240);
@@ -65,7 +64,7 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
- eo_do(o_images[i], evas_obj_image_data_set(data));
+ evas_obj_image_data_set(o_images[i], data);
}
done = 0;
}
@@ -98,9 +97,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
- evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
- efl_gfx_view_size_set(320, 480),
- evas_obj_image_alpha_set(0),
- efl_gfx_fill_set(0, 0, 640, 480),
- efl_gfx_size_set(640, 480),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+ evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
+ efl_gfx_view_size_set(o, 320, 480);
+ evas_obj_image_alpha_set(o, 0);
+ efl_gfx_fill_set(o, 0, 0, 640, 480);
+ efl_gfx_size_set(o, 640, 480);
+ efl_gfx_visible_set(o, EINA_TRUE);
yp = malloc(640 * 480);
up = malloc(320 * 240);
vp = malloc(320 * 240);
@@ -67,9 +66,8 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
- eo_do(o_images[i],
- evas_obj_image_data_set(data),
- evas_obj_image_data_update_add( 0, 0, 320, 480));
+ evas_obj_image_data_set(o_images[i], data);
+ evas_obj_image_data_update_add(o_images[i], 0, 0, 320, 480);
}
}
done = 0;
@@ -98,10 +96,9 @@ static void _loop(double t, int f)
h = 480;
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
w = 320 - 16 + f;
if (w < 1) w = 1;
@@ -109,7 +106,7 @@ static void _loop(double t, int f)
w &= ~0x1;
- eo_do(o_images[i], efl_gfx_view_size_set(w, 480));
+ efl_gfx_view_size_set(o_images[i], w, 480);
data = evas_object_image_data_get(o_images[i], 1);
if (data)
{
@@ -129,9 +126,8 @@ static void _loop(double t, int f)
*lp = vp + (y * 320);
lp++;
}
- eo_do(o_images[i],
- evas_obj_image_data_set(data),
- evas_obj_image_data_update_add( 0, 0, w, 480));
+ evas_obj_image_data_set(o_images[i], data);
+ evas_obj_image_data_update_add(o_images[i], 0, 0, w, 480);
}
}
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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
- eo_do(o,
- efl_file_set(build_path(buf), NULL),
- efl_gfx_fill_set(0, 0, 256, 256),
- efl_gfx_size_set(256, 256),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(buf), NULL);
+ efl_gfx_fill_set(o, 0, 0, 256, 256);
+ efl_gfx_size_set(o, 256, 256);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 256, 0);
@@ -131,14 +130,13 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
if (evas_map_util_clockwise_get(m))
{
- eo_do(c->side[i].o,
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_map_enable_set(c->side[i].o, 1);
+ evas_obj_map_set(c->side[i].o, m);
+ efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
}
else
{
- eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE));
+ efl_gfx_visible_set(c->side[i].o, EINA_FALSE);
}
order[i] = i;
@@ -163,9 +161,9 @@ _cube_pos(Cube *c,
}
while (!sorted);
- eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
+ efl_gfx_stack_raise(c->side[order[0]].o);
for (i = 1; i < 6; i++)
- eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
+ efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
}
static 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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
- eo_do(o,
- efl_file_set(build_path(buf), NULL),
- efl_gfx_fill_set(0, 0, 256, 256),
- efl_gfx_size_set(256, 256),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(buf), NULL);
+ efl_gfx_fill_set(o, 0, 0, 256, 256);
+ efl_gfx_size_set(o, 256, 256);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 256, 0);
@@ -129,14 +128,13 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
if (evas_map_util_clockwise_get(m))
{
- eo_do(c->side[i].o,
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_map_enable_set(c->side[i].o, 1);
+ evas_obj_map_set(c->side[i].o, m);
+ efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
}
else
{
- eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE));
+ efl_gfx_visible_set(c->side[i].o, EINA_FALSE);
}
order[i] = i;
@@ -161,9 +159,9 @@ _cube_pos(Cube *c,
}
while (!sorted);
- eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
+ efl_gfx_stack_raise(c->side[order[0]].o);
for (i = 1; i < 6; i++)
- eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
+ efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
}
static 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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
- eo_do(o,
- efl_file_set(build_path(buf), NULL),
- efl_gfx_fill_set(0, 0, 256, 256),
- efl_gfx_size_set(256, 256),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(buf), NULL);
+ efl_gfx_fill_set(o, 0, 0, 256, 256);
+ efl_gfx_size_set(o, 256, 256);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 256, 0);
@@ -129,9 +128,8 @@ _cube_pos(Cube *c,
255, 255, 255,
20, 20, 20);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
- eo_do(c->side[i].o,
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(c->side[i].o, 1);
+ evas_obj_map_set(c->side[i].o, m);
order[i] = i;
for (j = 0; j < 4; j++)
@@ -155,9 +153,9 @@ _cube_pos(Cube *c,
}
while (!sorted);
- eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
+ efl_gfx_stack_raise(c->side[order[0]].o);
for (i = 1; i < 6; i++)
- eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
+ efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
}
static 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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
- eo_do(o,
- efl_file_set(build_path(buf), NULL),
- efl_gfx_fill_set(0, 0, 256, 256),
- efl_gfx_size_set(256, 256),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(buf), NULL);
+ efl_gfx_fill_set(o, 0, 0, 256, 256);
+ efl_gfx_size_set(o, 256, 256);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 256, 0);
@@ -127,9 +126,8 @@ _cube_pos(Cube *c,
255, 255, 255,
20, 20, 20);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
- eo_do(c->side[i].o,
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(c->side[i].o, 1);
+ evas_obj_map_set(c->side[i].o, m);
order[i] = i;
for (j = 0; j < 4; j++)
@@ -153,9 +151,9 @@ _cube_pos(Cube *c,
}
while (!sorted);
- eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
+ efl_gfx_stack_raise(c->side[order[0]].o);
for (i = 1; i < 6; i++)
- eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
+ efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
}
static 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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
- eo_do(o,
- efl_file_set(build_path(buf), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(buf), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 720, 0);
@@ -131,14 +130,13 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
if (evas_map_util_clockwise_get(m))
{
- eo_do(c->side[i].o,
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_map_enable_set(c->side[i].o, 1);
+ evas_obj_map_set(c->side[i].o, m);
+ efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
}
else
{
- eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE));
+ efl_gfx_visible_set(c->side[i].o, EINA_FALSE);
}
order[i] = i;
@@ -163,9 +161,9 @@ _cube_pos(Cube *c,
}
while (!sorted);
- eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
+ efl_gfx_stack_raise(c->side[order[0]].o);
for (i = 1; i < 6; i++)
- eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
+ efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
}
static 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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
- eo_do(o,
- efl_file_set(build_path(buf), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(buf), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 720, 0);
@@ -128,14 +127,13 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
if (evas_map_util_clockwise_get(m))
{
- eo_do(c->side[i].o,
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_map_enable_set(c->side[i].o, 1);
+ evas_obj_map_set(c->side[i].o, m);
+ efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
}
else
{
- eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE));
+ efl_gfx_visible_set(c->side[i].o, EINA_FALSE);
}
order[i] = i;
@@ -160,9 +158,9 @@ _cube_pos(Cube *c,
}
while (!sorted);
- eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
+ efl_gfx_stack_raise(c->side[order[0]].o);
for (i = 1; i < 6; i++)
- eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
+ efl_gfx_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
}
static 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)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
- eo_do(o,
- efl_file_set(build_path(buf), NULL),
- efl_gfx_fill_set(0, 0, 256, 256),
- efl_gfx_size_set(256, 256),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(buf), NULL);
+ efl_gfx_fill_set(o, 0, 0, 256, 256);
+ efl_gfx_size_set(o, 256, 256);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_reflec[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
- eo_do(o,
- efl_file_set(build_path(buf), NULL),
- efl_gfx_fill_set(0, 0, 256, 256),
- efl_gfx_size_set(256, 256),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(buf), NULL);
+ efl_gfx_fill_set(o, 0, 0, 256, 256);
+ efl_gfx_size_set(o, 256, 256);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -130,13 +128,13 @@ static void _loop(double t, int f)
if (c <= 0)
{
- eo_do(o_images[i], efl_gfx_stack_raise());
- eo_do(o_reflec[i], efl_gfx_stack_raise());
+ efl_gfx_stack_raise(o_images[i]);
+ efl_gfx_stack_raise(o_reflec[i]);
}
else
{
- eo_do(o_images[i], efl_gfx_stack_lower());
- eo_do(o_reflec[i], efl_gfx_stack_lower());
+ efl_gfx_stack_lower(o_images[i]);
+ efl_gfx_stack_lower(o_reflec[i]);
}
evas_map_point_coord_set (m, 0, x, y, -z);
@@ -159,9 +157,8 @@ static void _loop(double t, int f)
x + (w / 2), y + (h / 2), 0);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
evas_map_point_coord_set (m, 0, x, yy, -z);
evas_map_point_image_uv_set(m, 0, 0, 256);
@@ -183,9 +180,8 @@ static void _loop(double t, int f)
x + (w / 2), y + (h / 2), 0);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
- eo_do(o_reflec[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_reflec[i], 1);
+ evas_obj_map_set(o_reflec[i], m);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -69,9 +68,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -69,9 +68,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -67,9 +66,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -66,9 +65,8 @@ static void _loop(double t, int f)
evas_map_point_color_set(m, 3, 0, 0, 0, 0);
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -69,9 +68,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -69,9 +68,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -67,9 +66,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -67,9 +66,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -64,9 +63,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_image_smooth_scale_set(0),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_image_smooth_scale_set(o, 0);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -64,9 +63,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o, efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i], evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -62,9 +61,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i + 1] = o;
- eo_do(o,
- efl_file_set(build_path("e-logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
- eo_do(o_images[i], evas_obj_clip_set(o));
+ evas_obj_clip_set(o_images[i], o);
}
done = 0;
}
@@ -64,8 +62,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
- eo_do(o_images[i + 1], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_position_set(o_images[i + 1], x, y);
}
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-mask.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < 1; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("texture.png"), NULL),
- efl_gfx_fill_set(0, 0, win_w * 4, win_h * 4),
- efl_gfx_size_set(win_w * 4, win_h * 4),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("texture.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4);
+ efl_gfx_size_set(o, win_w * 4, win_h * 4);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -72,9 +70,8 @@ static void _loop(double t, int f)
win_w * 4, win_h * 4, 0);
evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
- eo_do(o_images[i],
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_images[i], 1);
+ evas_obj_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-mask.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < OBNUM; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -68,7 +66,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
if (!m) m = evas_map_new(4);
evas_map_util_points_populate_from_geometry(m,
@@ -77,9 +75,8 @@ static void _loop(double t, int f)
720, 420, 0);
evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
- eo_do(o_mask,
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_mask, 1);
+ evas_obj_map_set(o_mask, m);
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-mask.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < OBNUM; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_image_smooth_scale_set(1),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_image_smooth_scale_set(o, 1);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -71,10 +69,9 @@ static void _loop(double t, int f)
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-mask.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < OBNUM; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_image_smooth_scale_set(0),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_image_smooth_scale_set(o, 0);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -71,10 +69,9 @@ static void _loop(double t, int f)
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("image.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("image.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i + 1] = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-2.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-2.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
- eo_do(o_images[i], evas_obj_clip_set(o));
+ evas_obj_clip_set(o_images[i], o);
}
done = 0;
}
@@ -64,8 +62,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
- eo_do(o_images[i + 1], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_position_set(o_images[i + 1], x, y);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-2.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-2.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i + 1] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
- eo_do(o_images[i], evas_obj_clip_set(o));
+ evas_obj_clip_set(o_images[i], o);
}
done = 0;
}
@@ -64,8 +62,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
- eo_do(o_images[i + 1], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_position_set(o_images[i + 1], x, y);
}
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-mask.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < OBNUM; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -67,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-2.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_position_set((win_w - 120) / 2, (win_h - 160) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-2.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_position_set(o, (win_w - 120) / 2, (win_h - 160) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < OBNUM; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -67,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-mask.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < OBNUM; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120 / 2, 160 / 2),
- efl_gfx_size_set(120 / 2, 160 / 2),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2);
+ efl_gfx_size_set(o, 120 / 2, 160 / 2);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -67,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-2.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_position_set((win_w - 120) / 2, (win_h - 160) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-2.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_position_set(o, (win_w - 120) / 2, (win_h - 160) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < OBNUM; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -67,14 +65,13 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW))));
h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW))));
- eo_do(o_mask,
- efl_gfx_fill_set(0, 0, w, h),
- efl_gfx_size_set(w, h),
- efl_gfx_position_set((win_w - w) / 2, (win_h - h) / 2));
+ efl_gfx_fill_set(o_mask, 0, 0, w, h);
+ efl_gfx_size_set(o_mask, w, h);
+ efl_gfx_position_set(o_mask, (win_w - w) / 2, (win_h - h) / 2);
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-mask.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < 1; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("texture.png"), NULL),
- efl_gfx_fill_set(0, 0, 500, 444),
- efl_gfx_size_set(win_w * 4, win_h * 4),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("texture.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 500, 444);
+ efl_gfx_size_set(o, win_w * 4, win_h * 4);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -67,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
int i;
Evas_Object *o;
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_mask = o;
- eo_do(o,
- efl_file_set(build_path("e-logo-mask.png"), NULL),
- efl_gfx_fill_set(0, 0, 720, 420),
- efl_gfx_size_set(720, 420),
- efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("e-logo-mask.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 720, 420);
+ efl_gfx_size_set(o, 720, 420);
+ efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 0; i < 1; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS,evas);
+ o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path("texture.png"), NULL),
- efl_gfx_fill_set(0, 0, 500, 444),
- efl_gfx_size_set(win_w * 4, win_h * 4),
- evas_obj_clip_set(o_mask),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("texture.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 500, 444);
+ efl_gfx_size_set(o, win_w * 4, win_h * 4);
+ evas_obj_clip_set(o, o_mask);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -68,7 +66,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
if (!m) m = evas_map_new(4);
@@ -78,9 +76,8 @@ static void _loop(double t, int f)
720, 420, 0);
evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
- eo_do(o_mask,
- evas_obj_map_enable_set(1),
- evas_obj_map_set(m));
+ evas_obj_map_enable_set(o_mask, 1);
+ evas_obj_map_set(o_mask, m);
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o, efl_file_set(build_path("tp.png"), NULL),
- efl_gfx_fill_set(0, 0, 640, 480),
- efl_gfx_size_set(640, 480),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("tp.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 640, 480);
+ efl_gfx_size_set(o, 640, 480);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
h *= (f / 100.0) * 4.0;
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
+ efl_gfx_fill_set(o_images[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
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)
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- eo_do(o,
- efl_gfx_color_set(r, g, b, a),
- evas_obj_line_xy_set(((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)),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, r, g, b, a);
+ 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));
+ efl_gfx_visible_set(o, EINA_TRUE);
}
@@ -91,11 +87,11 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
o = o_images[i];
- eo_do(o, evas_obj_line_xy_get(&ox1, &oy1, &ox2, &oy2));
+ evas_obj_line_xy_get(o, &ox1, &oy1, &ox2, &oy2);
_rotate_point(&ox1, &oy1, i);
_rotate_point(&ox2, &oy2, i);
- eo_do(o, evas_obj_line_xy_set(ox1, oy1, ox2, oy2));
+ evas_obj_line_xy_set(o, ox1, oy1, ox2, oy2);
}
FPS_STD(NAME);
}
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
poly(Evas_Object *o, int type, Evas_Coord x, Evas_Coord y)
{
if (o)
- eo_do(o, evas_obj_polygon_points_clear());
+ evas_obj_polygon_points_clear(o);
switch (type % 4)
{
case 0: /* triangle */
if (o)
- eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
- evas_obj_polygon_point_add(x + 100, y + 100),
- evas_obj_polygon_point_add(x + 0 , y + 100));
+ evas_obj_polygon_point_add(o, x + 50, y + 0);
+ evas_obj_polygon_point_add(o, x + 100, y + 100);
+ evas_obj_polygon_point_add(o, x + 0, y + 100);
break;
case 1: /* square */
if (o)
- eo_do(o, evas_obj_polygon_point_add(x + 0 , y + 0),
- evas_obj_polygon_point_add(x + 100, y + 0),
- evas_obj_polygon_point_add(x + 100, y + 100),
- evas_obj_polygon_point_add(x + 0 , y + 100));
+ evas_obj_polygon_point_add(o, x + 0, y + 0);
+ evas_obj_polygon_point_add(o, x + 100, y + 0);
+ evas_obj_polygon_point_add(o, x + 100, y + 100);
+ evas_obj_polygon_point_add(o, x + 0, y + 100);
break;
case 2: /* hex */
if (o)
- eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
- evas_obj_polygon_point_add(x + 100, y + 30),
- evas_obj_polygon_point_add(x + 100, y + 70),
- evas_obj_polygon_point_add(x + 50 , y + 100),
- evas_obj_polygon_point_add(x + 0 , y + 70),
- evas_obj_polygon_point_add(x + 0 , y + 30));
+ evas_obj_polygon_point_add(o, x + 50, y + 0);
+ evas_obj_polygon_point_add(o, x + 100, y + 30);
+ evas_obj_polygon_point_add(o, x + 100, y + 70);
+ evas_obj_polygon_point_add(o, x + 50, y + 100);
+ evas_obj_polygon_point_add(o, x + 0, y + 70);
+ evas_obj_polygon_point_add(o, x + 0, y + 30);
break;
case 3: /* star */
if (o)
- eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
- evas_obj_polygon_point_add(x + 60 , y + 40),
- evas_obj_polygon_point_add(x + 90 , y + 30),
- evas_obj_polygon_point_add(x + 70 , y + 60),
- evas_obj_polygon_point_add(x + 90 , y + 100),
- evas_obj_polygon_point_add(x + 50 , y + 70),
- evas_obj_polygon_point_add(x + 10 , y + 100),
- evas_obj_polygon_point_add(x + 30 , y + 60),
- evas_obj_polygon_point_add(x + 10 , y + 30),
- evas_obj_polygon_point_add(x + 40 , y + 40));
+ evas_obj_polygon_point_add(o, x + 50, y + 0);
+ evas_obj_polygon_point_add(o, x + 60, y + 40);
+ evas_obj_polygon_point_add(o, x + 90, y + 30);
+ evas_obj_polygon_point_add(o, x + 70, y + 60);
+ evas_obj_polygon_point_add(o, x + 90, y + 100);
+ evas_obj_polygon_point_add(o, x + 50, y + 70);
+ evas_obj_polygon_point_add(o, x + 10, y + 100);
+ evas_obj_polygon_point_add(o, x + 30, y + 60);
+ evas_obj_polygon_point_add(o, x + 10, y + 30);
+ evas_obj_polygon_point_add(o, x + 40, y + 40);
break;
default:
break;
@@ -80,8 +80,8 @@ static void _setup(void)
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
if (o)
- eo_do(o, efl_gfx_color_set(r, g, b, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, r, g, b, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
poly(o, i, 0, 0);
}
done = 0;
@@ -105,13 +105,13 @@ static void _loop(double t, int f)
{
o = o_images[i];
if (o)
- eo_do(o, efl_gfx_size_get(&w, &h));
+ efl_gfx_size_get(o, &w, &h);
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4);
if (o)
- eo_do(o, efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o, x, y);
}
FPS_STD(NAME);
}
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)
Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas);
- eo_do(o,
- efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
src = o;
o_images[0] = src;
@@ -35,11 +34,10 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- evas_obj_image_source_set(src),
- efl_gfx_size_set(120, 160),
- efl_gfx_fill_set(0,0,120,160),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_image_source_set(o, src);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -64,7 +62,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas);
- eo_do(o, efl_file_set(build_path("logo.png"), NULL),
- efl_gfx_fill_set(0, 0, 120, 160),
- efl_gfx_size_set(120, 160),
- efl_gfx_position_set(-400, -300));
+ efl_file_set(o, build_path("logo.png"), NULL);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_position_set(o, -400, -300);
src = o;
for (i = 0; i < OBNUM / 2; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o, evas_obj_image_source_set(src, NULL),
- efl_gfx_size_set(120, 160),
- efl_gfx_fill_set(0,0,120,160),
- efl_gfx_visible_set(EINA_TRUE));
+ evas_obj_image_source_set(o, src, NULL);
+ efl_gfx_size_set(o, 120, 160);
+ efl_gfx_fill_set(o, 0, 0, 120, 160);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_images[i], x, y);
}
FPS_STD(NAME);
}
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)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
- eo_do(o,
- efl_text_properties_font_set("Vera-Bold", 20),
- efl_text_set("This is a test string"),
- evas_obj_text_style_set(st),
- efl_gfx_color_set(255, 255, 255, 255),
- evas_obj_text_shadow_color_set(0, 0, 0, 24),
- evas_obj_text_glow_color_set(100, 80, 40, 100),
- evas_obj_text_glow2_color_set(50, 10, 5, 50),
- evas_obj_text_outline_color_set(0, 0, 0, 255),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_text_properties_font_set(o, "Vera-Bold", 20);
+ efl_text_set(o, "This is a test string");
+ evas_obj_text_style_set(o, st);
+ efl_gfx_color_set(o, 255, 255, 255, 255);
+ evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+ evas_obj_text_glow_color_set(o, 100, 80, 40, 100);
+ evas_obj_text_glow2_color_set(o, 50, 10, 5, 50);
+ evas_obj_text_outline_color_set(o, 0, 0, 0, 255);
+ efl_gfx_visible_set(o, EINA_TRUE);
st++;
}
st = i;
@@ -48,13 +47,12 @@ static void _setup(void)
s = o_texts[i % st];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_texts[i] = o;
- eo_do(o, evas_obj_image_source_set(s));
+ evas_obj_image_source_set(o, s);
/* FIXME s == NULL*/
- eo_do(s, efl_gfx_size_get(&w, &h));
- eo_do(o,
- efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_size_get(s, &w, &h);
+ efl_gfx_size_set(o, w, h);
+ efl_gfx_fill_set(o, 0, 0, w, h);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
@@ -74,12 +72,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- eo_do(o_texts[i], efl_gfx_size_get(&w, &h));
+ efl_gfx_size_get(o_texts[i], &w, &h);
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
- eo_do(o_texts[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_texts[i], x, y);
}
FPS_STD(NAME);
}
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)
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- eo_do(o,
- efl_text_properties_font_set("Vera-Bold", 20),
- efl_text_set(buf),
- efl_gfx_color_set(0, 0, 0, 255),
- efl_gfx_size_get(&w, &h));
+ efl_text_properties_font_set(o, "Vera-Bold", 20);
+ efl_text_set(o, buf);
+ efl_gfx_color_set(o, 0, 0, 0, 255);
+ efl_gfx_size_get(o, &w, &h);
x = (win_w / 2) - (w / 2);
x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
- eo_do(o,
- efl_gfx_position_set(x, y),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_position_set(o, x, y);
+ efl_gfx_visible_set(o, EINA_TRUE);
for (i = 1 ; i < OBNUM ; i ++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_texts[i] = o;
- eo_do(o,
- evas_obj_image_source_set(o_texts[0]));
- eo_do(o_texts[0], efl_gfx_size_get(&w, &h));
- eo_do(o, efl_gfx_size_set(w, h),
- efl_gfx_fill_set(0, 0, w, h));
+ evas_obj_image_source_set(o, o_texts[0]);
+ efl_gfx_size_get(o_texts[0], &w, &h);
+ efl_gfx_size_set(o, w, h);
+ efl_gfx_fill_set(o, 0, 0, w, h);
x = (win_w / 2) - (w / 2);
x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
- eo_do(o, efl_gfx_position_set(x, y),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_position_set(o, x, y);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
@@ -92,14 +89,12 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- eo_do(o_texts[0],
- efl_text_set(buf),
- efl_gfx_size_get(&w, &h));
+ efl_text_set(o_texts[0], buf);
+ efl_gfx_size_get(o_texts[0], &w, &h);
for (i = 1; i < OBNUM; i++)
{
- eo_do(o_texts[i],
- efl_gfx_size_set(w,h),
- efl_gfx_fill_set(0,0,w,h));
+ efl_gfx_size_set(o_texts[i], w, h);
+ efl_gfx_fill_set(o_texts[i], 0, 0, w, h);
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index 40a1538..51dcaf6 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -32,9 +32,8 @@ static void _setup(void)
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- eo_do(o,
- efl_gfx_color_set(r, g, b, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, r, g, b, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -61,9 +60,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 63e7adb..fac3244 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -35,8 +35,8 @@ static void _setup(void)
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- eo_do(o, efl_gfx_color_set(r, g, b, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, r, g, b, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index c1d0c6e..31fef38 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -33,9 +33,8 @@ static void _setup(void)
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- eo_do(o,
- efl_gfx_color_set(r, g, b, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, r, g, b, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -62,9 +61,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 7c33a67..214602b 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -36,8 +36,8 @@ static void _setup(void)
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- eo_do(o, efl_gfx_color_set(r, g, b, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, r, g, b, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index d2d282f..fbd2d46 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -32,9 +32,8 @@ static void _setup(void)
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- eo_do(o,
- efl_gfx_color_set(r, g, b, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, r, g, b, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -61,9 +60,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i],
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 81aef86..568c011 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -35,8 +35,8 @@ static void _setup(void)
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- eo_do(o, efl_gfx_color_set(r, g, b, a),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_color_set(o, r, g, b, a);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
- eo_do(o_images[i], efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(o_images[i], x, y);
+ efl_gfx_size_set(o_images[i], w, h);
}
FPS_STD(NAME);
}
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index 8088edd..328073a 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -56,25 +56,23 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- eo_do(o,
- efl_file_set(build_path(icons[i % 13]), NULL),
- efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
- efl_gfx_size_set(ICON_SIZE, ICON_SIZE),
- efl_gfx_position_set(x + 8, y),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_file_set(o, build_path(icons[i % 13]), NULL);
+ efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
+ efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
+ efl_gfx_position_set(o, x + 8, y);
+ efl_gfx_visible_set(o, EINA_TRUE);
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
- eo_do(o,
- efl_text_properties_font_set("Vera-Bold", 10),
- efl_text_set(icons[i % 13]),
- evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW),
- efl_gfx_color_set(255, 255, 255, 255),
- evas_obj_text_shadow_color_set(0, 0, 0, 24),
- efl_gfx_visible_set(EINA_TRUE),
- efl_gfx_size_get(&tw, &th));
+ efl_text_properties_font_set(o, "Vera-Bold", 10);
+ efl_text_set(o, icons[i % 13]);
+ evas_obj_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
+ efl_gfx_color_set(o, 255, 255, 255, 255);
+ evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+ efl_gfx_visible_set(o, EINA_TRUE);
+ efl_gfx_size_get(o, &tw, &th);
cent = ICON_SIZE + 16 - tw / 2;
- eo_do(o, efl_gfx_position_set(x + cent, y + ICON_SIZE + 4));
+ efl_gfx_position_set(o, x + cent, y + ICON_SIZE + 4);
x += ICON_SIZE + 16;
if (x > win_w)
{
@@ -89,13 +87,12 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_snap = o;
- eo_do(o,
- efl_gfx_visible_set(EINA_TRUE),
- efl_gfx_position_set(50, 50),
- efl_gfx_size_set(200, 200),
- efl_gfx_fill_set(0, 0, 200, 200),
- evas_obj_image_snapshot_set(EINA_TRUE),
- efl_gfx_filter_program_set(filter, "test"));
+ efl_gfx_visible_set(o, EINA_TRUE);
+ efl_gfx_position_set(o, 50, 50);
+ efl_gfx_size_set(o, 200, 200);
+ efl_gfx_fill_set(o, 0, 0, 200, 200);
+ evas_obj_image_snapshot_set(o, EINA_TRUE);
+ efl_gfx_filter_program_set(o, filter, "test");
done = 0;
}
@@ -124,10 +121,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- eo_do(o_images[i], efl_gfx_position_set(x + 8, y));
- eo_do(o_texts[i], efl_gfx_size_get(&tw, &th));
+ efl_gfx_position_set(o_images[i], x + 8, y);
+ efl_gfx_size_get(o_texts[i], &tw, &th);
cent = (ICON_SIZE + 16 - tw) / 2;
- eo_do(o_texts[i], efl_gfx_position_set(x + cent, y + ICON_SIZE + 4));
+ efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4);
x += ICON_SIZE + 16;
if (x > win_w)
{
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index 76f2ef4..31fa0d5 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -27,10 +27,10 @@ static void _setup(void)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
- eo_do(o, efl_text_properties_font_set("Vera-Bold", 20),
- efl_text_set("This is a test string"),
- efl_gfx_color_set(0, 0, 0, 255),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_text_properties_font_set(o, "Vera-Bold", 20);
+ efl_text_set(o, "This is a test string");
+ efl_gfx_color_set(o, 0, 0, 0, 255);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -49,12 +49,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- eo_do(o_texts[i], efl_gfx_size_get(&w, &h));
+ efl_gfx_size_get(o_texts[i], &w, &h);
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
- eo_do(o_texts[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_texts[i], x, y);
}
FPS_STD(NAME);
}
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index efe893b..aa7b594 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -34,21 +34,21 @@ static void _setup(void)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
- eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
+ efl_text_properties_font_set(o, "Vera-Bold", 20);
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- eo_do(o, efl_text_set(buf),
- efl_gfx_color_set(0, 0, 0, 255),
- efl_gfx_size_get(&w, &h));
+ efl_text_set(o, buf);
+ efl_gfx_color_set(o, 0, 0, 0, 255);
+ efl_gfx_size_get(o, &w, &h);
x = (win_w / 2) - (w / 2);
x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
- eo_do(o, efl_gfx_position_set(x, y),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_gfx_position_set(o, x, y);
+ efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
}
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- eo_do(o_texts[i], efl_text_set(buf));
+ efl_text_set(o_texts[i], buf);
}
FPS_STD(NAME);
}
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 50d9f7f..44c6576 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -29,16 +29,15 @@ static void _setup(void)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
- eo_do(o,
- efl_text_properties_font_set("Vera-Bold", 20),
- efl_text_set("This is a test string"),
- evas_obj_text_style_set(st),
- efl_gfx_color_set(255, 255, 255, 255),
- evas_obj_text_shadow_color_set(0, 0, 0, 24),
- evas_obj_text_glow_color_set(100, 80, 40, 100),
- evas_obj_text_glow2_color_set(50, 10, 5, 50),
- evas_obj_text_outline_color_set(0, 0, 0, 255),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_text_properties_font_set(o, "Vera-Bold", 20);
+ efl_text_set(o, "This is a test string");
+ evas_obj_text_style_set(o, st);
+ efl_gfx_color_set(o, 255, 255, 255, 255);
+ evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+ evas_obj_text_glow_color_set(o, 100, 80, 40, 100);
+ evas_obj_text_glow2_color_set(o, 50, 10, 5, 50);
+ evas_obj_text_outline_color_set(o, 0, 0, 0, 255);
+ efl_gfx_visible_set(o, EINA_TRUE);
st++;
if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
}
@@ -59,12 +58,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- eo_do(o_texts[i], efl_gfx_size_get(&w, &h));
+ efl_gfx_size_get(o_texts[i], &w, &h);
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
- eo_do(o_texts[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_texts[i], x, y);
}
FPS_STD(NAME);
}
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index f785fbf..48e4fd4 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -36,20 +36,20 @@ static void _setup(void)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
- eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
+ efl_text_properties_font_set(o, "Vera-Bold", 20);
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- eo_do(o, efl_text_set(buf),
- evas_obj_text_style_set(st),
- efl_gfx_color_set(255, 255, 255, 255),
- evas_obj_text_shadow_color_set(0, 0, 0, 24),
- evas_obj_text_glow_color_set(100, 80, 40, 100),
- evas_obj_text_glow2_color_set(50, 10, 5, 50),
- evas_obj_text_outline_color_set(0, 0, 0, 255),
- efl_gfx_visible_set(EINA_TRUE));
+ efl_text_set(o, buf);
+ evas_obj_text_style_set(o, st);
+ efl_gfx_color_set(o, 255, 255, 255, 255);
+ evas_obj_text_shadow_color_set(o, 0, 0, 0, 24);
+ evas_obj_text_glow_color_set(o, 100, 80, 40, 100);
+ evas_obj_text_glow2_color_set(o, 50, 10, 5, 50);
+ evas_obj_text_outline_color_set(o, 0, 0, 0, 255);
+ efl_gfx_visible_set(o, EINA_TRUE);
st++;
if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
}
@@ -70,12 +70,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- eo_do(o_texts[i], efl_gfx_size_get(&w, &h));
+ efl_gfx_size_get(o_texts[i], &w, &h);
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
- eo_do(o_texts[i], efl_gfx_position_set(x, y));
+ efl_gfx_position_set(o_texts[i], x, y);
}
FPS_STD(NAME);
}
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index ecb0895..d5d6dac 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -30,11 +30,9 @@ static void _setup(void)
(st,
"DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
);
- eo_do(o,
- evas_obj_textblock_style_set(st),
- evas_obj_textblock_clear(),
- evas_obj_textblock_text_markup_set(
- "This is a test of auto alignment in Evas"
+ evas_obj_textblock_style_set(o, st); \
+ evas_obj_textblock_clear(o); \
+ evas_obj_textblock_text_markup_set(o, "This is a test of auto alignment in Evas"
"
"
"This text should be left aligned"
"\xE2\x80\x8FThis text should be right aligned"
@@ -48,11 +46,10 @@ static void _setup(void)
"זה טקסט בעברית"
"
"
"In the next text, the paragraph should be right aligned and the
"
- "words should appear in the following order: 'דוגמה' first, 'of' second,
"
+ "words should appear in the following order: 'דוגמה' first, 'of' second,
"
"'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left"
- "דוגמה of טקסט in english."
- ),
- efl_gfx_visible_set(EINA_TRUE));
+ "דוגמה of טקסט in english."); \
+ efl_gfx_visible_set(o, EINA_TRUE);
evas_textblock_style_free(st);
done = 0;
@@ -70,15 +67,14 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h, w0, h0;
int i = 0;
- eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
+ evas_obj_textblock_size_native_get(o_text, &w0, &h0);
w = w0;
h = h0;
w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0);
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h0 / 2);
- eo_do(o_text,
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(o_text, x, y);
+ efl_gfx_size_set(o_text, w, h);
FPS_STD(NAME);
}
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index bde7c34..3b7bb50 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -39,14 +39,12 @@ static void _setup(void)
"p='+ font=Vera,Kochi font_size=10 align=left'"
"/p='- \n'"
);
- eo_do(o,
- evas_obj_textblock_style_set(st),
- evas_obj_textblock_clear(),
- evas_obj_textblock_text_markup_set(
- "Title
"
+ evas_obj_textblock_style_set(o, st);
+ evas_obj_textblock_clear(o);
+ evas_obj_textblock_text_markup_set(o, "Title
"
"A pragraph here red text and stuff.
"
- "And escaping < and > as well as & as
normal.
"
- "If you want a newline use <br>
woo a new line!
"
+ "And escaping <, and >, as well as &, as
normal.
"
+ "If you want a newline use <, br>,
woo a new line!
"
"Right "
"