summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-11-23 21:26:00 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-11-23 21:44:34 +0900
commitf3eb8d6441af396e61842cb83b9ac7b3af34f527 (patch)
treeefafa36859ad0c943ab8829afde5081397fed507 /src/lib/ecore
parent6cc7c1b83043ee0fed40a6bd130b56a8516ecf60 (diff)
efl_interpolator: rename subclasses of Efl.Interpolator
Subclasses of Efl.Interpolator are renamed intuitively from backward order to forward order.
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/CMakeLists.txt16
-rw-r--r--src/lib/ecore/Ecore_Eo.h16
-rw-r--r--src/lib/ecore/efl_accelerate_interpolator.c55
-rw-r--r--src/lib/ecore/efl_accelerate_interpolator.eo (renamed from src/lib/ecore/efl_interpolator_accelerate.eo)4
-rw-r--r--src/lib/ecore/efl_bounce_interpolator.c (renamed from src/lib/ecore/efl_interpolator_bounce.c)24
-rw-r--r--src/lib/ecore/efl_bounce_interpolator.eo (renamed from src/lib/ecore/efl_interpolator_bounce.eo)4
-rw-r--r--src/lib/ecore/efl_cubic_bezier_interpolator.c (renamed from src/lib/ecore/efl_interpolator_cubic_bezier.c)24
-rw-r--r--src/lib/ecore/efl_cubic_bezier_interpolator.eo (renamed from src/lib/ecore/efl_interpolator_cubic_bezier.eo)4
-rw-r--r--src/lib/ecore/efl_decelerate_interpolator.c55
-rw-r--r--src/lib/ecore/efl_decelerate_interpolator.eo (renamed from src/lib/ecore/efl_interpolator_decelerate.eo)4
-rw-r--r--src/lib/ecore/efl_divisor_interpolator.c (renamed from src/lib/ecore/efl_interpolator_divisor.c)24
-rw-r--r--src/lib/ecore/efl_divisor_interpolator.eo (renamed from src/lib/ecore/efl_interpolator_divisor.eo)4
-rw-r--r--src/lib/ecore/efl_interpolator_accelerate.c55
-rw-r--r--src/lib/ecore/efl_interpolator_decelerate.c55
-rw-r--r--src/lib/ecore/efl_interpolator_linear.c27
-rw-r--r--src/lib/ecore/efl_interpolator_linear.eo8
-rw-r--r--src/lib/ecore/efl_interpolator_sinusoidal.c55
-rw-r--r--src/lib/ecore/efl_linear_interpolator.c27
-rw-r--r--src/lib/ecore/efl_linear_interpolator.eo8
-rw-r--r--src/lib/ecore/efl_sinusoidal_interpolator.c55
-rw-r--r--src/lib/ecore/efl_sinusoidal_interpolator.eo (renamed from src/lib/ecore/efl_interpolator_sinusoidal.eo)4
-rw-r--r--src/lib/ecore/efl_spring_interpolator.c (renamed from src/lib/ecore/efl_interpolator_spring.c)24
-rw-r--r--src/lib/ecore/efl_spring_interpolator.eo (renamed from src/lib/ecore/efl_interpolator_spring.eo)4
-rw-r--r--src/lib/ecore/meson.build32
24 files changed, 294 insertions, 294 deletions
diff --git a/src/lib/ecore/CMakeLists.txt b/src/lib/ecore/CMakeLists.txt
index e4735420a0..2cf4efbdcf 100644
--- a/src/lib/ecore/CMakeLists.txt
+++ b/src/lib/ecore/CMakeLists.txt
@@ -38,14 +38,14 @@ set(PUBLIC_EO_FILES
38 efl_loop_timer.eo 38 efl_loop_timer.eo
39 efl_loop_user.eo 39 efl_loop_user.eo
40 efl_promise.eo 40 efl_promise.eo
41 efl_interpolator_linear.eo 41 efl_linear_interpolator.eo
42 efl_interpolator_accelerate.eo 42 efl_accelerate_interpolator.eo
43 efl_interpolator_decelerate.eo 43 efl_decelerate_interpolator.eo
44 efl_interpolator_sinusoidal.eo 44 efl_sinusoidal_interpolator.eo
45 efl_interpolator_divisor.eo 45 efl_divisor_interpolator.eo
46 efl_interpolator_bounce.eo 46 efl_bounce_interpolator.eo
47 efl_interpolator_spring.eo 47 efl_spring_interpolator.eo
48 efl_interpolator_cubic_bezier.eo 48 efl_cubic_bezier_interpolator.eo
49) 49)
50 50
51set(PUBLIC_HEADERS 51set(PUBLIC_HEADERS
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index cb01dec865..cbdf6ce26b 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -78,14 +78,14 @@ EAPI Eina_Promise *efl_loop_promise_new(const Eo *obj, Eina_Promise_Cancel_Cb ca
78#include "efl_loop_fd.eo.h" 78#include "efl_loop_fd.eo.h"
79#include "efl_loop_handler.eo.h" 79#include "efl_loop_handler.eo.h"
80 80
81#include "efl_interpolator_linear.eo.h" 81#include "efl_linear_interpolator.eo.h"
82#include "efl_interpolator_accelerate.eo.h" 82#include "efl_accelerate_interpolator.eo.h"
83#include "efl_interpolator_decelerate.eo.h" 83#include "efl_decelerate_interpolator.eo.h"
84#include "efl_interpolator_sinusoidal.eo.h" 84#include "efl_sinusoidal_interpolator.eo.h"
85#include "efl_interpolator_divisor.eo.h" 85#include "efl_divisor_interpolator.eo.h"
86#include "efl_interpolator_bounce.eo.h" 86#include "efl_bounce_interpolator.eo.h"
87#include "efl_interpolator_spring.eo.h" 87#include "efl_spring_interpolator.eo.h"
88#include "efl_interpolator_cubic_bezier.eo.h" 88#include "efl_cubic_bezier_interpolator.eo.h"
89 89
90/* We ue the factory pattern here, so you shouldn't call eo_add directly. */ 90/* We ue the factory pattern here, so you shouldn't call eo_add directly. */
91EAPI Eo *efl_main_loop_get(void); 91EAPI Eo *efl_main_loop_get(void);
diff --git a/src/lib/ecore/efl_accelerate_interpolator.c b/src/lib/ecore/efl_accelerate_interpolator.c
new file mode 100644
index 0000000000..917c032d05
--- /dev/null
+++ b/src/lib/ecore/efl_accelerate_interpolator.c
@@ -0,0 +1,55 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Ecore.h"
6#include "ecore_private.h"
7
8#define MY_CLASS EFL_ACCELERATE_INTERPOLATOR_CLASS
9
10typedef struct _Efl_Accelerate_Interpolator_Data Efl_Accelerate_Interpolator_Data;
11
12struct _Efl_Accelerate_Interpolator_Data
13{
14 double factor;
15};
16
17EOLIAN static double
18_efl_accelerate_interpolator_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Accelerate_Interpolator_Data *pd EINA_UNUSED,
20 double progress)
21{
22 if ((progress < 0.0) || (progress > 1.0))
23 return progress;
24
25 return ecore_animator_pos_map(progress, ECORE_POS_MAP_ACCELERATE_FACTOR,
26 pd->factor, 0);
27}
28
29EOLIAN static void
30_efl_accelerate_interpolator_factor_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Accelerate_Interpolator_Data *pd,
32 double factor)
33{
34 pd->factor = factor;
35}
36
37EOLIAN static double
38_efl_accelerate_interpolator_factor_get(const Eo *eo_obj EINA_UNUSED,
39 Efl_Accelerate_Interpolator_Data *pd EINA_UNUSED)
40{
41 return pd->factor;
42}
43
44EOLIAN static Efl_Object *
45_efl_accelerate_interpolator_efl_object_constructor(Eo *eo_obj,
46 Efl_Accelerate_Interpolator_Data *pd)
47{
48 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
49
50 pd->factor = 1.0;
51
52 return eo_obj;
53}
54
55#include "efl_accelerate_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_accelerate.eo b/src/lib/ecore/efl_accelerate_interpolator.eo
index 3f2ef94b35..3c94735427 100644
--- a/src/lib/ecore/efl_interpolator_accelerate.eo
+++ b/src/lib/ecore/efl_accelerate_interpolator.eo
@@ -1,10 +1,10 @@
1class Efl.Interpolator_Accelerate (Efl.Object, Efl.Interpolator) 1class Efl.Accelerate_Interpolator (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl accelerate interpolator class 3 [[Efl accelerate interpolator class
4 4
5 output = 1 - sin(Pi / 2 + input * Pi / 2); 5 output = 1 - sin(Pi / 2 + input * Pi / 2);
6 ]] 6 ]]
7 data: Efl_Interpolator_Accelerate_Data; 7 data: Efl_Accelerate_Interpolator_Data;
8 methods { 8 methods {
9 @property factor { 9 @property factor {
10 [[Factor property]] 10 [[Factor property]]
diff --git a/src/lib/ecore/efl_interpolator_bounce.c b/src/lib/ecore/efl_bounce_interpolator.c
index e6dd96d187..7565019e48 100644
--- a/src/lib/ecore/efl_interpolator_bounce.c
+++ b/src/lib/ecore/efl_bounce_interpolator.c
@@ -5,18 +5,18 @@
5#include "Ecore.h" 5#include "Ecore.h"
6#include "ecore_private.h" 6#include "ecore_private.h"
7 7
8#define MY_CLASS EFL_INTERPOLATOR_BOUNCE_CLASS 8#define MY_CLASS EFL_BOUNCE_INTERPOLATOR_CLASS
9 9
10typedef struct _Efl_Interpolator_Bounce_Data Efl_Interpolator_Bounce_Data; 10typedef struct _Efl_Bounce_Interpolator_Data Efl_Bounce_Interpolator_Data;
11 11
12struct _Efl_Interpolator_Bounce_Data 12struct _Efl_Bounce_Interpolator_Data
13{ 13{
14 double factor[2]; 14 double factor[2];
15}; 15};
16 16
17EOLIAN static double 17EOLIAN static double
18_efl_interpolator_bounce_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED, 18_efl_bounce_interpolator_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Interpolator_Bounce_Data *pd EINA_UNUSED, 19 Efl_Bounce_Interpolator_Data *pd EINA_UNUSED,
20 double progress) 20 double progress)
21{ 21{
22 if ((progress < 0.0) || (progress > 1.0)) 22 if ((progress < 0.0) || (progress > 1.0))
@@ -27,8 +27,8 @@ _efl_interpolator_bounce_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
30_efl_interpolator_bounce_factors_set(Eo *eo_obj EINA_UNUSED, 30_efl_bounce_interpolator_factors_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Interpolator_Bounce_Data *pd, 31 Efl_Bounce_Interpolator_Data *pd,
32 double factor1, double factor2) 32 double factor1, double factor2)
33{ 33{
34 pd->factor[0] = factor1; 34 pd->factor[0] = factor1;
@@ -36,8 +36,8 @@ _efl_interpolator_bounce_factors_set(Eo *eo_obj EINA_UNUSED,
36} 36}
37 37
38EOLIAN static void 38EOLIAN static void
39_efl_interpolator_bounce_factors_get(const Eo *eo_obj EINA_UNUSED, 39_efl_bounce_interpolator_factors_get(const Eo *eo_obj EINA_UNUSED,
40 Efl_Interpolator_Bounce_Data *pd, 40 Efl_Bounce_Interpolator_Data *pd,
41 double *factor1, double *factor2) 41 double *factor1, double *factor2)
42{ 42{
43 if (factor1) 43 if (factor1)
@@ -48,8 +48,8 @@ _efl_interpolator_bounce_factors_get(const Eo *eo_obj EINA_UNUSED,
48} 48}
49 49
50EOLIAN static Efl_Object * 50EOLIAN static Efl_Object *
51_efl_interpolator_bounce_efl_object_constructor(Eo *eo_obj, 51_efl_bounce_interpolator_efl_object_constructor(Eo *eo_obj,
52 Efl_Interpolator_Bounce_Data *pd) 52 Efl_Bounce_Interpolator_Data *pd)
53{ 53{
54 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 54 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
55 55
@@ -59,4 +59,4 @@ _efl_interpolator_bounce_efl_object_constructor(Eo *eo_obj,
59 return eo_obj; 59 return eo_obj;
60} 60}
61 61
62#include "efl_interpolator_bounce.eo.c" 62#include "efl_bounce_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_bounce.eo b/src/lib/ecore/efl_bounce_interpolator.eo
index cd77b8b009..eaa55128aa 100644
--- a/src/lib/ecore/efl_interpolator_bounce.eo
+++ b/src/lib/ecore/efl_bounce_interpolator.eo
@@ -1,7 +1,7 @@
1class Efl.Interpolator_Bounce (Efl.Object, Efl.Interpolator) 1class Efl.Bounce_Interpolator (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl bounce interpolator class]] 3 [[Efl bounce interpolator class]]
4 data: Efl_Interpolator_Bounce_Data; 4 data: Efl_Bounce_Interpolator_Data;
5 methods { 5 methods {
6 @property factors { 6 @property factors {
7 [[Factors property]] 7 [[Factors property]]
diff --git a/src/lib/ecore/efl_interpolator_cubic_bezier.c b/src/lib/ecore/efl_cubic_bezier_interpolator.c
index f78322c16b..8b9b376d8c 100644
--- a/src/lib/ecore/efl_interpolator_cubic_bezier.c
+++ b/src/lib/ecore/efl_cubic_bezier_interpolator.c
@@ -5,18 +5,18 @@
5#include "Ecore.h" 5#include "Ecore.h"
6#include "ecore_private.h" 6#include "ecore_private.h"
7 7
8#define MY_CLASS EFL_INTERPOLATOR_CUBIC_BEZIER_CLASS 8#define MY_CLASS EFL_CUBIC_BEZIER_INTERPOLATOR_CLASS
9 9
10typedef struct _Efl_Interpolator_Cubic_Bezier_Data Efl_Interpolator_Cubic_Bezier_Data; 10typedef struct _Efl_Cubic_Bezier_Interpolator_Data Efl_Cubic_Bezier_Interpolator_Data;
11 11
12struct _Efl_Interpolator_Cubic_Bezier_Data 12struct _Efl_Cubic_Bezier_Interpolator_Data
13{ 13{
14 double factor[4]; 14 double factor[4];
15}; 15};
16 16
17EOLIAN static double 17EOLIAN static double
18_efl_interpolator_cubic_bezier_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED, 18_efl_cubic_bezier_interpolator_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Interpolator_Cubic_Bezier_Data *pd EINA_UNUSED, 19 Efl_Cubic_Bezier_Interpolator_Data *pd EINA_UNUSED,
20 double progress) 20 double progress)
21{ 21{
22 if ((progress < 0.0) || (progress > 1.0)) 22 if ((progress < 0.0) || (progress > 1.0))
@@ -27,8 +27,8 @@ _efl_interpolator_cubic_bezier_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUS
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
30_efl_interpolator_cubic_bezier_factors_set(Eo *eo_obj EINA_UNUSED, 30_efl_cubic_bezier_interpolator_factors_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Interpolator_Cubic_Bezier_Data *pd, 31 Efl_Cubic_Bezier_Interpolator_Data *pd,
32 double factor1, double factor2, 32 double factor1, double factor2,
33 double factor3, double factor4) 33 double factor3, double factor4)
34{ 34{
@@ -39,8 +39,8 @@ _efl_interpolator_cubic_bezier_factors_set(Eo *eo_obj EINA_UNUSED,
39} 39}
40 40
41EOLIAN static void 41EOLIAN static void
42_efl_interpolator_cubic_bezier_factors_get(const Eo *eo_obj EINA_UNUSED, 42_efl_cubic_bezier_interpolator_factors_get(const Eo *eo_obj EINA_UNUSED,
43 Efl_Interpolator_Cubic_Bezier_Data *pd, 43 Efl_Cubic_Bezier_Interpolator_Data *pd,
44 double *factor1, double *factor2, 44 double *factor1, double *factor2,
45 double *factor3, double *factor4) 45 double *factor3, double *factor4)
46{ 46{
@@ -58,8 +58,8 @@ _efl_interpolator_cubic_bezier_factors_get(const Eo *eo_obj EINA_UNUSED,
58} 58}
59 59
60EOLIAN static Efl_Object * 60EOLIAN static Efl_Object *
61_efl_interpolator_cubic_bezier_efl_object_constructor(Eo *eo_obj, 61_efl_cubic_bezier_interpolator_efl_object_constructor(Eo *eo_obj,
62 Efl_Interpolator_Cubic_Bezier_Data *pd) 62 Efl_Cubic_Bezier_Interpolator_Data *pd)
63{ 63{
64 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 64 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
65 65
@@ -71,4 +71,4 @@ _efl_interpolator_cubic_bezier_efl_object_constructor(Eo *eo_obj,
71 return eo_obj; 71 return eo_obj;
72} 72}
73 73
74#include "efl_interpolator_cubic_bezier.eo.c" 74#include "efl_cubic_bezier_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_cubic_bezier.eo b/src/lib/ecore/efl_cubic_bezier_interpolator.eo
index 4e3906dc50..9d910f4960 100644
--- a/src/lib/ecore/efl_interpolator_cubic_bezier.eo
+++ b/src/lib/ecore/efl_cubic_bezier_interpolator.eo
@@ -1,7 +1,7 @@
1class Efl.Interpolator_Cubic_Bezier (Efl.Object, Efl.Interpolator) 1class Efl.Cubic_Bezier_Interpolator (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl cubic_bezier interpolator class]] 3 [[Efl cubic_bezier interpolator class]]
4 data: Efl_Interpolator_Cubic_Bezier_Data; 4 data: Efl_Cubic_Bezier_Interpolator_Data;
5 methods { 5 methods {
6 @property factors { 6 @property factors {
7 [[Factors property]] 7 [[Factors property]]
diff --git a/src/lib/ecore/efl_decelerate_interpolator.c b/src/lib/ecore/efl_decelerate_interpolator.c
new file mode 100644
index 0000000000..575ac22b03
--- /dev/null
+++ b/src/lib/ecore/efl_decelerate_interpolator.c
@@ -0,0 +1,55 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Ecore.h"
6#include "ecore_private.h"
7
8#define MY_CLASS EFL_DECELERATE_INTERPOLATOR_CLASS
9
10typedef struct _Efl_Decelerate_Interpolator_Data Efl_Decelerate_Interpolator_Data;
11
12struct _Efl_Decelerate_Interpolator_Data
13{
14 double factor;
15};
16
17EOLIAN static double
18_efl_decelerate_interpolator_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Decelerate_Interpolator_Data *pd EINA_UNUSED,
20 double progress)
21{
22 if ((progress < 0.0) || (progress > 1.0))
23 return progress;
24
25 return ecore_animator_pos_map(progress, ECORE_POS_MAP_DECELERATE_FACTOR,
26 pd->factor, 0);
27}
28
29EOLIAN static void
30_efl_decelerate_interpolator_factor_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Decelerate_Interpolator_Data *pd,
32 double factor)
33{
34 pd->factor = factor;
35}
36
37EOLIAN static double
38_efl_decelerate_interpolator_factor_get(const Eo *eo_obj EINA_UNUSED,
39 Efl_Decelerate_Interpolator_Data *pd EINA_UNUSED)
40{
41 return pd->factor;
42}
43
44EOLIAN static Efl_Object *
45_efl_decelerate_interpolator_efl_object_constructor(Eo *eo_obj,
46 Efl_Decelerate_Interpolator_Data *pd)
47{
48 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
49
50 pd->factor = 1.0;
51
52 return eo_obj;
53}
54
55#include "efl_decelerate_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_decelerate.eo b/src/lib/ecore/efl_decelerate_interpolator.eo
index 25a4d05f92..1662cffb72 100644
--- a/src/lib/ecore/efl_interpolator_decelerate.eo
+++ b/src/lib/ecore/efl_decelerate_interpolator.eo
@@ -1,10 +1,10 @@
1class Efl.Interpolator_Decelerate (Efl.Object, Efl.Interpolator) 1class Efl.Decelerate_Interpolator (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl decelerate interpolator class 3 [[Efl decelerate interpolator class
4 4
5 output = sin(input * Pi / 2); 5 output = sin(input * Pi / 2);
6 ]] 6 ]]
7 data: Efl_Interpolator_Decelerate_Data; 7 data: Efl_Decelerate_Interpolator_Data;
8 methods { 8 methods {
9 @property factor { 9 @property factor {
10 [[Factor property]] 10 [[Factor property]]
diff --git a/src/lib/ecore/efl_interpolator_divisor.c b/src/lib/ecore/efl_divisor_interpolator.c
index 2fcd00ffbb..3cbc12b5c5 100644
--- a/src/lib/ecore/efl_interpolator_divisor.c
+++ b/src/lib/ecore/efl_divisor_interpolator.c
@@ -5,18 +5,18 @@
5#include "Ecore.h" 5#include "Ecore.h"
6#include "ecore_private.h" 6#include "ecore_private.h"
7 7
8#define MY_CLASS EFL_INTERPOLATOR_DIVISOR_CLASS 8#define MY_CLASS EFL_DIVISOR_INTERPOLATOR_CLASS
9 9
10typedef struct _Efl_Interpolator_Divisor_Data Efl_Interpolator_Divisor_Data; 10typedef struct _Efl_Divisor_Interpolator_Data Efl_Divisor_Interpolator_Data;
11 11
12struct _Efl_Interpolator_Divisor_Data 12struct _Efl_Divisor_Interpolator_Data
13{ 13{
14 double factor[2]; 14 double factor[2];
15}; 15};
16 16
17EOLIAN static double 17EOLIAN static double
18_efl_interpolator_divisor_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED, 18_efl_divisor_interpolator_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Interpolator_Divisor_Data *pd EINA_UNUSED, 19 Efl_Divisor_Interpolator_Data *pd EINA_UNUSED,
20 double progress) 20 double progress)
21{ 21{
22 if ((progress < 0.0) || (progress > 1.0)) 22 if ((progress < 0.0) || (progress > 1.0))
@@ -27,8 +27,8 @@ _efl_interpolator_divisor_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
30_efl_interpolator_divisor_factors_set(Eo *eo_obj EINA_UNUSED, 30_efl_divisor_interpolator_factors_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Interpolator_Divisor_Data *pd, 31 Efl_Divisor_Interpolator_Data *pd,
32 double factor1, double factor2) 32 double factor1, double factor2)
33{ 33{
34 pd->factor[0] = factor1; 34 pd->factor[0] = factor1;
@@ -36,8 +36,8 @@ _efl_interpolator_divisor_factors_set(Eo *eo_obj EINA_UNUSED,
36} 36}
37 37
38EOLIAN static void 38EOLIAN static void
39_efl_interpolator_divisor_factors_get(const Eo *eo_obj EINA_UNUSED, 39_efl_divisor_interpolator_factors_get(const Eo *eo_obj EINA_UNUSED,
40 Efl_Interpolator_Divisor_Data *pd, 40 Efl_Divisor_Interpolator_Data *pd,
41 double *factor1, double *factor2) 41 double *factor1, double *factor2)
42{ 42{
43 if (factor1) 43 if (factor1)
@@ -48,8 +48,8 @@ _efl_interpolator_divisor_factors_get(const Eo *eo_obj EINA_UNUSED,
48} 48}
49 49
50EOLIAN static Efl_Object * 50EOLIAN static Efl_Object *
51_efl_interpolator_divisor_efl_object_constructor(Eo *eo_obj, 51_efl_divisor_interpolator_efl_object_constructor(Eo *eo_obj,
52 Efl_Interpolator_Divisor_Data *pd) 52 Efl_Divisor_Interpolator_Data *pd)
53{ 53{
54 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 54 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
55 55
@@ -59,4 +59,4 @@ _efl_interpolator_divisor_efl_object_constructor(Eo *eo_obj,
59 return eo_obj; 59 return eo_obj;
60} 60}
61 61
62#include "efl_interpolator_divisor.eo.c" 62#include "efl_divisor_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_divisor.eo b/src/lib/ecore/efl_divisor_interpolator.eo
index d9a1cef03e..487f8f2d36 100644
--- a/src/lib/ecore/efl_interpolator_divisor.eo
+++ b/src/lib/ecore/efl_divisor_interpolator.eo
@@ -1,7 +1,7 @@
1class Efl.Interpolator_Divisor (Efl.Object, Efl.Interpolator) 1class Efl.Divisor_Interpolator (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl divisor interpolator class]] 3 [[Efl divisor interpolator class]]
4 data: Efl_Interpolator_Divisor_Data; 4 data: Efl_Divisor_Interpolator_Data;
5 methods { 5 methods {
6 @property factors { 6 @property factors {
7 [[Factors property]] 7 [[Factors property]]
diff --git a/src/lib/ecore/efl_interpolator_accelerate.c b/src/lib/ecore/efl_interpolator_accelerate.c
deleted file mode 100644
index 386e5993ca..0000000000
--- a/src/lib/ecore/efl_interpolator_accelerate.c
+++ /dev/null
@@ -1,55 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Ecore.h"
6#include "ecore_private.h"
7
8#define MY_CLASS EFL_INTERPOLATOR_ACCELERATE_CLASS
9
10typedef struct _Efl_Interpolator_Accelerate_Data Efl_Interpolator_Accelerate_Data;
11
12struct _Efl_Interpolator_Accelerate_Data
13{
14 double factor;
15};
16
17EOLIAN static double
18_efl_interpolator_accelerate_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Interpolator_Accelerate_Data *pd EINA_UNUSED,
20 double progress)
21{
22 if ((progress < 0.0) || (progress > 1.0))
23 return progress;
24
25 return ecore_animator_pos_map(progress, ECORE_POS_MAP_ACCELERATE_FACTOR,
26 pd->factor, 0);
27}
28
29EOLIAN static void
30_efl_interpolator_accelerate_factor_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Interpolator_Accelerate_Data *pd,
32 double factor)
33{
34 pd->factor = factor;
35}
36
37EOLIAN static double
38_efl_interpolator_accelerate_factor_get(const Eo *eo_obj EINA_UNUSED,
39 Efl_Interpolator_Accelerate_Data *pd EINA_UNUSED)
40{
41 return pd->factor;
42}
43
44EOLIAN static Efl_Object *
45_efl_interpolator_accelerate_efl_object_constructor(Eo *eo_obj,
46 Efl_Interpolator_Accelerate_Data *pd)
47{
48 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
49
50 pd->factor = 1.0;
51
52 return eo_obj;
53}
54
55#include "efl_interpolator_accelerate.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_decelerate.c b/src/lib/ecore/efl_interpolator_decelerate.c
deleted file mode 100644
index adb6e035eb..0000000000
--- a/src/lib/ecore/efl_interpolator_decelerate.c
+++ /dev/null
@@ -1,55 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Ecore.h"
6#include "ecore_private.h"
7
8#define MY_CLASS EFL_INTERPOLATOR_DECELERATE_CLASS
9
10typedef struct _Efl_Interpolator_Decelerate_Data Efl_Interpolator_Decelerate_Data;
11
12struct _Efl_Interpolator_Decelerate_Data
13{
14 double factor;
15};
16
17EOLIAN static double
18_efl_interpolator_decelerate_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Interpolator_Decelerate_Data *pd EINA_UNUSED,
20 double progress)
21{
22 if ((progress < 0.0) || (progress > 1.0))
23 return progress;
24
25 return ecore_animator_pos_map(progress, ECORE_POS_MAP_DECELERATE_FACTOR,
26 pd->factor, 0);
27}
28
29EOLIAN static void
30_efl_interpolator_decelerate_factor_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Interpolator_Decelerate_Data *pd,
32 double factor)
33{
34 pd->factor = factor;
35}
36
37EOLIAN static double
38_efl_interpolator_decelerate_factor_get(const Eo *eo_obj EINA_UNUSED,
39 Efl_Interpolator_Decelerate_Data *pd EINA_UNUSED)
40{
41 return pd->factor;
42}
43
44EOLIAN static Efl_Object *
45_efl_interpolator_decelerate_efl_object_constructor(Eo *eo_obj,
46 Efl_Interpolator_Decelerate_Data *pd)
47{
48 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
49
50 pd->factor = 1.0;
51
52 return eo_obj;
53}
54
55#include "efl_interpolator_decelerate.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_linear.c b/src/lib/ecore/efl_interpolator_linear.c
deleted file mode 100644
index 3180e965ce..0000000000
--- a/src/lib/ecore/efl_interpolator_linear.c
+++ /dev/null
@@ -1,27 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Ecore.h"
6#include "ecore_private.h"
7
8#define MY_CLASS EFL_INTERPOLATOR_LINEAR_CLASS
9
10typedef struct _Efl_Interpolator_Linear_Data Efl_Interpolator_Linear_Data;
11
12struct _Efl_Interpolator_Linear_Data
13{
14};
15
16EOLIAN static double
17_efl_interpolator_linear_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
18 Efl_Interpolator_Linear_Data *pd EINA_UNUSED,
19 double progress)
20{
21 if ((progress < 0.0) || (progress > 1.0))
22 return progress;
23
24 return ecore_animator_pos_map(progress, ECORE_POS_MAP_LINEAR, 0, 0);
25}
26
27#include "efl_interpolator_linear.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_linear.eo b/src/lib/ecore/efl_interpolator_linear.eo
deleted file mode 100644
index b61c7d1f66..0000000000
--- a/src/lib/ecore/efl_interpolator_linear.eo
+++ /dev/null
@@ -1,8 +0,0 @@
1class Efl.Interpolator_Linear (Efl.Object, Efl.Interpolator)
2{
3 [[Efl linear interpolator class]]
4 data: Efl_Interpolator_Linear_Data;
5 implements {
6 Efl.Interpolator.interpolate;
7 }
8}
diff --git a/src/lib/ecore/efl_interpolator_sinusoidal.c b/src/lib/ecore/efl_interpolator_sinusoidal.c
deleted file mode 100644
index 53625b7e74..0000000000
--- a/src/lib/ecore/efl_interpolator_sinusoidal.c
+++ /dev/null
@@ -1,55 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Ecore.h"
6#include "ecore_private.h"
7
8#define MY_CLASS EFL_INTERPOLATOR_SINUSOIDAL_CLASS
9
10typedef struct _Efl_Interpolator_Sinusoidal_Data Efl_Interpolator_Sinusoidal_Data;
11
12struct _Efl_Interpolator_Sinusoidal_Data
13{
14 double factor;
15};
16
17EOLIAN static double
18_efl_interpolator_sinusoidal_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Interpolator_Sinusoidal_Data *pd EINA_UNUSED,
20 double progress)
21{
22 if ((progress < 0.0) || (progress > 1.0))
23 return progress;
24
25 return ecore_animator_pos_map(progress, ECORE_POS_MAP_SINUSOIDAL_FACTOR,
26 pd->factor, 0);
27}
28
29EOLIAN static void
30_efl_interpolator_sinusoidal_factor_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Interpolator_Sinusoidal_Data *pd,
32 double factor)
33{
34 pd->factor = factor;
35}
36
37EOLIAN static double
38_efl_interpolator_sinusoidal_factor_get(const Eo *eo_obj EINA_UNUSED,
39 Efl_Interpolator_Sinusoidal_Data *pd EINA_UNUSED)
40{
41 return pd->factor;
42}
43
44EOLIAN static Efl_Object *
45_efl_interpolator_sinusoidal_efl_object_constructor(Eo *eo_obj,
46 Efl_Interpolator_Sinusoidal_Data *pd)
47{
48 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
49
50 pd->factor = 1.0;
51
52 return eo_obj;
53}
54
55#include "efl_interpolator_sinusoidal.eo.c"
diff --git a/src/lib/ecore/efl_linear_interpolator.c b/src/lib/ecore/efl_linear_interpolator.c
new file mode 100644
index 0000000000..8dc4c850e8
--- /dev/null
+++ b/src/lib/ecore/efl_linear_interpolator.c
@@ -0,0 +1,27 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Ecore.h"
6#include "ecore_private.h"
7
8#define MY_CLASS EFL_LINEAR_INTERPOLATOR_CLASS
9
10typedef struct _Efl_Linear_Interpolator_Data Efl_Linear_Interpolator_Data;
11
12struct _Efl_Linear_Interpolator_Data
13{
14};
15
16EOLIAN static double
17_efl_linear_interpolator_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
18 Efl_Linear_Interpolator_Data *pd EINA_UNUSED,
19 double progress)
20{
21 if ((progress < 0.0) || (progress > 1.0))
22 return progress;
23
24 return ecore_animator_pos_map(progress, ECORE_POS_MAP_LINEAR, 0, 0);
25}
26
27#include "efl_linear_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_linear_interpolator.eo b/src/lib/ecore/efl_linear_interpolator.eo
new file mode 100644
index 0000000000..8872616100
--- /dev/null
+++ b/src/lib/ecore/efl_linear_interpolator.eo
@@ -0,0 +1,8 @@
1class Efl.Linear_Interpolator (Efl.Object, Efl.Interpolator)
2{
3 [[Efl linear interpolator class]]
4 data: Efl_Linear_Interpolator_Data;
5 implements {
6 Efl.Interpolator.interpolate;
7 }
8}
diff --git a/src/lib/ecore/efl_sinusoidal_interpolator.c b/src/lib/ecore/efl_sinusoidal_interpolator.c
new file mode 100644
index 0000000000..d36a776e7f
--- /dev/null
+++ b/src/lib/ecore/efl_sinusoidal_interpolator.c
@@ -0,0 +1,55 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Ecore.h"
6#include "ecore_private.h"
7
8#define MY_CLASS EFL_SINUSOIDAL_INTERPOLATOR_CLASS
9
10typedef struct _Efl_Sinusoidal_Interpolator_Data Efl_Sinusoidal_Interpolator_Data;
11
12struct _Efl_Sinusoidal_Interpolator_Data
13{
14 double factor;
15};
16
17EOLIAN static double
18_efl_sinusoidal_interpolator_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
19 Efl_Sinusoidal_Interpolator_Data *pd EINA_UNUSED,
20 double progress)
21{
22 if ((progress < 0.0) || (progress > 1.0))
23 return progress;
24
25 return ecore_animator_pos_map(progress, ECORE_POS_MAP_SINUSOIDAL_FACTOR,
26 pd->factor, 0);
27}
28
29EOLIAN static void
30_efl_sinusoidal_interpolator_factor_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Sinusoidal_Interpolator_Data *pd,
32 double factor)
33{
34 pd->factor = factor;
35}
36
37EOLIAN static double
38_efl_sinusoidal_interpolator_factor_get(const Eo *eo_obj EINA_UNUSED,
39 Efl_Sinusoidal_Interpolator_Data *pd EINA_UNUSED)
40{
41 return pd->factor;
42}
43
44EOLIAN static Efl_Object *
45_efl_sinusoidal_interpolator_efl_object_constructor(Eo *eo_obj,
46 Efl_Sinusoidal_Interpolator_Data *pd)
47{
48 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
49
50 pd->factor = 1.0;
51
52 return eo_obj;
53}
54
55#include "efl_sinusoidal_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_sinusoidal.eo b/src/lib/ecore/efl_sinusoidal_interpolator.eo
index 39718525c7..d602b96d40 100644
--- a/src/lib/ecore/efl_interpolator_sinusoidal.eo
+++ b/src/lib/ecore/efl_sinusoidal_interpolator.eo
@@ -1,10 +1,10 @@
1class Efl.Interpolator_Sinusoidal (Efl.Object, Efl.Interpolator) 1class Efl.Sinusoidal_Interpolator (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl sinusoidal interpolator class 3 [[Efl sinusoidal interpolator class
4 4
5 output = (1 - cos(input * Pi)) / 2; 5 output = (1 - cos(input * Pi)) / 2;
6 ]] 6 ]]
7 data: Efl_Interpolator_Sinusoidal_Data; 7 data: Efl_Sinusoidal_Interpolator_Data;
8 methods { 8 methods {
9 @property factor { 9 @property factor {
10 [[Factor property]] 10 [[Factor property]]
diff --git a/src/lib/ecore/efl_interpolator_spring.c b/src/lib/ecore/efl_spring_interpolator.c
index ca2de9a319..183e54c93e 100644
--- a/src/lib/ecore/efl_interpolator_spring.c
+++ b/src/lib/ecore/efl_spring_interpolator.c
@@ -5,18 +5,18 @@
5#include "Ecore.h" 5#include "Ecore.h"
6#include "ecore_private.h" 6#include "ecore_private.h"
7 7
8#define MY_CLASS EFL_INTERPOLATOR_SPRING_CLASS 8#define MY_CLASS EFL_SPRING_INTERPOLATOR_CLASS
9 9
10typedef struct _Efl_Interpolator_Spring_Data Efl_Interpolator_Spring_Data; 10typedef struct _Efl_Spring_Interpolator_Data Efl_Spring_Interpolator_Data;
11 11
12struct _Efl_Interpolator_Spring_Data 12struct _Efl_Spring_Interpolator_Data
13{ 13{
14 double factor[2]; 14 double factor[2];
15}; 15};
16 16
17EOLIAN static double 17EOLIAN static double
18_efl_interpolator_spring_efl_interpolator_interpolate(Eo *obj EINA_UNUSED, 18_efl_spring_interpolator_efl_interpolator_interpolate(Eo *obj EINA_UNUSED,
19 Efl_Interpolator_Spring_Data *pd EINA_UNUSED, 19 Efl_Spring_Interpolator_Data *pd EINA_UNUSED,
20 double progress) 20 double progress)
21{ 21{
22 if ((progress < 0.0) || (progress > 1.0)) 22 if ((progress < 0.0) || (progress > 1.0))
@@ -27,8 +27,8 @@ _efl_interpolator_spring_efl_interpolator_interpolate(Eo *obj EINA_UNUSED,
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
30_efl_interpolator_spring_factors_set(Eo *eo_obj EINA_UNUSED, 30_efl_spring_interpolator_factors_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Interpolator_Spring_Data *pd, 31 Efl_Spring_Interpolator_Data *pd,
32 double factor1, double factor2) 32 double factor1, double factor2)
33{ 33{
34 pd->factor[0] = factor1; 34 pd->factor[0] = factor1;
@@ -36,8 +36,8 @@ _efl_interpolator_spring_factors_set(Eo *eo_obj EINA_UNUSED,
36} 36}
37 37
38EOLIAN static void 38EOLIAN static void
39_efl_interpolator_spring_factors_get(const Eo *eo_obj EINA_UNUSED, 39_efl_spring_interpolator_factors_get(const Eo *eo_obj EINA_UNUSED,
40 Efl_Interpolator_Spring_Data *pd, 40 Efl_Spring_Interpolator_Data *pd,
41 double *factor1, double *factor2) 41 double *factor1, double *factor2)
42{ 42{
43 if (factor1) 43 if (factor1)
@@ -48,8 +48,8 @@ _efl_interpolator_spring_factors_get(const Eo *eo_obj EINA_UNUSED,
48} 48}
49 49
50EOLIAN static Efl_Object * 50EOLIAN static Efl_Object *
51_efl_interpolator_spring_efl_object_constructor(Eo *eo_obj, 51_efl_spring_interpolator_efl_object_constructor(Eo *eo_obj,
52 Efl_Interpolator_Spring_Data *pd) 52 Efl_Spring_Interpolator_Data *pd)
53{ 53{
54 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 54 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
55 55
@@ -59,4 +59,4 @@ _efl_interpolator_spring_efl_object_constructor(Eo *eo_obj,
59 return eo_obj; 59 return eo_obj;
60} 60}
61 61
62#include "efl_interpolator_spring.eo.c" 62#include "efl_spring_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_spring.eo b/src/lib/ecore/efl_spring_interpolator.eo
index ef3eee0ca9..21698161dd 100644
--- a/src/lib/ecore/efl_interpolator_spring.eo
+++ b/src/lib/ecore/efl_spring_interpolator.eo
@@ -1,7 +1,7 @@
1class Efl.Interpolator_Spring (Efl.Object, Efl.Interpolator) 1class Efl.Spring_Interpolator (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl spring interpolator class]] 3 [[Efl spring interpolator class]]
4 data: Efl_Interpolator_Spring_Data; 4 data: Efl_Spring_Interpolator_Data;
5 methods { 5 methods {
6 @property factors { 6 @property factors {
7 [[Factors property]] 7 [[Factors property]]
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index 993437f01c..60525ee659 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -57,14 +57,14 @@ pub_eo_files = [
57 'efl_io_file.eo', 57 'efl_io_file.eo',
58 'efl_io_copier.eo', 58 'efl_io_copier.eo',
59 'efl_io_buffered_stream.eo', 59 'efl_io_buffered_stream.eo',
60 'efl_interpolator_linear.eo', 60 'efl_linear_interpolator.eo',
61 'efl_interpolator_accelerate.eo', 61 'efl_accelerate_interpolator.eo',
62 'efl_interpolator_decelerate.eo', 62 'efl_decelerate_interpolator.eo',
63 'efl_interpolator_sinusoidal.eo', 63 'efl_sinusoidal_interpolator.eo',
64 'efl_interpolator_divisor.eo', 64 'efl_divisor_interpolator.eo',
65 'efl_interpolator_bounce.eo', 65 'efl_bounce_interpolator.eo',
66 'efl_interpolator_spring.eo', 66 'efl_spring_interpolator.eo',
67 'efl_interpolator_cubic_bezier.eo', 67 'efl_cubic_bezier_interpolator.eo',
68 'efl_loop_message_future_handler.eo', 68 'efl_loop_message_future_handler.eo',
69 'efl_loop_message_future.eo', 69 'efl_loop_message_future.eo',
70 'efl_model_item.eo', 70 'efl_model_item.eo',
@@ -153,14 +153,14 @@ ecore_src = [
153 'efl_model_composite_selection.c', 153 'efl_model_composite_selection.c',
154 'efl_model_accessor_view.c', 154 'efl_model_accessor_view.c',
155 'efl_model_accessor_view_private.h', 155 'efl_model_accessor_view_private.h',
156 'efl_interpolator_linear.c', 156 'efl_linear_interpolator.c',
157 'efl_interpolator_accelerate.c', 157 'efl_accelerate_interpolator.c',
158 'efl_interpolator_decelerate.c', 158 'efl_decelerate_interpolator.c',
159 'efl_interpolator_sinusoidal.c', 159 'efl_sinusoidal_interpolator.c',
160 'efl_interpolator_divisor.c', 160 'efl_divisor_interpolator.c',
161 'efl_interpolator_bounce.c', 161 'efl_bounce_interpolator.c',
162 'efl_interpolator_spring.c', 162 'efl_spring_interpolator.c',
163 'efl_interpolator_cubic_bezier.c', 163 'efl_cubic_bezier_interpolator.c',
164 'ecore_main_timechanges.c', 164 'ecore_main_timechanges.c',
165 'ecore_pipe.c', 165 'ecore_pipe.c',
166 'ecore_poller.c', 166 'ecore_poller.c',