forked from enlightenment/efl
ector: fix property/method name conflict for "fill"
Shape implements a property, sw/gl/cairo implements a method rename method to op_fill
This commit is contained in:
parent
adc2be188c
commit
11d5bac1d3
|
@ -2,7 +2,7 @@ abstract Ector.Renderer.Cairo (Ector.Renderer)
|
||||||
{
|
{
|
||||||
[[Ector cairo renderer abstract class]]
|
[[Ector cairo renderer abstract class]]
|
||||||
methods {
|
methods {
|
||||||
fill @pure_virtual {
|
op_fill @pure_virtual {
|
||||||
[[Fill operation]]
|
[[Fill operation]]
|
||||||
return: bool; [[$true on success, $false otherwise]]
|
return: bool; [[$true on success, $false otherwise]]
|
||||||
params {
|
params {
|
||||||
|
|
|
@ -91,7 +91,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_draw(Eo *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj,
|
_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_op_fill(Eo *obj,
|
||||||
Ector_Renderer_Cairo_Gradient_Linear_Data *pd,
|
Ector_Renderer_Cairo_Gradient_Linear_Data *pd,
|
||||||
unsigned int mul_col)
|
unsigned int mul_col)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.bounds_get;
|
Ector.Renderer.bounds_get;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Ector.Renderer.Cairo.fill;
|
Ector.Renderer.Cairo.op_fill;
|
||||||
Efl.Object.finalize;
|
Efl.Object.finalize;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
Efl.Gfx.Gradient.stop { set; }
|
Efl.Gfx.Gradient.stop { set; }
|
||||||
|
|
|
@ -114,7 +114,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Rendere
|
||||||
|
|
||||||
// Clearly duplicated and should be in a common place...
|
// Clearly duplicated and should be in a common place...
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj,
|
_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_op_fill(Eo *obj,
|
||||||
Ector_Renderer_Cairo_Gradient_Radial_Data *pd,
|
Ector_Renderer_Cairo_Gradient_Radial_Data *pd,
|
||||||
unsigned int mul_col)
|
unsigned int mul_col)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.bounds_get;
|
Ector.Renderer.bounds_get;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Ector.Renderer.Cairo.fill;
|
Ector.Renderer.Cairo.op_fill;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
Efl.Object.finalize;
|
Efl.Object.finalize;
|
||||||
Efl.Gfx.Gradient.stop { set; }
|
Efl.Gfx.Gradient.stop { set; }
|
||||||
|
|
|
@ -179,14 +179,14 @@ _ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Sh
|
||||||
cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING);
|
cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING);
|
||||||
|
|
||||||
if (pd->shape->fill)
|
if (pd->shape->fill)
|
||||||
ector_renderer_cairo_fill(pd->shape->fill, mul_col);
|
ector_renderer_cairo_op_fill(pd->shape->fill, mul_col);
|
||||||
|
|
||||||
if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0)
|
if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0)
|
||||||
{
|
{
|
||||||
cairo_fill_preserve(pd->parent->cairo);
|
cairo_fill_preserve(pd->parent->cairo);
|
||||||
|
|
||||||
if (pd->shape->stroke.fill)
|
if (pd->shape->stroke.fill)
|
||||||
ector_renderer_cairo_fill(pd->shape->stroke.fill, mul_col);
|
ector_renderer_cairo_op_fill(pd->shape->stroke.fill, mul_col);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8);
|
r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8);
|
||||||
|
@ -226,7 +226,7 @@ _ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Sh
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_cairo_shape_ector_renderer_cairo_fill(Eo *obj EINA_UNUSED,
|
_ector_renderer_cairo_shape_ector_renderer_cairo_op_fill(Eo *obj EINA_UNUSED,
|
||||||
Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
|
Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
|
||||||
unsigned int mul_col EINA_UNUSED)
|
unsigned int mul_col EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape)
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.bounds_get;
|
Ector.Renderer.bounds_get;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Ector.Renderer.Cairo.fill;
|
Ector.Renderer.Cairo.op_fill;
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
Efl.Object.finalize;
|
Efl.Object.finalize;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
|
|
|
@ -4,7 +4,7 @@ abstract Ector.Renderer.GL (Ector.Renderer)
|
||||||
{
|
{
|
||||||
[[Ector GL renderer abstract class]]
|
[[Ector GL renderer abstract class]]
|
||||||
methods {
|
methods {
|
||||||
fill @pure_virtual {
|
op_fill @pure_virtual {
|
||||||
[[Fill operation]]
|
[[Fill operation]]
|
||||||
return: bool; [[$true on success, $false otherwise]]
|
return: bool; [[$true on success, $false otherwise]]
|
||||||
params {
|
params {
|
||||||
|
|
|
@ -52,7 +52,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_bounds_get(Eo *obj EINA_UNUSED
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
|
_ector_renderer_gl_gradient_linear_ector_renderer_gl_op_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
|
||||||
{
|
{
|
||||||
// FIXME: The idea here is to select the right shader and push the needed parameter for it
|
// FIXME: The idea here is to select the right shader and push the needed parameter for it
|
||||||
// along with the other value
|
// along with the other value
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradi
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.bounds_get;
|
Ector.Renderer.bounds_get;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Ector.Renderer.GL.fill;
|
Ector.Renderer.GL.op_fill;
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
Efl.Gfx.Gradient.stop { set; }
|
Efl.Gfx.Gradient.stop { set; }
|
||||||
|
|
|
@ -39,7 +39,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_G
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_gl_gradient_radial_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
|
_ector_renderer_gl_gradient_radial_ector_renderer_gl_op_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
|
||||||
{
|
{
|
||||||
// FIXME: The idea here is to select the right shader and push the needed parameter for it
|
// FIXME: The idea here is to select the right shader and push the needed parameter for it
|
||||||
// along with the other value
|
// along with the other value
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradi
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.bounds_get;
|
Ector.Renderer.bounds_get;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Ector.Renderer.GL.fill;
|
Ector.Renderer.GL.op_fill;
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
Efl.Gfx.Gradient.stop { set; }
|
Efl.Gfx.Gradient.stop { set; }
|
||||||
|
|
|
@ -85,7 +85,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
|
||||||
|
|
||||||
if (pd->shape->fill)
|
if (pd->shape->fill)
|
||||||
{
|
{
|
||||||
ector_renderer_gl_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
|
ector_renderer_gl_op_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -96,7 +96,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED,
|
_ector_renderer_gl_shape_ector_renderer_gl_op_fill(Eo *obj EINA_UNUSED,
|
||||||
Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED,
|
Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED,
|
||||||
uint64_t flags EINA_UNUSED,
|
uint64_t flags EINA_UNUSED,
|
||||||
GLshort *vertex EINA_UNUSED,
|
GLshort *vertex EINA_UNUSED,
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape)
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.bounds_get;
|
Ector.Renderer.bounds_get;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Ector.Renderer.GL.fill;
|
Ector.Renderer.GL.op_fill;
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ class Ector.Renderer.Software (Ector.Renderer)
|
||||||
[[Ector software renderer class]]
|
[[Ector software renderer class]]
|
||||||
data: null;
|
data: null;
|
||||||
methods {
|
methods {
|
||||||
fill @pure_virtual {
|
op_fill @pure_virtual {
|
||||||
[[Renderer fill operation]]
|
[[Renderer fill operation]]
|
||||||
return: bool; [[$true on success, $false otherwise]]
|
return: bool; [[$true on success, $false otherwise]]
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_draw(Eo *obj EINA_UNUSED
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_software_gradient_linear_ector_renderer_software_fill(Eo *obj EINA_UNUSED,
|
_ector_renderer_software_gradient_linear_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED,
|
||||||
Ector_Renderer_Software_Gradient_Data *pd)
|
Ector_Renderer_Software_Gradient_Data *pd)
|
||||||
{
|
{
|
||||||
ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd);
|
ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd);
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient.Linear (Ector.Renderer.Software, Ector.Re
|
||||||
Ector.Renderer.prepare;
|
Ector.Renderer.prepare;
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Ector.Renderer.Software.fill;
|
Ector.Renderer.Software.op_fill;
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
Efl.Gfx.Gradient.stop { set; }
|
Efl.Gfx.Gradient.stop { set; }
|
||||||
|
|
|
@ -66,7 +66,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_draw(Eo *obj EINA_UNUSED
|
||||||
|
|
||||||
// Clearly duplicated and should be in a common place...
|
// Clearly duplicated and should be in a common place...
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_software_gradient_radial_ector_renderer_software_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd)
|
_ector_renderer_software_gradient_radial_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd)
|
||||||
{
|
{
|
||||||
ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd);
|
ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd);
|
||||||
ector_software_gradient_color_update(pd);
|
ector_software_gradient_color_update(pd);
|
||||||
|
|
|
@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient.Radial (Ector.Renderer.Software, Ector.Re
|
||||||
Ector.Renderer.prepare;
|
Ector.Renderer.prepare;
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Ector.Renderer.Software.fill;
|
Ector.Renderer.Software.op_fill;
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
Efl.Gfx.Gradient.stop { set; }
|
Efl.Gfx.Gradient.stop { set; }
|
||||||
|
|
|
@ -673,7 +673,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
|
||||||
|
|
||||||
if (pd->shape->fill)
|
if (pd->shape->fill)
|
||||||
{
|
{
|
||||||
ector_renderer_software_fill(pd->shape->fill);
|
ector_renderer_software_op_fill(pd->shape->fill);
|
||||||
ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
|
ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
|
||||||
x, y, mul_col, op,
|
x, y, mul_col, op,
|
||||||
pd->shape_data);
|
pd->shape_data);
|
||||||
|
@ -695,7 +695,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
|
||||||
|
|
||||||
if (pd->shape->stroke.fill)
|
if (pd->shape->stroke.fill)
|
||||||
{
|
{
|
||||||
ector_renderer_software_fill(pd->shape->stroke.fill);
|
ector_renderer_software_op_fill(pd->shape->stroke.fill);
|
||||||
ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
|
ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
|
||||||
x, y, mul_col, op,
|
x, y, mul_col, op,
|
||||||
pd->outline_data);
|
pd->outline_data);
|
||||||
|
@ -719,7 +719,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_ector_renderer_software_shape_ector_renderer_software_fill(Eo *obj EINA_UNUSED,
|
_ector_renderer_software_shape_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED,
|
||||||
Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED)
|
Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
// FIXME: let's find out how to fill a shape with a shape later.
|
// FIXME: let's find out how to fill a shape with a shape later.
|
||||||
|
|
|
@ -5,7 +5,7 @@ class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Sha
|
||||||
implements {
|
implements {
|
||||||
Ector.Renderer.prepare;
|
Ector.Renderer.prepare;
|
||||||
Ector.Renderer.draw;
|
Ector.Renderer.draw;
|
||||||
Ector.Renderer.Software.fill;
|
Ector.Renderer.Software.op_fill;
|
||||||
Ector.Renderer.crc { get; }
|
Ector.Renderer.crc { get; }
|
||||||
Efl.Gfx.Path.path { set; }
|
Efl.Gfx.Path.path { set; }
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
|
|
Loading…
Reference in New Issue