discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=536bfb761309a5a8f354e049bd11bef7b98feee7
commit 536bfb761309a5a8f354e049bd11bef7b98feee7
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Mon Feb 12 17:14:34 2018 -0500
evas_vg: implement interpolate from Efl.Gfx.Path
---
src/lib/edje/edje_calc.c | 2 +-
src/lib/evas/canvas/efl_vg.eo | 11 +----------
src/lib/evas/canvas/efl_vg_container.eo | 2 +-
src/lib/evas/canvas/efl_vg_gradient.eo | 2 +-
src/lib/evas/canvas/efl_vg_gradient_linear.eo | 2 +-
src/lib/evas/canvas/efl_vg_gradient_radial.eo | 2 +-
src/lib/evas/canvas/efl_vg_shape.eo | 2 +-
src/lib/evas/canvas/evas_vg_container.c | 6 +++---
src/lib/evas/canvas/evas_vg_gradient.c | 4 ++--
src/lib/evas/canvas/evas_vg_gradient_linear.c | 4 ++--
src/lib/evas/canvas/evas_vg_gradient_radial.c | 4 ++--
src/lib/evas/canvas/evas_vg_node.c | 4 ++--
src/lib/evas/canvas/evas_vg_shape.c | 10 +++++-----
13 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 2e186213bd..93ab2f7222 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3154,7 +3154,7 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep,
Edje_Calc_Params *p3 EINA_U
root = efl_duplicate(src_root);
- if (!evas_vg_node_interpolate(root, src_root, dest_root, pos))
+ if (!efl_gfx_path_interpolate(root, src_root, dest_root, pos))
{
ERR("Can't interpolate check the svg file");
}
diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo
index 651e83ef36..576d40109b 100644
--- a/src/lib/evas/canvas/efl_vg.eo
+++ b/src/lib/evas/canvas/efl_vg.eo
@@ -60,16 +60,6 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Color,
Efl.Gfx.Stack, Efl.Duplicat
Evas_VG_Quality q;
}
} */
- interpolate {
- [[Interpolate a given vector graphics object]]
-
- return: bool; [[$true on success, $false otherwise]]
- params {
- @in from: const(Efl.VG); [[Source object]]
- @in to: const(Efl.VG); [[Destination object]]
- @in pos_map: double; [[Interpolate mapping]]
- }
- }
}
implements {
Efl.Object.name { set; }
@@ -87,6 +77,7 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Color,
Efl.Gfx.Stack, Efl.Duplicat
Efl.Gfx.Stack.stack_above;
Efl.Gfx.Stack.raise;
Efl.Gfx.Stack.lower;
+ Efl.Gfx.Path.interpolate;
Efl.Duplicate.duplicate;
}
}
diff --git a/src/lib/evas/canvas/efl_vg_container.eo
b/src/lib/evas/canvas/efl_vg_container.eo
index 59347c00bf..d970ff5b33 100644
--- a/src/lib/evas/canvas/efl_vg_container.eo
+++ b/src/lib/evas/canvas/efl_vg_container.eo
@@ -19,7 +19,7 @@ class Efl.VG.Container (Efl.VG)
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Gfx.Path.bounds_get;
- Efl.VG.interpolate;
+ Efl.Gfx.Path.interpolate;
Efl.Duplicate.duplicate;
}
}
diff --git a/src/lib/evas/canvas/efl_vg_gradient.eo
b/src/lib/evas/canvas/efl_vg_gradient.eo
index 53ec94182f..294ac5deaa 100644
--- a/src/lib/evas/canvas/efl_vg_gradient.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient.eo
@@ -5,7 +5,7 @@ abstract Efl.VG.Gradient (Efl.VG, Efl.Gfx.Gradient)
implements {
Efl.Gfx.Gradient.stop { get; set; }
Efl.Gfx.Gradient.spread { get; set; }
- Efl.VG.interpolate;
+ Efl.Gfx.Path.interpolate;
Efl.Duplicate.duplicate;
}
}
diff --git a/src/lib/evas/canvas/efl_vg_gradient_linear.eo
b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
index 938e9286f7..edd41dc023 100644
--- a/src/lib/evas/canvas/efl_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
@@ -5,7 +5,7 @@ class Efl.VG.Gradient.Linear (Efl.VG.Gradient,
Efl.Gfx.Gradient.Linear)
implements {
Efl.Gfx.Gradient.Linear.start { get; set; }
Efl.Gfx.Gradient.Linear.end { get; set; }
- Efl.VG.interpolate;
+ Efl.Gfx.Path.interpolate;
Efl.Duplicate.duplicate;
Efl.Gfx.Path.bounds_get;
Efl.Object.constructor;
diff --git a/src/lib/evas/canvas/efl_vg_gradient_radial.eo
b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
index cf35a6ace6..94defabf9b 100644
--- a/src/lib/evas/canvas/efl_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
@@ -7,7 +7,7 @@ class Efl.VG.Gradient.Radial (Efl.VG.Gradient,
Efl.Gfx.Gradient.Radial)
Efl.Gfx.Gradient.Radial.radius { get; set; }
Efl.Gfx.Gradient.Radial.focal { get; set; }
Efl.Gfx.Path.bounds_get;
- Efl.VG.interpolate;
+ Efl.Gfx.Path.interpolate;
Efl.Duplicate.duplicate;
Efl.Object.constructor;
Efl.Object.destructor;
diff --git a/src/lib/evas/canvas/efl_vg_shape.eo
b/src/lib/evas/canvas/efl_vg_shape.eo
index be68f0fd89..e8a064ab42 100644
--- a/src/lib/evas/canvas/efl_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -35,7 +35,7 @@ class Efl.VG.Shape (Efl.VG, Efl.Gfx.Shape)
}
}
implements {
- Efl.VG.interpolate;
+ Efl.Gfx.Path.interpolate;
Efl.Duplicate.duplicate;
Efl.Object.constructor;
Efl.Object.destructor;
diff --git a/src/lib/evas/canvas/evas_vg_container.c
b/src/lib/evas/canvas/evas_vg_container.c
index 05e67e369c..d5012893b9 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -110,7 +110,7 @@ _efl_vg_container_children_get(Eo *obj EINA_UNUSED,
Efl_VG_Container_Data *pd)
}
static Eina_Bool
-_efl_vg_container_efl_vg_interpolate(Eo *obj,
+_efl_vg_container_efl_gfx_path_interpolate(Eo *obj,
Efl_VG_Container_Data *pd,
const Efl_VG *from, const Efl_VG *to,
double pos_map)
@@ -125,7 +125,7 @@ _efl_vg_container_efl_vg_interpolate(Eo *obj,
efl_isa(to, EFL_VG_CONTAINER_CLASS)))
return EINA_FALSE;
- r = efl_vg_interpolate(efl_super(obj, EFL_VG_CONTAINER_CLASS), from, to,
pos_map);
+ r = efl_gfx_path_interpolate(efl_super(obj, EFL_VG_CONTAINER_CLASS), from,
to, pos_map);
if (!r) return EINA_FALSE;
@@ -141,7 +141,7 @@ _efl_vg_container_efl_vg_interpolate(Eo *obj,
r = EINA_FALSE;
break;
}
- r &= efl_vg_interpolate(child, from_child, to_child, pos_map);
+ r &= efl_gfx_path_interpolate(child, from_child, to_child, pos_map);
if (!r)
break;
}
diff --git a/src/lib/evas/canvas/evas_vg_gradient.c
b/src/lib/evas/canvas/evas_vg_gradient.c
index af4014c99f..81c949ae95 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -54,7 +54,7 @@ _efl_vg_gradient_efl_gfx_gradient_spread_get(Eo *obj
EINA_UNUSED,
}
static Eina_Bool
-_efl_vg_gradient_efl_vg_interpolate(Eo *obj,
+_efl_vg_gradient_efl_gfx_path_interpolate(Eo *obj,
Efl_VG_Gradient_Data *pd,
const Efl_VG *from, const Efl_VG *to,
double pos_map)
@@ -65,7 +65,7 @@ _efl_vg_gradient_efl_vg_interpolate(Eo *obj,
double from_map;
Eina_Bool r;
- r = efl_vg_interpolate(efl_super(obj, EFL_VG_GRADIENT_CLASS), from, to,
pos_map);
+ r = efl_gfx_path_interpolate(efl_super(obj, EFL_VG_GRADIENT_CLASS), from,
to, pos_map);
fromd = efl_data_scope_get(from, EFL_VG_GRADIENT_CLASS);
tod = efl_data_scope_get(to, EFL_VG_GRADIENT_CLASS);
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c
b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index e0cac2203d..9d9046bd9d 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -123,7 +123,7 @@ _efl_vg_gradient_linear_efl_gfx_path_bounds_get(Eo *obj,
Efl_VG_Gradient_Linear_
}
static Eina_Bool
-_efl_vg_gradient_linear_efl_vg_interpolate(Eo *obj,
+_efl_vg_gradient_linear_efl_gfx_path_interpolate(Eo *obj,
Efl_VG_Gradient_Linear_Data
*pd,
const Efl_VG *from, const
Efl_VG *to,
double pos_map)
@@ -132,7 +132,7 @@ _efl_vg_gradient_linear_efl_vg_interpolate(Eo *obj,
double from_map;
Eina_Bool r;
- r = efl_vg_interpolate(efl_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS), from,
to, pos_map);
+ r = efl_gfx_path_interpolate(efl_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS),
from, to, pos_map);
if (!r) return EINA_FALSE;
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c
b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index dac3c8b266..f3b0c6321f 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -141,7 +141,7 @@ _efl_vg_gradient_radial_efl_gfx_path_bounds_get(Eo *obj,
Efl_VG_Gradient_Radial_
}
static Eina_Bool
-_efl_vg_gradient_radial_efl_vg_interpolate(Eo *obj,
+_efl_vg_gradient_radial_efl_gfx_path_interpolate(Eo *obj,
Efl_VG_Gradient_Radial_Data
*pd,
const Efl_VG *from, const
Efl_VG *to,
double pos_map)
@@ -150,7 +150,7 @@ _efl_vg_gradient_radial_efl_vg_interpolate(Eo *obj,
double from_map;
Eina_Bool r;
- r = efl_vg_interpolate(efl_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS), from,
to, pos_map);
+ r = efl_gfx_path_interpolate(efl_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS),
from, to, pos_map);
if (!r) return EINA_FALSE;
diff --git a/src/lib/evas/canvas/evas_vg_node.c
b/src/lib/evas/canvas/evas_vg_node.c
index c343b3e122..2a6c3b8c79 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -633,7 +633,7 @@ _efl_vg_interpolate_point(Eina_Point_3D *d,
}
static Eina_Bool
-_efl_vg_interpolate(Eo *obj,
+_efl_vg_efl_gfx_path_interpolate(Eo *obj,
Efl_VG_Data *pd, const Efl_VG *from, const Efl_VG *to,
double pos_map)
{
@@ -702,7 +702,7 @@ _efl_vg_interpolate(Eo *obj,
if (fromd->mask && tod->mask && pd->mask)
{
- r &= efl_vg_interpolate(pd->mask, fromd->mask, tod->mask, pos_map);
+ r &= efl_gfx_path_interpolate(pd->mask, fromd->mask, tod->mask,
pos_map);
}
_efl_vg_changed(obj);
diff --git a/src/lib/evas/canvas/evas_vg_shape.c
b/src/lib/evas/canvas/evas_vg_shape.c
index 840a7017fb..d6ec51cf97 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -143,7 +143,7 @@ _efl_vg_shape_efl_object_destructor(Eo *obj,
Efl_VG_Shape_Data *pd EINA_UNUSED)
}
static Eina_Bool
-_efl_vg_shape_efl_vg_interpolate(Eo *obj,
+_efl_vg_shape_efl_gfx_path_interpolate(Eo *obj,
Efl_VG_Shape_Data *pd,
const Efl_VG *from, const Efl_VG *to,
double pos_map)
@@ -154,21 +154,21 @@ _efl_vg_shape_efl_vg_interpolate(Eo *obj,
fromd = efl_data_scope_get(from, EFL_VG_SHAPE_CLASS);
tod = efl_data_scope_get(to, EFL_VG_SHAPE_CLASS);
- r = efl_vg_interpolate(efl_super(obj, MY_CLASS), from, to, pos_map);
+ r = efl_gfx_path_interpolate(efl_super(obj, MY_CLASS), from, to, pos_map);
r &= efl_gfx_path_interpolate(obj, from, to, pos_map);
if (fromd->fill && tod->fill && pd->fill)
{
- r &= efl_vg_interpolate(pd->fill, fromd->fill, tod->fill, pos_map);
+ r &= efl_gfx_path_interpolate(pd->fill, fromd->fill, tod->fill,
pos_map);
}
if (fromd->stroke.fill && tod->stroke.fill && pd->stroke.fill)
{
- r &= efl_vg_interpolate(pd->stroke.fill, fromd->stroke.fill,
tod->stroke.fill, pos_map);
+ r &= efl_gfx_path_interpolate(pd->stroke.fill, fromd->stroke.fill,
tod->stroke.fill, pos_map);
}
if (fromd->stroke.marker && tod->stroke.marker && pd->stroke.marker)
{
- r &= efl_vg_interpolate(pd->stroke.marker, fromd->stroke.marker,
tod->stroke.marker, pos_map);
+ r &= efl_gfx_path_interpolate(pd->stroke.marker, fromd->stroke.marker,
tod->stroke.marker, pos_map);
}
return r;
--
