evas: use new efl interface polygon API

This commit is contained in:
Cedric BAIL 2016-03-14 15:12:25 -07:00
parent a927cdd1a4
commit 24eca8a778
1 changed files with 30 additions and 36 deletions

View File

@ -19,47 +19,42 @@ static Evas_Object *o_images[OBNUM];
static void
poly(Evas_Object *o, int type, Evas_Coord x, Evas_Coord y)
{
if (o)
evas_obj_polygon_points_clear(o);
efl_canvas_polygon_points_clear(o);
switch (type % 4)
{
case 0: /* triangle */
if (o)
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;
efl_canvas_polygon_point_add(o, x + 50, y + 0);
efl_canvas_polygon_point_add(o, x + 100, y + 100);
efl_canvas_polygon_point_add(o, x + 0, y + 100);
break;
case 1: /* square */
if (o)
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;
efl_canvas_polygon_point_add(o, x + 0, y + 0);
efl_canvas_polygon_point_add(o, x + 100, y + 0);
efl_canvas_polygon_point_add(o, x + 100, y + 100);
efl_canvas_polygon_point_add(o, x + 0, y + 100);
break;
case 2: /* hex */
if (o)
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;
efl_canvas_polygon_point_add(o, x + 50, y + 0);
efl_canvas_polygon_point_add(o, x + 100, y + 30);
efl_canvas_polygon_point_add(o, x + 100, y + 70);
efl_canvas_polygon_point_add(o, x + 50, y + 100);
efl_canvas_polygon_point_add(o, x + 0, y + 70);
efl_canvas_polygon_point_add(o, x + 0, y + 30);
break;
case 3: /* star */
if (o)
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;
efl_canvas_polygon_point_add(o, x + 50, y + 0);
efl_canvas_polygon_point_add(o, x + 60, y + 40);
efl_canvas_polygon_point_add(o, x + 90, y + 30);
efl_canvas_polygon_point_add(o, x + 70, y + 60);
efl_canvas_polygon_point_add(o, x + 90, y + 100);
efl_canvas_polygon_point_add(o, x + 50, y + 70);
efl_canvas_polygon_point_add(o, x + 10, y + 100);
efl_canvas_polygon_point_add(o, x + 30, y + 60);
efl_canvas_polygon_point_add(o, x + 10, y + 30);
efl_canvas_polygon_point_add(o, x + 40, y + 40);
break;
default:
break;
break;
}
}
@ -73,13 +68,12 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_POLYGON_CLASS, evas);
o = eo_add(EFL_CANVAS_POLYGON_CLASS, evas);
o_images[i] = o;
a = (rnd()&0xff) / 2;
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
if (o)
efl_gfx_color_set(o, r, g, b, a);
efl_gfx_visible_set(o, EINA_TRUE);
poly(o, i, 0, 0);