diff options
author | Tom Hacohen <tom@stosb.com> | 2016-05-11 12:57:06 +0100 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2016-05-11 12:57:55 +0100 |
commit | 28a2d34ae20885d229accd1c2e482e284be79afc (patch) | |
tree | 9a2a2b59eec6734ffd605d0ba495f867d56c05fc /src/lib/ector/gl | |
parent | 1c0ec6788f8f14cb1fea2dd0b85868462243e395 (diff) |
Ector generic: Remove .Generic and .Base (hack no longer needed).
Diffstat (limited to 'src/lib/ector/gl')
-rw-r--r-- | src/lib/ector/gl/ector_gl_buffer_base.eo | 2 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_gl_surface.c | 10 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_gl_surface.eo | 6 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_renderer_gl.c | 8 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_renderer_gl.eo | 6 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_renderer_gl_gradient_linear.c | 22 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo | 10 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_renderer_gl_gradient_radial.c | 22 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo | 10 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_renderer_gl_shape.c | 16 | ||||
-rw-r--r-- | src/lib/ector/gl/ector_renderer_gl_shape.eo | 10 |
11 files changed, 61 insertions, 61 deletions
diff --git a/src/lib/ector/gl/ector_gl_buffer_base.eo b/src/lib/ector/gl/ector_gl_buffer_base.eo index 7016359cee..32882a4404 100644 --- a/src/lib/ector/gl/ector_gl_buffer_base.eo +++ b/src/lib/ector/gl/ector_gl_buffer_base.eo | |||
@@ -1,4 +1,4 @@ | |||
1 | mixin Ector.GL.Buffer.Base (Ector.Generic.Buffer) | 1 | mixin Ector.GL.Buffer.Base (Ector.Buffer) |
2 | { | 2 | { |
3 | legacy_prefix: null; | 3 | legacy_prefix: null; |
4 | methods { | 4 | methods { |
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c index 9e8d73681d..a44f73916b 100644 --- a/src/lib/ector/gl/ector_gl_surface.c +++ b/src/lib/ector/gl/ector_gl_surface.c | |||
@@ -40,15 +40,15 @@ _shader_free(void *s) | |||
40 | } | 40 | } |
41 | 41 | ||
42 | static Ector_Renderer * | 42 | static Ector_Renderer * |
43 | _ector_gl_surface_ector_generic_surface_renderer_factory_new(Eo *obj, | 43 | _ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj, |
44 | Ector_GL_Surface_Data *pd EINA_UNUSED, | 44 | Ector_GL_Surface_Data *pd EINA_UNUSED, |
45 | const Eo_Class *type) | 45 | const Eo_Class *type) |
46 | { | 46 | { |
47 | if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) | 47 | if (type == ECTOR_RENDERER_SHAPE_MIXIN) |
48 | return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); | 48 | return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); |
49 | else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) | 49 | else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) |
50 | return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); | 50 | return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); |
51 | else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) | 51 | else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) |
52 | return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); | 52 | return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); |
53 | 53 | ||
54 | ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); | 54 | ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); |
@@ -56,7 +56,7 @@ _ector_gl_surface_ector_generic_surface_renderer_factory_new(Eo *obj, | |||
56 | } | 56 | } |
57 | 57 | ||
58 | static void | 58 | static void |
59 | _ector_gl_surface_ector_generic_surface_reference_point_set(Eo *obj EINA_UNUSED, | 59 | _ector_gl_surface_ector_surface_reference_point_set(Eo *obj EINA_UNUSED, |
60 | Ector_GL_Surface_Data *pd, | 60 | Ector_GL_Surface_Data *pd, |
61 | int x, int y) | 61 | int x, int y) |
62 | { | 62 | { |
diff --git a/src/lib/ector/gl/ector_gl_surface.eo b/src/lib/ector/gl/ector_gl_surface.eo index e3585cd64a..770f550e31 100644 --- a/src/lib/ector/gl/ector_gl_surface.eo +++ b/src/lib/ector/gl/ector_gl_surface.eo | |||
@@ -1,6 +1,6 @@ | |||
1 | import ector_types; | 1 | import ector_types; |
2 | 2 | ||
3 | class Ector.GL.Surface (Ector.GL.Buffer, Ector.Generic.Surface) | 3 | class Ector.GL.Surface (Ector.GL.Buffer, Ector.Surface) |
4 | { | 4 | { |
5 | eo_prefix: ector_gl_surface; | 5 | eo_prefix: ector_gl_surface; |
6 | legacy_prefix: null; | 6 | legacy_prefix: null; |
@@ -29,8 +29,8 @@ class Ector.GL.Surface (Ector.GL.Buffer, Ector.Generic.Surface) | |||
29 | } | 29 | } |
30 | } | 30 | } |
31 | implements { | 31 | implements { |
32 | Ector.Generic.Surface.renderer_factory_new; | 32 | Ector.Surface.renderer_factory_new; |
33 | Ector.Generic.Surface.reference_point.set; | 33 | Ector.Surface.reference_point.set; |
34 | Eo.Base.destructor; | 34 | Eo.Base.destructor; |
35 | Eo.Base.constructor; | 35 | Eo.Base.constructor; |
36 | } | 36 | } |
diff --git a/src/lib/ector/gl/ector_renderer_gl.c b/src/lib/ector/gl/ector_renderer_gl.c index 0b2f43d181..b3b251ca7a 100644 --- a/src/lib/ector/gl/ector_renderer_gl.c +++ b/src/lib/ector/gl/ector_renderer_gl.c | |||
@@ -12,18 +12,18 @@ | |||
12 | typedef struct _Ector_Renderer_GL_Data Ector_Renderer_GL_Data; | 12 | typedef struct _Ector_Renderer_GL_Data Ector_Renderer_GL_Data; |
13 | struct _Ector_Renderer_GL_Data | 13 | struct _Ector_Renderer_GL_Data |
14 | { | 14 | { |
15 | Ector_Renderer_Generic_Base_Data *base; | 15 | Ector_Renderer_Data *base; |
16 | }; | 16 | }; |
17 | 17 | ||
18 | static Eina_Bool | 18 | static Eina_Bool |
19 | _ector_renderer_gl_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED, | 19 | _ector_renderer_gl_ector_renderer_prepare(Eo *obj EINA_UNUSED, |
20 | Ector_Renderer_GL_Data *pd EINA_UNUSED) | 20 | Ector_Renderer_GL_Data *pd EINA_UNUSED) |
21 | { | 21 | { |
22 | return EINA_TRUE; | 22 | return EINA_TRUE; |
23 | } | 23 | } |
24 | 24 | ||
25 | static Eina_Bool | 25 | static Eina_Bool |
26 | _ector_renderer_gl_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, | 26 | _ector_renderer_gl_ector_renderer_draw(Eo *obj EINA_UNUSED, |
27 | Ector_Renderer_GL_Data *pd, | 27 | Ector_Renderer_GL_Data *pd, |
28 | Efl_Gfx_Render_Op op, | 28 | Efl_Gfx_Render_Op op, |
29 | Eina_Array *clips, | 29 | Eina_Array *clips, |
@@ -42,7 +42,7 @@ _ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd) | |||
42 | obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS)); | 42 | obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS)); |
43 | if (!obj) return NULL; | 43 | if (!obj) return NULL; |
44 | 44 | ||
45 | pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); | 45 | pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); |
46 | return obj; | 46 | return obj; |
47 | } | 47 | } |
48 | 48 | ||
diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo index 34d940b49f..f3ba2329b2 100644 --- a/src/lib/ector/gl/ector_renderer_gl.eo +++ b/src/lib/ector/gl/ector_renderer_gl.eo | |||
@@ -1,6 +1,6 @@ | |||
1 | import ector_types; | 1 | import ector_types; |
2 | 2 | ||
3 | abstract Ector.Renderer.GL (Ector.Renderer.Generic.Base) | 3 | abstract Ector.Renderer.GL (Ector.Renderer) |
4 | { | 4 | { |
5 | legacy_prefix: null; | 5 | legacy_prefix: null; |
6 | methods { | 6 | methods { |
@@ -16,8 +16,8 @@ abstract Ector.Renderer.GL (Ector.Renderer.Generic.Base) | |||
16 | } | 16 | } |
17 | implements { | 17 | implements { |
18 | @virtual .fill; | 18 | @virtual .fill; |
19 | Ector.Renderer.Generic.Base.prepare; | 19 | Ector.Renderer.prepare; |
20 | Ector.Renderer.Generic.Base.draw; | 20 | Ector.Renderer.draw; |
21 | Eo.Base.constructor; | 21 | Eo.Base.constructor; |
22 | Eo.Base.destructor; | 22 | Eo.Base.destructor; |
23 | } | 23 | } |
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c index 17510b9f95..7aa2eeb90f 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c | |||
@@ -12,13 +12,13 @@ | |||
12 | typedef struct _Ector_Renderer_GL_Gradient_Linear_Data Ector_Renderer_GL_Gradient_Linear_Data; | 12 | typedef struct _Ector_Renderer_GL_Gradient_Linear_Data Ector_Renderer_GL_Gradient_Linear_Data; |
13 | struct _Ector_Renderer_GL_Gradient_Linear_Data | 13 | struct _Ector_Renderer_GL_Gradient_Linear_Data |
14 | { | 14 | { |
15 | Ector_Renderer_Generic_Gradient_Linear_Data *linear; | 15 | Ector_Renderer_Gradient_Linear_Data *linear; |
16 | Ector_Renderer_Generic_Gradient_Data *gradient; | 16 | Ector_Renderer_Gradient_Data *gradient; |
17 | Ector_Renderer_Generic_Base_Data *base; | 17 | Ector_Renderer_Data *base; |
18 | }; | 18 | }; |
19 | 19 | ||
20 | static Eina_Bool | 20 | static Eina_Bool |
21 | _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj, | 21 | _ector_renderer_gl_gradient_linear_ector_renderer_prepare(Eo *obj, |
22 | Ector_Renderer_GL_Gradient_Linear_Data *pd) | 22 | Ector_Renderer_GL_Gradient_Linear_Data *pd) |
23 | { | 23 | { |
24 | // FIXME: prepare something | 24 | // FIXME: prepare something |
@@ -29,7 +29,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj, | |||
29 | } | 29 | } |
30 | 30 | ||
31 | static Eina_Bool | 31 | static Eina_Bool |
32 | _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_draw(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) | 32 | _ector_renderer_gl_gradient_linear_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) |
33 | { | 33 | { |
34 | ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col); | 34 | ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col); |
35 | 35 | ||
@@ -40,7 +40,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_draw(Eo *obj, Ect | |||
40 | } | 40 | } |
41 | 41 | ||
42 | static void | 42 | static void |
43 | _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_bounds_get(Eo *obj EINA_UNUSED, | 43 | _ector_renderer_gl_gradient_linear_ector_renderer_bounds_get(Eo *obj EINA_UNUSED, |
44 | Ector_Renderer_GL_Gradient_Linear_Data *pd, | 44 | Ector_Renderer_GL_Gradient_Linear_Data *pd, |
45 | Eina_Rectangle *r) | 45 | Eina_Rectangle *r) |
46 | { | 46 | { |
@@ -73,9 +73,9 @@ _ector_renderer_gl_gradient_linear_eo_base_constructor(Eo *obj, Ector_Renderer_G | |||
73 | 73 | ||
74 | if (!obj) return NULL; | 74 | if (!obj) return NULL; |
75 | 75 | ||
76 | pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); | 76 | pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); |
77 | pd->linear = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN, obj); | 77 | pd->linear = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj); |
78 | pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj); | 78 | pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); |
79 | 79 | ||
80 | return obj; | 80 | return obj; |
81 | } | 81 | } |
@@ -95,7 +95,7 @@ _ector_renderer_gl_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Rend | |||
95 | } | 95 | } |
96 | 96 | ||
97 | static unsigned int | 97 | static unsigned int |
98 | _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd) | 98 | _ector_renderer_gl_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd) |
99 | { | 99 | { |
100 | unsigned int crc; | 100 | unsigned int crc; |
101 | 101 | ||
@@ -104,7 +104,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_crc_get(Eo *obj, | |||
104 | crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); | 104 | crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); |
105 | if (pd->gradient->colors_count) | 105 | if (pd->gradient->colors_count) |
106 | crc = eina_crc((void*) pd->gradient->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gradient->colors_count, crc, EINA_FALSE); | 106 | crc = eina_crc((void*) pd->gradient->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gradient->colors_count, crc, EINA_FALSE); |
107 | crc = eina_crc((void*) pd->linear, sizeof (Ector_Renderer_Generic_Gradient_Linear_Data), crc, EINA_FALSE); | 107 | crc = eina_crc((void*) pd->linear, sizeof (Ector_Renderer_Gradient_Linear_Data), crc, EINA_FALSE); |
108 | 108 | ||
109 | return crc; | 109 | return crc; |
110 | } | 110 | } |
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo index eda0d1a795..d7b9f71179 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo | |||
@@ -1,12 +1,12 @@ | |||
1 | class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) | 1 | class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient_Linear) |
2 | { | 2 | { |
3 | eo_prefix: ector_renderer_gl_gradient_linear; | 3 | eo_prefix: ector_renderer_gl_gradient_linear; |
4 | legacy_prefix: null; | 4 | legacy_prefix: null; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.Generic.Base.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.Generic.Base.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.Generic.Base.bounds_get; | 8 | Ector.Renderer.bounds_get; |
9 | Ector.Renderer.Generic.Base.crc.get; | 9 | Ector.Renderer.crc.get; |
10 | Ector.Renderer.GL.fill; | 10 | Ector.Renderer.GL.fill; |
11 | Eo.Base.constructor; | 11 | Eo.Base.constructor; |
12 | Eo.Base.destructor; | 12 | Eo.Base.destructor; |
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c index 3716a84a8d..a16619c8a3 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c | |||
@@ -12,13 +12,13 @@ | |||
12 | typedef struct _Ector_Renderer_GL_Gradient_Radial_Data Ector_Renderer_GL_Gradient_Radial_Data; | 12 | typedef struct _Ector_Renderer_GL_Gradient_Radial_Data Ector_Renderer_GL_Gradient_Radial_Data; |
13 | struct _Ector_Renderer_GL_Gradient_Radial_Data | 13 | struct _Ector_Renderer_GL_Gradient_Radial_Data |
14 | { | 14 | { |
15 | Ector_Renderer_Generic_Gradient_Radial_Data *radial; | 15 | Ector_Renderer_Gradient_Radial_Data *radial; |
16 | Ector_Renderer_Generic_Gradient_Data *gradient; | 16 | Ector_Renderer_Gradient_Data *gradient; |
17 | Ector_Renderer_Generic_Base_Data *base; | 17 | Ector_Renderer_Data *base; |
18 | }; | 18 | }; |
19 | 19 | ||
20 | static Eina_Bool | 20 | static Eina_Bool |
21 | _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) | 21 | _ector_renderer_gl_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) |
22 | { | 22 | { |
23 | // FIXME: prepare something | 23 | // FIXME: prepare something |
24 | (void) obj; | 24 | (void) obj; |
@@ -28,7 +28,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, | |||
28 | } | 28 | } |
29 | 29 | ||
30 | static Eina_Bool | 30 | static Eina_Bool |
31 | _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_draw(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) | 31 | _ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) |
32 | { | 32 | { |
33 | ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col); | 33 | ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col); |
34 | 34 | ||
@@ -54,7 +54,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_gl_fill(Eo *obj, Ector_Rendere | |||
54 | } | 54 | } |
55 | 55 | ||
56 | static void | 56 | static void |
57 | _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_bounds_get(Eo *obj EINA_UNUSED, | 57 | _ector_renderer_gl_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNUSED, |
58 | Ector_Renderer_GL_Gradient_Radial_Data *pd, | 58 | Ector_Renderer_GL_Gradient_Radial_Data *pd, |
59 | Eina_Rectangle *r) | 59 | Eina_Rectangle *r) |
60 | { | 60 | { |
@@ -65,7 +65,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_bounds_get(Eo *ob | |||
65 | } | 65 | } |
66 | 66 | ||
67 | static unsigned int | 67 | static unsigned int |
68 | _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) | 68 | _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) |
69 | { | 69 | { |
70 | unsigned int crc; | 70 | unsigned int crc; |
71 | 71 | ||
@@ -74,7 +74,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_crc_get(Eo *obj, | |||
74 | crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); | 74 | crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); |
75 | if (pd->gradient->colors_count) | 75 | if (pd->gradient->colors_count) |
76 | crc = eina_crc((void*) pd->gradient->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gradient->colors_count, crc, EINA_FALSE); | 76 | crc = eina_crc((void*) pd->gradient->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gradient->colors_count, crc, EINA_FALSE); |
77 | crc = eina_crc((void*) pd->radial, sizeof (Ector_Renderer_Generic_Gradient_Radial_Data), crc, EINA_FALSE); | 77 | crc = eina_crc((void*) pd->radial, sizeof (Ector_Renderer_Gradient_Radial_Data), crc, EINA_FALSE); |
78 | 78 | ||
79 | return crc; | 79 | return crc; |
80 | } | 80 | } |
@@ -86,9 +86,9 @@ _ector_renderer_gl_gradient_radial_eo_base_constructor(Eo *obj, Ector_Renderer_G | |||
86 | 86 | ||
87 | if (!obj) return NULL; | 87 | if (!obj) return NULL; |
88 | 88 | ||
89 | pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); | 89 | pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); |
90 | pd->radial = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN, obj); | 90 | pd->radial = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj); |
91 | pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj); | 91 | pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); |
92 | 92 | ||
93 | return obj; | 93 | return obj; |
94 | } | 94 | } |
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo index d57a973807..be1f0f0ec2 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo | |||
@@ -1,12 +1,12 @@ | |||
1 | class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) | 1 | class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient_Radial) |
2 | { | 2 | { |
3 | eo_prefix: ector_renderer_gl_gradient_radial; | 3 | eo_prefix: ector_renderer_gl_gradient_radial; |
4 | legacy_prefix: null; | 4 | legacy_prefix: null; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.Generic.Base.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.Generic.Base.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.Generic.Base.bounds_get; | 8 | Ector.Renderer.bounds_get; |
9 | Ector.Renderer.Generic.Base.crc.get; | 9 | Ector.Renderer.crc.get; |
10 | Ector.Renderer.GL.fill; | 10 | Ector.Renderer.GL.fill; |
11 | Eo.Base.constructor; | 11 | Eo.Base.constructor; |
12 | Eo.Base.destructor; | 12 | Eo.Base.destructor; |
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c index 4fcac48dd6..b6bd8efc26 100644 --- a/src/lib/ector/gl/ector_renderer_gl_shape.c +++ b/src/lib/ector/gl/ector_renderer_gl_shape.c | |||
@@ -14,8 +14,8 @@ struct _Ector_Renderer_GL_Shape_Data | |||
14 | { | 14 | { |
15 | Efl_Gfx_Shape_Public *public_shape; | 15 | Efl_Gfx_Shape_Public *public_shape; |
16 | 16 | ||
17 | Ector_Renderer_Generic_Shape_Data *shape; | 17 | Ector_Renderer_Shape_Data *shape; |
18 | Ector_Renderer_Generic_Base_Data *base; | 18 | Ector_Renderer_Data *base; |
19 | 19 | ||
20 | GLshort *vertex; | 20 | GLshort *vertex; |
21 | }; | 21 | }; |
@@ -32,7 +32,7 @@ _ector_renderer_gl_shape_path_changed(void *data, const Eo_Event *event EINA_UNU | |||
32 | } | 32 | } |
33 | 33 | ||
34 | static Eina_Bool | 34 | static Eina_Bool |
35 | _ector_renderer_gl_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) | 35 | _ector_renderer_gl_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) |
36 | { | 36 | { |
37 | Eina_Rectangle bounding_box; | 37 | Eina_Rectangle bounding_box; |
38 | Eina_Bool r; | 38 | Eina_Bool r; |
@@ -70,7 +70,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_Rend | |||
70 | } | 70 | } |
71 | 71 | ||
72 | static Eina_Bool | 72 | static Eina_Bool |
73 | _ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) | 73 | _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) |
74 | { | 74 | { |
75 | uint64_t flags = 0; | 75 | uint64_t flags = 0; |
76 | 76 | ||
@@ -107,7 +107,7 @@ _ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED, | |||
107 | } | 107 | } |
108 | 108 | ||
109 | static void | 109 | static void |
110 | _ector_renderer_gl_shape_ector_renderer_generic_base_bounds_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rectangle *r) | 110 | _ector_renderer_gl_shape_ector_renderer_bounds_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rectangle *r) |
111 | { | 111 | { |
112 | efl_gfx_shape_bounds_get(obj, r); | 112 | efl_gfx_shape_bounds_get(obj, r); |
113 | 113 | ||
@@ -116,7 +116,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_bounds_get(Eo *obj, Ector_R | |||
116 | } | 116 | } |
117 | 117 | ||
118 | static unsigned int | 118 | static unsigned int |
119 | _ector_renderer_gl_shape_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) | 119 | _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) |
120 | { | 120 | { |
121 | unsigned int crc; | 121 | unsigned int crc; |
122 | 122 | ||
@@ -148,8 +148,8 @@ _ector_renderer_gl_shape_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Shape_Da | |||
148 | if (!obj) return NULL; | 148 | if (!obj) return NULL; |
149 | 149 | ||
150 | pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); | 150 | pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); |
151 | pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj); | 151 | pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj); |
152 | pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); | 152 | pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); |
153 | 153 | ||
154 | eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd); | 154 | eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd); |
155 | 155 | ||
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo index ba75b51aa9..1c93022c3e 100644 --- a/src/lib/ector/gl/ector_renderer_gl_shape.eo +++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo | |||
@@ -1,12 +1,12 @@ | |||
1 | class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Generic.Shape) | 1 | class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape) |
2 | { | 2 | { |
3 | eo_prefix: ector_renderer_gl_shape; | 3 | eo_prefix: ector_renderer_gl_shape; |
4 | legacy_prefix: null; | 4 | legacy_prefix: null; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.Generic.Base.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.Generic.Base.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.Generic.Base.bounds_get; | 8 | Ector.Renderer.bounds_get; |
9 | Ector.Renderer.Generic.Base.crc.get; | 9 | Ector.Renderer.crc.get; |
10 | Ector.Renderer.GL.fill; | 10 | Ector.Renderer.GL.fill; |
11 | Eo.Base.constructor; | 11 | Eo.Base.constructor; |
12 | Eo.Base.destructor; | 12 | Eo.Base.destructor; |