diff options
author | Xavi Artigas <xavierartigas@yahoo.es> | 2018-04-04 13:38:34 +0200 |
---|---|---|
committer | Cedric Bail <cedric@osg.samsung.com> | 2018-04-24 09:03:30 -0700 |
commit | a217d4b45576b4065f1ce0384efa9061a556f10a (patch) | |
tree | f6e65f19c6b13cb418854f358067ac2d38822880 /src/lib/evas/canvas/evas_vg_private.h | |
parent | a26fbbbc66f15c359fe8b27dcb034b812d735193 (diff) |
Efl.Canvas.Vg.Object (from Efl.Canvas.Vg)
Also, Efl.Canvas.Vg.* (from Efl.Canvas.VG.*)
Ref https://phab.enlightenment.org/T6847
Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/evas/canvas/evas_vg_private.h')
-rw-r--r-- | src/lib/evas/canvas/evas_vg_private.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h index ecf025b5d8..4ff8b2bb45 100644 --- a/src/lib/evas/canvas/evas_vg_private.h +++ b/src/lib/evas/canvas/evas_vg_private.h | |||
@@ -3,13 +3,13 @@ | |||
3 | 3 | ||
4 | #include <Ector.h> | 4 | #include <Ector.h> |
5 | 5 | ||
6 | typedef struct _Efl_Canvas_VG_Node_Data Efl_Canvas_VG_Node_Data; | 6 | typedef struct _Efl_Canvas_Vg_Node_Data Efl_Canvas_Vg_Node_Data; |
7 | typedef struct _Efl_Canvas_VG_Container_Data Efl_Canvas_VG_Container_Data; | 7 | typedef struct _Efl_Canvas_Vg_Container_Data Efl_Canvas_Vg_Container_Data; |
8 | typedef struct _Efl_Canvas_VG_Gradient_Data Efl_Canvas_VG_Gradient_Data; | 8 | typedef struct _Efl_Canvas_Vg_Gradient_Data Efl_Canvas_Vg_Gradient_Data; |
9 | typedef struct _Efl_Canvas_VG_Interpolation Efl_Canvas_VG_Interpolation; | 9 | typedef struct _Efl_Canvas_Vg_Interpolation Efl_Canvas_Vg_Interpolation; |
10 | 10 | ||
11 | 11 | ||
12 | typedef struct _Efl_Canvas_Vg_Data Efl_Canvas_Vg_Data; | 12 | typedef struct _Efl_Canvas_Vg_Object_Data Efl_Canvas_Vg_Object_Data; |
13 | 13 | ||
14 | typedef struct _Evas_Cache_Vg_Entry Evas_Cache_Vg_Entry; | 14 | typedef struct _Evas_Cache_Vg_Entry Evas_Cache_Vg_Entry; |
15 | typedef struct _Evas_Cache_Vg Evas_Cache_Vg; | 15 | typedef struct _Evas_Cache_Vg Evas_Cache_Vg; |
@@ -39,7 +39,7 @@ typedef struct _User_Vg_Entry | |||
39 | Efl_VG *root; | 39 | Efl_VG *root; |
40 | }User_Vg_Entry; // holds the vg tree info set by the user | 40 | }User_Vg_Entry; // holds the vg tree info set by the user |
41 | 41 | ||
42 | struct _Efl_Canvas_Vg_Data | 42 | struct _Efl_Canvas_Vg_Object_Data |
43 | { | 43 | { |
44 | void *engine_data; | 44 | void *engine_data; |
45 | Efl_VG *root; | 45 | Efl_VG *root; |
@@ -54,15 +54,15 @@ struct _Efl_Canvas_Vg_Data | |||
54 | Eina_Bool changed; | 54 | Eina_Bool changed; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | struct _Efl_Canvas_VG_Node_Data | 57 | struct _Efl_Canvas_Vg_Node_Data |
58 | { | 58 | { |
59 | Eina_Matrix3 *m; | 59 | Eina_Matrix3 *m; |
60 | Efl_Canvas_VG_Interpolation *intp; | 60 | Efl_Canvas_Vg_Interpolation *intp; |
61 | 61 | ||
62 | Efl_Canvas_VG_Node *mask; | 62 | Efl_Canvas_Vg_Node *mask; |
63 | Ector_Renderer *renderer; | 63 | Ector_Renderer *renderer; |
64 | 64 | ||
65 | void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_Canvas_VG_Node_Data *nd); | 65 | void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_Canvas_Vg_Node_Data *nd); |
66 | void *data; | 66 | void *data; |
67 | 67 | ||
68 | double x, y; | 68 | double x, y; |
@@ -73,14 +73,14 @@ struct _Efl_Canvas_VG_Node_Data | |||
73 | Eina_Bool changed : 1; | 73 | Eina_Bool changed : 1; |
74 | }; | 74 | }; |
75 | 75 | ||
76 | struct _Efl_Canvas_VG_Container_Data | 76 | struct _Efl_Canvas_Vg_Container_Data |
77 | { | 77 | { |
78 | Eina_List *children; | 78 | Eina_List *children; |
79 | 79 | ||
80 | Eina_Hash *names; | 80 | Eina_Hash *names; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | struct _Efl_Canvas_VG_Gradient_Data | 83 | struct _Efl_Canvas_Vg_Gradient_Data |
84 | { | 84 | { |
85 | // FIXME: Later on we should deduplicate it somehow (Using Ector ?). | 85 | // FIXME: Later on we should deduplicate it somehow (Using Ector ?). |
86 | Efl_Gfx_Gradient_Stop *colors; | 86 | Efl_Gfx_Gradient_Stop *colors; |
@@ -89,7 +89,7 @@ struct _Efl_Canvas_VG_Gradient_Data | |||
89 | Efl_Gfx_Gradient_Spread s; | 89 | Efl_Gfx_Gradient_Spread s; |
90 | }; | 90 | }; |
91 | 91 | ||
92 | struct _Efl_Canvas_VG_Interpolation | 92 | struct _Efl_Canvas_Vg_Interpolation |
93 | { | 93 | { |
94 | Eina_Quaternion rotation; | 94 | Eina_Quaternion rotation; |
95 | Eina_Quaternion perspective; | 95 | Eina_Quaternion perspective; |
@@ -108,10 +108,10 @@ Vg_File_Data * evas_cache_vg_file_info(const char *file, const char | |||
108 | 108 | ||
109 | Eina_Bool evas_vg_save_to_file(Vg_File_Data *evg_data, const char *file, const char *key, const char *flags); | 109 | Eina_Bool evas_vg_save_to_file(Vg_File_Data *evg_data, const char *file, const char *key, const char *flags); |
110 | 110 | ||
111 | static inline Efl_Canvas_VG_Node_Data * | 111 | static inline Efl_Canvas_Vg_Node_Data * |
112 | _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) | 112 | _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) |
113 | { | 113 | { |
114 | Efl_Canvas_VG_Node_Data *child_nd = NULL; | 114 | Efl_Canvas_Vg_Node_Data *child_nd = NULL; |
115 | 115 | ||
116 | // FIXME: Prevent infinite loop | 116 | // FIXME: Prevent infinite loop |
117 | if (child) | 117 | if (child) |