kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas vg: sync with upstream master

This commit is contained in:
Hermet Park 2019-03-11 17:01:44 +09:00
parent 05075a566b
commit a0bb2dd866
7 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/examples/edje/meson.build
View File

@ -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

6
src/examples/evas/evas-vg-batman.c
View File

@ -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]);

38
src/examples/evas/evas-vg-simple.c
View File

@ -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);

4
src/examples/evas/meson.build
View File

@ -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

2
src/lib/elementary/efl_ui_animation_view.eo
View File

@ -13,7 +13,6 @@ enum Efl.Ui.Animation_View.State
class @beta Efl.Ui.Animation_View extends Efl.Ui.Widget implements Efl.Gfx.View, Efl.File
{
[[Elementary Animation View class]]
legacy_prefix: elm_animation_view;
event_prefix: efl_ui_animation_view;
methods {
@property auto_play {
@ -166,7 +165,6 @@ class @beta Efl.Ui.Animation_View extends Efl.Ui.Widget implements Efl.Gfx.View,
[[Get current animation view state.
see @.State
@since 1.22]]
legacy: null;
}
values {
state: Efl.Ui.Animation_View.State; [[Current animation view state]]

10
src/lib/evas/canvas/efl_canvas_vg_object.c
View File

@ -244,6 +244,12 @@ _efl_canvas_vg_object_viewbox_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg
if (align_y) *align_y = pd->align_y;
}
EOLIAN static Eina_Bool
_efl_canvas_vg_object_efl_file_loaded_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd)
{
return !!pd->vg_entry;
}
EOLIAN static Eina_Error
_efl_canvas_vg_object_efl_file_load(Eo *eo_obj, Efl_Canvas_Vg_Object_Data *pd)
{
@ -411,9 +417,9 @@ _render_to_buffer(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data *pd
evas_common_draw_context_set_color(context, 255, 255, 255, 255);
//ector begin - end for drawing mask images.
ENFN->ector_begin(engine, buffer, context, ector, 0, 0, EINA_FALSE, EINA_FALSE);
//ENFN->ector_begin(engine, buffer, context, ector, 0, 0, EINA_FALSE, EINA_FALSE);
_evas_vg_render_pre(obj, root, engine, buffer, context, ector, NULL, NULL, 0);
ENFN->ector_end(engine, buffer, context, ector, EINA_FALSE);
//ENFN->ector_end(engine, buffer, context, ector, EINA_FALSE);
//Actual content drawing
ENFN->ector_begin(engine, buffer, context, ector, 0, 0, EINA_TRUE, do_async);

4
src/lib/evas/canvas/efl_canvas_vg_object.eo
View File

@ -22,12 +22,9 @@ enum @beta Efl.Canvas.Vg.Fill_Mode
}
class @beta Efl.Canvas.Vg.Object extends Efl.Canvas.Object implements Efl.File, Efl.File_Save,
//TIZEN_ONLY(20180831): evas json: new feature for lottie - #4
Efl.Gfx.Frame_Controller
//
{
[[Efl vector graphics class]]
legacy_prefix: evas_object_vg;
methods {
@property fill_mode {
[[Control how the viewbox is mapped to the vg canvas's viewport.]]
@ -87,6 +84,7 @@ class @beta Efl.Canvas.Vg.Object extends Efl.Canvas.Object implements Efl.File,
Efl.Object.destructor;
Efl.File.load;
Efl.File.unload;
Efl.File.loaded { get; }
Efl.File_Save.save;
Efl.Gfx.Frame_Controller.animated { get; }
Efl.Gfx.Frame_Controller.frame { get; set; }