containing ui setup steps in the profiling again.

[platform/upstream/expedite.git] / src / bin / image_blend_occlude2_very_many.c

diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
old mode 100644 (file)
new mode 100755 (executable)
index 776ada8..cadd4dc
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,22 +27,24 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-       o = evas_object_image_add(evas);
-       o_images[i] = o;
-       if (i & 0x1)
-         evas_object_image_file_set(o, build_path("logo.png"), NULL);
-       else
-         {
-            Evas_Coord x, y;
-
-            evas_object_image_file_set(o, build_path("image.png"), NULL);
-            x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-            y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-            evas_object_move(o, x, y);
-         }
-       evas_object_image_fill_set(o, 0, 0, 120, 160);
-       evas_object_resize(o, 120, 160);
-       evas_object_show(o);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i & 0x1)
+          {
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
+          }
+        else
+          {
+             Evas_Coord x, y;
+
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             efl_file_simple_load(o, build_path("image.png"), NULL);
+             efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
+          }
+        efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
+        efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
+        efl_gfx_entity_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -51,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,22 +63,22 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-       if (i & 0x1)
-         {
-            w = 120;
-            h = 160;
-            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)) * (h / 2);
-            evas_object_move(o_images[i], x, y);
-         }
+        if (i & 0x1)
+          {
+             w = 120;
+             h = 160;
+             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)) * (h / 2);
+             efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
+          }
      }
    FPS_STD(NAME);
 }
 
 /* prepend special key handlers if interactive (before STD) */
-static void _key(char *key)
+static void _key(const char *key)
 {
    KEY_STD;
 }
@@ -108,8 +110,7 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
-   _setup();
+   ui_func_set(_key, _loop, _setup);
 }
 # endif
 #endif