summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-25 19:12:08 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-29 10:49:16 +0900
commit71678f301ad609219a72b5d517837f21b69d85e3 (patch)
tree03e91c7903a01a7359f4fc3a0e7a4ccae52f2b4c /src/lib/ecore
parent356ad74377d11c06fa99dff4be47d330da288044 (diff)
ecore: Remove ecore_types.eot
This moves one enum from EO to legacy only (Ecore_Pos_Map). Ideally the type should be in Ecore_Legacy and no Common, that can be done later. Ref T5522
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/Ecore_Common.h34
-rw-r--r--src/lib/ecore/ecore_poller.eo2
-rw-r--r--src/lib/ecore/ecore_types.eot29
-rw-r--r--src/lib/ecore/efl_loop_timer.eo2
4 files changed, 35 insertions, 32 deletions
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 49e7e1ce1d..74b931c0d1 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -2703,6 +2703,40 @@ typedef enum _Ecore_Animator_Source Ecore_Animator_Source;
2703 */ 2703 */
2704typedef Eina_Bool (*Ecore_Timeline_Cb)(void *data, double pos); 2704typedef Eina_Bool (*Ecore_Timeline_Cb)(void *data, double pos);
2705 2705
2706/** Defines the position mappings for the animation. */
2707typedef enum
2708{
2709 ECORE_POS_MAP_LINEAR = 0, /**< Linear 0.0 -> 1.0 */
2710 ECORE_POS_MAP_ACCELERATE, /**< Start slow then speed up */
2711 ECORE_POS_MAP_DECELERATE, /**< Start fast then slow down */
2712 ECORE_POS_MAP_SINUSOIDAL, /**< Start slow, speed up then slow down at end */
2713 ECORE_POS_MAP_ACCELERATE_FACTOR, /**< Start slow then speed up, v1 being a
2714 * power factor, 0.0 being linear, 1.0 being
2715 * normal accelerate, 2.0 being much more
2716 * pronounced accelerate (squared), 3.0
2717 * being cubed, etc. */
2718 ECORE_POS_MAP_DECELERATE_FACTOR, /**< Start fast then slow down, v1 being a
2719 * power factor, 0.0 being linear, 1.0 being
2720 * normal decelerate, 2.0 being much more
2721 * pronounced decelerate (squared), 3.0
2722 * being cubed, etc. */
2723 ECORE_POS_MAP_SINUSOIDAL_FACTOR, /**< Start slow, speed up then slow down at
2724 * end, v1 being a power factor, 0.0 being
2725 * linear, 1.0 being normal sinusoidal, 2.0
2726 * being much more pronounced sinusoidal
2727 * (squared), 3.0 being cubed, etc. */
2728 ECORE_POS_MAP_DIVISOR_INTERP, /**< Start at gradient * v1, interpolated via
2729 * power of v2 curve */
2730 ECORE_POS_MAP_BOUNCE, /**< Start at 0.0 then "drop" like a ball bouncing to
2731 * the ground at 1.0, and bounce v2 times, with decay
2732 * factor of v1 */
2733 ECORE_POS_MAP_SPRING, /**< Start at 0.0 then "wobble" like a spring rest
2734 * position 1.0, and wobble v2 times, with decay factor
2735 * of v1 */
2736 ECORE_POS_MAP_CUBIC_BEZIER /**< Follow the cubic-bezier curve calculated with
2737 * the control points (x1, y1), (x2, y2) */
2738} Ecore_Pos_Map;
2739
2706/* 2740/*
2707 * @since 1.8 2741 * @since 1.8
2708 */ 2742 */
diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index d1703e987b..c5ef3d76f5 100644
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -1,4 +1,4 @@
1import ecore_types; 1type @extern Ecore_Task_Cb: __undefined_type; [[Ecore task callback type]]
2 2
3enum Ecore.Poller_Type 3enum Ecore.Poller_Type
4{ 4{
diff --git a/src/lib/ecore/ecore_types.eot b/src/lib/ecore/ecore_types.eot
deleted file mode 100644
index 3bd094769b..0000000000
--- a/src/lib/ecore/ecore_types.eot
+++ /dev/null
@@ -1,29 +0,0 @@
1type @extern Ecore_Task_Cb: __undefined_type; [[Ecore task callback type]]
2
3enum Ecore.Pos_Map
4{
5 [[Defines the position mappings for the animation.]]
6 linear, [[Linear 0.0 -> 1.0]]
7 accelerate, [[Start slow then speed up]]
8 decelerate, [[Start fast then slow down]]
9 sinusoidal, [[Start slow, speed up then slow down at end]]
10 accelerate_factor, [[Start slow then speed up, v1 being a power factor,
11 0.0 being linear, 1.0 being normal accelerate,
12 2.0 being much more pronounced accelerate (squared),
13 3.0 being cubed, etc.]]
14 decelerate_factor, [[Start fast then slow down, v1 being a power factor,
15 0.0 being linear, 1.0 being normal decelerate,
16 2.0 being much more pronounced decelerate (squared),
17 3.0 being cubed, etc.]]
18 sinusoidal_factor, [[Start slow, speed up then slow down at end,
19 v1 being a power factor, 0.0 being linear,
20 1.0 being normal sinusoidal, 2.0 being much more
21 pronounced sinusoidal (squared), 3.0 being cubed, etc.]]
22 divisor_interp, [[Start at gradient * v1, interpolated via power of v2 curve]]
23 bounce, [[Start at 0.0 then "drop" like a ball bouncing to the ground at 1.0,
24 and bounce v2 times, with decay factor of v1]]
25 spring, [[Start at 0.0 then "wobble" like a spring rest position 1.0,
26 and wobble v2 times, with decay factor of v1]]
27 cubic_bezier, [[Follow the cubic-bezier curve calculated with the control
28 points (x1, y1), (x2, y2)]]
29}
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index 11fb81f64b..61b0fab405 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -1,5 +1,3 @@
1import ecore_types;
2
3class Efl.Loop.Timer (Efl.Loop_User) 1class Efl.Loop.Timer (Efl.Loop_User)
4{ 2{
5 [[Timers are objects that will call a given callback at some point 3 [[Timers are objects that will call a given callback at some point