aboutsummaryrefslogtreecommitdiffstats
path: root/src/examples
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-03-11 17:01:44 +0900
committerHermet Park <hermetpark@gmail.com>2019-03-11 17:01:44 +0900
commita0bb2dd8665a1ebb9ed4db8b72ffeb9e6f6742d9 (patch)
tree363408c887c4e426fc6489ca02dcd7c397b6bdaa /src/examples
parentMerge branch 'master' into devs/hermet/lottie (diff)
downloadefl-a0bb2dd8665a1ebb9ed4db8b72ffeb9e6f6742d9.tar.gz
evas vg: sync with upstream master
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/edje/meson.build4
-rw-r--r--src/examples/evas/evas-vg-batman.c6
-rw-r--r--src/examples/evas/evas-vg-simple.c38
-rw-r--r--src/examples/evas/meson.build4
4 files changed, 26 insertions, 26 deletions
diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build
index d73c83a199..fd594b655e 100644
--- a/src/examples/edje/meson.build
+++ b/src/examples/edje/meson.build
@@ -37,7 +37,7 @@ edc_files = [
'signals-messages.edc',
'signalsBubble.edc',
'sigtest.edc',
- 'svg.edc',
+#'svg.edc',
'swallow.edc',
'table.edc',
'text.edc',
@@ -123,7 +123,7 @@ edje_examples = [
'edje_example',
'signals2',
'sigtest',
- 'svg-test'
+#'svg-test'
]
foreach edje_example : edje_examples
diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c
index da9176cc93..650709f250 100644
--- a/src/examples/evas/evas-vg-batman.c
+++ b/src/examples/evas/evas-vg-batman.c
@@ -133,7 +133,7 @@ main(void)
for (i = 0; i < sizeof (batmans_path) / sizeof (batmans_path[0]); i++)
{
batmans_vg[i] = evas_vg_shape_add(vg);
- efl_canvas_vg_node_origin_set(batmans_vg[i], 100, 150);
+ evas_vg_node_origin_set(batmans_vg[i], 100, 150);
if(i % 2)
{
@@ -162,7 +162,7 @@ main(void)
Eina_Matrix3 matrix;
eina_matrix3_identity(&matrix);
eina_matrix3_scale(&matrix, 1.1, 1.1);
- efl_canvas_vg_node_transformation_set(root, &matrix);
+ evas_vg_node_transformation_set(root, &matrix);
circle = evas_vg_shape_add(root);
evas_vg_shape_append_circle(circle, WIDTH / 2, HEIGHT / 2, 200);
@@ -172,7 +172,7 @@ main(void)
batman = evas_vg_shape_add(root);
evas_vg_node_color_set(batman, 0, 0, 0, 255);
- efl_canvas_vg_node_origin_set(batman, 100, 150);
+ evas_vg_node_origin_set(batman, 100, 150);
evas_vg_shape_append_move_to(batman, 256, 213);
evas_vg_shape_dup(batman, batmans_vg[0]);
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 47889ae024..36b8baaf55 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -152,15 +152,15 @@ _added_transformation(Efl_VG *shape, Eina_Matrix3 *m)
Eina_Matrix3 new_m;
const Eina_Matrix3 *old_m;
- old_m = efl_canvas_vg_node_transformation_get(shape);
+ old_m = evas_vg_node_transformation_get(shape);
if (old_m)
{
eina_matrix3_compose(m, old_m, &new_m);
- efl_canvas_vg_node_transformation_set(shape, &new_m);
+ evas_vg_node_transformation_set(shape, &new_m);
}
else
{
- efl_canvas_vg_node_transformation_set(shape, m);
+ evas_vg_node_transformation_set(shape, m);
}
}
@@ -317,7 +317,7 @@ _1_basic_shape_test()
evas_vg_shape_append_line_to(shape, 100, 0);
evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
evas_vg_shape_stroke_width_set(shape, 5);
- efl_canvas_vg_node_origin_set(shape, 50, 50);
+ evas_vg_node_origin_set(shape, 50, 50);
evas_vg_shape_stroke_cap_set(shape, EFL_GFX_CAP_ROUND);
d.shape_list = eina_list_append(d.shape_list, shape);
@@ -325,7 +325,7 @@ _1_basic_shape_test()
evas_vg_shape_dup(new_shape, shape);
evas_vg_shape_stroke_color_set(new_shape, 0, 100, 0, 100);
evas_vg_shape_append_line_to(new_shape, 100, 50);
- efl_canvas_vg_node_origin_set(new_shape, 200, 50);
+ evas_vg_node_origin_set(new_shape, 200, 50);
evas_vg_shape_stroke_cap_set(new_shape, EFL_GFX_CAP_SQUARE);
d.shape_list = eina_list_append(d.shape_list, new_shape);
@@ -333,7 +333,7 @@ _1_basic_shape_test()
evas_vg_shape_dup(new_shape, shape);
evas_vg_shape_stroke_color_set(new_shape, 0, 0, 255, 255);
evas_vg_shape_append_line_to(new_shape, 50, 50);
- efl_canvas_vg_node_origin_set(new_shape, 350, 50);
+ evas_vg_node_origin_set(new_shape, 350, 50);
evas_vg_shape_stroke_cap_set(new_shape, EFL_GFX_CAP_ROUND);
evas_vg_shape_stroke_join_set(new_shape, EFL_GFX_JOIN_ROUND);
d.shape_list = eina_list_append(d.shape_list, new_shape);
@@ -343,21 +343,21 @@ _1_basic_shape_test()
evas_vg_shape_append_rect(shape, 0, 0, 100 , 100, 10, 10);
evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
evas_vg_shape_stroke_width_set(shape, 5);
- efl_canvas_vg_node_origin_set(shape, 50, 150);
+ evas_vg_node_origin_set(shape, 50, 150);
d.shape_list = eina_list_append(d.shape_list, shape);
new_shape = evas_vg_shape_add(container);
evas_vg_shape_dup(new_shape, shape);
evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0);
evas_vg_node_color_set(new_shape, 0, 0, 100, 100);
- efl_canvas_vg_node_origin_set(new_shape, 200, 150);
+ evas_vg_node_origin_set(new_shape, 200, 150);
d.shape_list = eina_list_append(d.shape_list, new_shape);
new_shape = evas_vg_shape_add(container);
evas_vg_shape_dup(new_shape, shape);
evas_vg_shape_stroke_color_set(new_shape, 100, 0, 0, 100);
evas_vg_node_color_set(new_shape, 0, 100, 100, 100);
- efl_canvas_vg_node_origin_set(new_shape, 350, 150);
+ evas_vg_node_origin_set(new_shape, 350, 150);
d.shape_list = eina_list_append(d.shape_list, new_shape);
// Circle
@@ -365,21 +365,21 @@ _1_basic_shape_test()
evas_vg_shape_append_circle(shape, 50, 50, 50);
evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
evas_vg_shape_stroke_width_set(shape, 5);
- efl_canvas_vg_node_origin_set(shape, 50, 300);
+ evas_vg_node_origin_set(shape, 50, 300);
d.shape_list = eina_list_append(d.shape_list, shape);
new_shape = evas_vg_shape_add(container);
evas_vg_shape_dup(new_shape, shape);
evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0);
evas_vg_node_color_set(new_shape, 0, 0, 255, 255);
- efl_canvas_vg_node_origin_set(new_shape, 200, 300);
+ evas_vg_node_origin_set(new_shape, 200, 300);
d.shape_list = eina_list_append(d.shape_list, new_shape);
new_shape = evas_vg_shape_add(container);
evas_vg_shape_dup(new_shape, shape);
evas_vg_shape_stroke_color_set(new_shape, 150, 0, 0, 150);
evas_vg_node_color_set(new_shape, 0, 0, 200, 200);
- efl_canvas_vg_node_origin_set(new_shape, 350, 300);
+ evas_vg_node_origin_set(new_shape, 350, 300);
d.shape_list = eina_list_append(d.shape_list, new_shape);
// Arc
@@ -389,14 +389,14 @@ _1_basic_shape_test()
evas_vg_shape_stroke_cap_set(shape, EFL_GFX_CAP_ROUND);
evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
evas_vg_shape_stroke_width_set(shape, 5);
- efl_canvas_vg_node_origin_set(shape, 50, 450);
+ evas_vg_node_origin_set(shape, 50, 450);
d.shape_list = eina_list_append(d.shape_list, shape);
new_shape = evas_vg_shape_add(container);
evas_vg_shape_append_arc(new_shape, 0, 0, 100, 100, 90, 200);
evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0);
evas_vg_node_color_set(new_shape, 0, 0, 200, 200);
- efl_canvas_vg_node_origin_set(new_shape, 200, 450);
+ evas_vg_node_origin_set(new_shape, 200, 450);
d.shape_list = eina_list_append(d.shape_list, new_shape);
new_shape = evas_vg_shape_add(container);
@@ -404,7 +404,7 @@ _1_basic_shape_test()
evas_vg_shape_append_line_to(new_shape, 50, 50);
evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0);
evas_vg_node_color_set(new_shape, 0, 0, 200, 200);
- efl_canvas_vg_node_origin_set(new_shape, 350, 450);
+ evas_vg_node_origin_set(new_shape, 350, 450);
d.shape_list = eina_list_append(d.shape_list, new_shape);
evas_object_vg_root_node_set(d.vg, container);
@@ -480,18 +480,18 @@ _2_interpolation_test()
evas_vg_shape_append_svg_path(shape, morph1[0]);
evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
evas_vg_shape_stroke_width_set(shape, 5);
- efl_canvas_vg_node_origin_set(shape, 100, 100);
+ evas_vg_node_origin_set(shape, 100, 100);
d.shape_list = eina_list_append(d.shape_list, shape);
shape = evas_vg_shape_add(d.vg);
evas_vg_shape_append_svg_path(shape, morph1[1]);
evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 255);
evas_vg_shape_stroke_width_set(shape, 10);
- efl_canvas_vg_node_origin_set(shape, 150, 150);
+ evas_vg_node_origin_set(shape, 150, 150);
d.shape_list = eina_list_append(d.shape_list, shape);
shape = evas_vg_shape_add(d.vg);
- efl_canvas_vg_node_origin_set(shape, 150, 150);
+ evas_vg_node_origin_set(shape, 150, 150);
d.shape_list = eina_list_append(d.shape_list, shape);
evas_object_vg_root_node_set(d.vg, shape);
@@ -522,7 +522,7 @@ _main_menu()
shape = evas_vg_shape_add(d.vg);
evas_vg_shape_append_svg_path(shape, batman);
evas_vg_node_color_set(shape, 10, 0, 0, 10);
- efl_canvas_vg_node_origin_set(shape, 0, 100);
+ evas_vg_node_origin_set(shape, 0, 100);
evas_object_vg_root_node_set(d.vg, shape);
diff --git a/src/examples/evas/meson.build b/src/examples/evas/meson.build
index c07587dec6..e5e43ba1ac 100644
--- a/src/examples/evas/meson.build
+++ b/src/examples/evas/meson.build
@@ -46,8 +46,8 @@ examples = [
'evas-textblock-obstacles',
'evas-text',
'evas-transparent',
- 'evas-vg-batman',
- 'evas-vg-simple',
+# 'evas-vg-batman',
+# 'evas-vg-simple',
]
foreach example : examples