Update use of VG API after EFL update.

This commit is contained in:
Cedric BAIL 2019-03-22 16:13:05 -07:00
parent bea0e934ad
commit cd761e5093
4 changed files with 20 additions and 19 deletions

View File

@ -26,7 +26,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
Efl_VG *root, *circle;
Efl_VG *circle;
Eo *vector;
double r = 35, stroke_w = 3;
@ -36,13 +36,13 @@ static void _setup(void)
efl_gfx_entity_position_set(vector, EINA_POSITION2D(0, 0));
efl_gfx_entity_visible_set(vector, EINA_TRUE);
root = evas_object_vg_root_node_get(vector);
circle = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, root);
circle = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, vector);
efl_gfx_path_append_circle(circle, r + stroke_w, r + stroke_w, r);
efl_gfx_shape_stroke_width_set(circle, stroke_w);
efl_gfx_shape_stroke_color_set(circle, 128, 0, 128, 128);
efl_gfx_shape_stroke_join_set(circle, EFL_GFX_JOIN_ROUND);
efl_canvas_vg_object_root_node_set(vector, circle);
}
done = 0;
}

View File

@ -32,7 +32,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
Efl_VG *root, *gradient, *rect;
Efl_VG *gradient, *rect;
Eo *vector;
double w = 70, h = 70, stroke_w = 3;
@ -42,20 +42,20 @@ static void _setup(void)
efl_gfx_entity_position_set(vector, EINA_POSITION2D(0, 0));
efl_gfx_entity_visible_set(vector, EINA_TRUE);
root = evas_object_vg_root_node_get(vector);
gradient = efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, NULL);
gradient = efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, vector);
efl_gfx_gradient_stop_set(gradient, stops, 3);
efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
efl_gfx_gradient_linear_start_set(gradient, 10, 10);
efl_gfx_gradient_linear_end_set(gradient, 50, 50);
rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, root);
rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, vector);
efl_gfx_path_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
efl_canvas_vg_shape_fill_set(rect, gradient);
efl_gfx_shape_stroke_width_set(rect, stroke_w);
efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128);
efl_gfx_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
efl_canvas_vg_object_root_node_set(vector, rect);
}
done = 0;
}

View File

@ -26,7 +26,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
Efl_VG *root, *rect;
Efl_VG *rect;
Eo *vector;
double w = 70, h = 70, stroke_w = 3;
@ -36,13 +36,13 @@ static void _setup(void)
efl_gfx_entity_position_set(vector, EINA_POSITION2D(0, 0));
efl_gfx_entity_visible_set(vector, EINA_TRUE);
root = evas_object_vg_root_node_get(vector);
rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, root);
rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, vector);
efl_gfx_path_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
efl_gfx_shape_stroke_width_set(rect, stroke_w);
efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128);
efl_gfx_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
efl_canvas_vg_object_root_node_set(vector, rect);
}
done = 0;
}

View File

@ -32,7 +32,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
Efl_VG *root, *gradient, *rect;
Efl_VG *gradient, *rect;
Eo *vector;
double w = 70, h = 70, stroke_w = 3;
@ -41,21 +41,22 @@ static void _setup(void)
efl_gfx_entity_size_set(vector, EINA_SIZE2D(w + stroke_w * 2, h + stroke_w * 2));
efl_gfx_entity_position_set(vector, EINA_POSITION2D(0, 0));
efl_gfx_entity_visible_set(vector, EINA_TRUE);
efl_canvas_vg_object_fill_mode_set(vector, EFL_CANVAS_VG_FILL_MODE_STRETCH);
root = evas_object_vg_root_node_get(vector);
o_gradient[i] = gradient = efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, NULL);
o_gradient[i] = gradient = efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, vector);
efl_gfx_gradient_stop_set(gradient, stops, 3);
efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
efl_gfx_gradient_linear_start_set(gradient, 10, 10);
efl_gfx_gradient_linear_end_set(gradient, 50, 50);
o_shapes[i] = rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, root);
o_shapes[i] = rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, vector);
efl_gfx_path_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
efl_canvas_vg_shape_fill_set(rect, gradient);
efl_gfx_shape_stroke_width_set(rect, stroke_w);
efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128);
efl_gfx_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
efl_canvas_vg_object_root_node_set(vector, rect);
}
done = 0;
}
@ -88,7 +89,7 @@ static void _loop(double t, int f)
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
efl_gfx_entity_position_set(o_objects[i], EINA_POSITION2D(x, y));
efl_gfx_entity_size_set(o_objects[i], EINA_SIZE2D(w + stroke_w * 2, h + stroke_w * 2));
efl_gfx_fill_set(o_objects[i], EINA_RECT(0, 0, w, h));
efl_canvas_vg_object_viewbox_set(o_objects[i], EINA_RECT(0, 0, w + stroke_w * 2, h + stroke_w * 2));
efl_gfx_path_reset(o_shapes[i]);
efl_gfx_path_append_rect(o_shapes[i], 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
efl_canvas_vg_shape_fill_set(o_shapes[i], o_gradient[i]);