summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-11-23 19:30:36 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-11-23 21:43:54 +0900
commit6cc7c1b83043ee0fed40a6bd130b56a8516ecf60 (patch)
tree90d456fe5abc92cb694dfa6649a8bbc1a5b08457 /src
parent424bd60084cc5906a3375a1a38ffba9066f5ff73 (diff)
efl_interpolator: change Efl.Interpolator class to interface
Since Efl.Interpolator's subclasses are used as interpolator class, Efl.Interpolator class is changed to be an interface. This change allows Efl.Canvas.Animation to have Efl.Interpolator as its property in efl_canvas_animation.eo.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/Makefile_Efl.am1
-rw-r--r--src/lib/ecore/CMakeLists.txt1
-rw-r--r--src/lib/ecore/Ecore_Eo.h1
-rw-r--r--src/lib/ecore/efl_interpolator.c24
-rw-r--r--src/lib/ecore/efl_interpolator_accelerate.eo2
-rw-r--r--src/lib/ecore/efl_interpolator_bounce.eo2
-rw-r--r--src/lib/ecore/efl_interpolator_cubic_bezier.eo2
-rw-r--r--src/lib/ecore/efl_interpolator_decelerate.eo2
-rw-r--r--src/lib/ecore/efl_interpolator_divisor.eo2
-rw-r--r--src/lib/ecore/efl_interpolator_linear.eo2
-rw-r--r--src/lib/ecore/efl_interpolator_sinusoidal.eo2
-rw-r--r--src/lib/ecore/efl_interpolator_spring.eo2
-rw-r--r--src/lib/ecore/meson.build2
-rw-r--r--src/lib/efl/CMakeLists.txt1
-rw-r--r--src/lib/efl/Efl.h1
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c1
-rw-r--r--src/lib/efl/interfaces/efl_interpolator.eo (renamed from src/lib/ecore/efl_interpolator.eo)5
-rw-r--r--src/lib/efl/interfaces/meson.build1
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation.eo2
20 files changed, 16 insertions, 42 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index b71652738e..cb33da1688 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -33,7 +33,6 @@ ecore_eolian_files_public = \
33 lib/ecore/efl_io_file.eo \ 33 lib/ecore/efl_io_file.eo \
34 lib/ecore/efl_io_copier.eo \ 34 lib/ecore/efl_io_copier.eo \
35 lib/ecore/efl_io_buffered_stream.eo \ 35 lib/ecore/efl_io_buffered_stream.eo \
36 lib/ecore/efl_interpolator.eo \
37 lib/ecore/efl_interpolator_linear.eo \ 36 lib/ecore/efl_interpolator_linear.eo \
38 lib/ecore/efl_interpolator_accelerate.eo \ 37 lib/ecore/efl_interpolator_accelerate.eo \
39 lib/ecore/efl_interpolator_decelerate.eo \ 38 lib/ecore/efl_interpolator_decelerate.eo \
@@ -127,7 +126,6 @@ lib/ecore/efl_model_composite_boolean.c \
127lib/ecore/efl_model_composite_selection.c \ 126lib/ecore/efl_model_composite_selection.c \
128lib/ecore/efl_model_accessor_view.c \ 127lib/ecore/efl_model_accessor_view.c \
129lib/ecore/efl_model_accessor_view_private.h \ 128lib/ecore/efl_model_accessor_view_private.h \
130lib/ecore/efl_interpolator.c \
131lib/ecore/efl_interpolator_linear.c \ 129lib/ecore/efl_interpolator_linear.c \
132lib/ecore/efl_interpolator_accelerate.c \ 130lib/ecore/efl_interpolator_accelerate.c \
133lib/ecore/efl_interpolator_decelerate.c \ 131lib/ecore/efl_interpolator_decelerate.c \
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 551e907796..8234cadddf 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -77,6 +77,7 @@ efl_eolian_files = \
77 lib/efl/interfaces/efl_gfx_color_class.eo \ 77 lib/efl/interfaces/efl_gfx_color_class.eo \
78 lib/efl/interfaces/efl_gfx_text_class.eo \ 78 lib/efl/interfaces/efl_gfx_text_class.eo \
79 lib/efl/interfaces/efl_gfx_size_class.eo \ 79 lib/efl/interfaces/efl_gfx_size_class.eo \
80 lib/efl/interfaces/efl_interpolator.eo \
80 $(efl_eolian_legacy_files) \ 81 $(efl_eolian_legacy_files) \
81 $(NULL) 82 $(NULL)
82 83
diff --git a/src/lib/ecore/CMakeLists.txt b/src/lib/ecore/CMakeLists.txt
index 01a05a8aa8..e4735420a0 100644
--- a/src/lib/ecore/CMakeLists.txt
+++ b/src/lib/ecore/CMakeLists.txt
@@ -38,7 +38,6 @@ 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.eo
42 efl_interpolator_linear.eo 41 efl_interpolator_linear.eo
43 efl_interpolator_accelerate.eo 42 efl_interpolator_accelerate.eo
44 efl_interpolator_decelerate.eo 43 efl_interpolator_decelerate.eo
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 26a5834b6f..cb01dec865 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -78,7 +78,6 @@ 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.eo.h"
82#include "efl_interpolator_linear.eo.h" 81#include "efl_interpolator_linear.eo.h"
83#include "efl_interpolator_accelerate.eo.h" 82#include "efl_interpolator_accelerate.eo.h"
84#include "efl_interpolator_decelerate.eo.h" 83#include "efl_interpolator_decelerate.eo.h"
diff --git a/src/lib/ecore/efl_interpolator.c b/src/lib/ecore/efl_interpolator.c
deleted file mode 100644
index 573d5c5cf9..0000000000
--- a/src/lib/ecore/efl_interpolator.c
+++ /dev/null
@@ -1,24 +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_CLASS
9
10typedef struct _Efl_Interpolator_Data Efl_Interpolator_Data;
11
12struct _Efl_Interpolator_Data
13{
14};
15
16EOLIAN static double
17_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
18 Efl_Interpolator_Data *pd EINA_UNUSED,
19 double progress)
20{
21 return progress;
22}
23
24#include "efl_interpolator.eo.c"
diff --git a/src/lib/ecore/efl_interpolator_accelerate.eo b/src/lib/ecore/efl_interpolator_accelerate.eo
index dc087a5b67..3f2ef94b35 100644
--- a/src/lib/ecore/efl_interpolator_accelerate.eo
+++ b/src/lib/ecore/efl_interpolator_accelerate.eo
@@ -1,4 +1,4 @@
1class Efl.Interpolator_Accelerate (Efl.Interpolator) 1class Efl.Interpolator_Accelerate (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl accelerate interpolator class 3 [[Efl accelerate interpolator class
4 4
diff --git a/src/lib/ecore/efl_interpolator_bounce.eo b/src/lib/ecore/efl_interpolator_bounce.eo
index 8df3807f35..cd77b8b009 100644
--- a/src/lib/ecore/efl_interpolator_bounce.eo
+++ b/src/lib/ecore/efl_interpolator_bounce.eo
@@ -1,4 +1,4 @@
1class Efl.Interpolator_Bounce (Efl.Interpolator) 1class Efl.Interpolator_Bounce (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_Interpolator_Bounce_Data;
diff --git a/src/lib/ecore/efl_interpolator_cubic_bezier.eo b/src/lib/ecore/efl_interpolator_cubic_bezier.eo
index 3a10fdce81..4e3906dc50 100644
--- a/src/lib/ecore/efl_interpolator_cubic_bezier.eo
+++ b/src/lib/ecore/efl_interpolator_cubic_bezier.eo
@@ -1,4 +1,4 @@
1class Efl.Interpolator_Cubic_Bezier (Efl.Interpolator) 1class Efl.Interpolator_Cubic_Bezier (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_Interpolator_Cubic_Bezier_Data;
diff --git a/src/lib/ecore/efl_interpolator_decelerate.eo b/src/lib/ecore/efl_interpolator_decelerate.eo
index 99d86c7a00..25a4d05f92 100644
--- a/src/lib/ecore/efl_interpolator_decelerate.eo
+++ b/src/lib/ecore/efl_interpolator_decelerate.eo
@@ -1,4 +1,4 @@
1class Efl.Interpolator_Decelerate (Efl.Interpolator) 1class Efl.Interpolator_Decelerate (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl decelerate interpolator class 3 [[Efl decelerate interpolator class
4 4
diff --git a/src/lib/ecore/efl_interpolator_divisor.eo b/src/lib/ecore/efl_interpolator_divisor.eo
index 63201d51e3..d9a1cef03e 100644
--- a/src/lib/ecore/efl_interpolator_divisor.eo
+++ b/src/lib/ecore/efl_interpolator_divisor.eo
@@ -1,4 +1,4 @@
1class Efl.Interpolator_Divisor (Efl.Interpolator) 1class Efl.Interpolator_Divisor (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_Interpolator_Divisor_Data;
diff --git a/src/lib/ecore/efl_interpolator_linear.eo b/src/lib/ecore/efl_interpolator_linear.eo
index 26e054ef0a..b61c7d1f66 100644
--- a/src/lib/ecore/efl_interpolator_linear.eo
+++ b/src/lib/ecore/efl_interpolator_linear.eo
@@ -1,4 +1,4 @@
1class Efl.Interpolator_Linear (Efl.Interpolator) 1class Efl.Interpolator_Linear (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl linear interpolator class]] 3 [[Efl linear interpolator class]]
4 data: Efl_Interpolator_Linear_Data; 4 data: Efl_Interpolator_Linear_Data;
diff --git a/src/lib/ecore/efl_interpolator_sinusoidal.eo b/src/lib/ecore/efl_interpolator_sinusoidal.eo
index 0a1d923fbb..39718525c7 100644
--- a/src/lib/ecore/efl_interpolator_sinusoidal.eo
+++ b/src/lib/ecore/efl_interpolator_sinusoidal.eo
@@ -1,4 +1,4 @@
1class Efl.Interpolator_Sinusoidal (Efl.Interpolator) 1class Efl.Interpolator_Sinusoidal (Efl.Object, Efl.Interpolator)
2{ 2{
3 [[Efl sinusoidal interpolator class 3 [[Efl sinusoidal interpolator class
4 4
diff --git a/src/lib/ecore/efl_interpolator_spring.eo b/src/lib/ecore/efl_interpolator_spring.eo
index 2d1047edd5..ef3eee0ca9 100644
--- a/src/lib/ecore/efl_interpolator_spring.eo
+++ b/src/lib/ecore/efl_interpolator_spring.eo
@@ -1,4 +1,4 @@
1class Efl.Interpolator_Spring (Efl.Interpolator) 1class Efl.Interpolator_Spring (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_Interpolator_Spring_Data;
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index dbb511e2bf..993437f01c 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -57,7 +57,6 @@ 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.eo',
61 'efl_interpolator_linear.eo', 60 'efl_interpolator_linear.eo',
62 'efl_interpolator_accelerate.eo', 61 'efl_interpolator_accelerate.eo',
63 'efl_interpolator_decelerate.eo', 62 'efl_interpolator_decelerate.eo',
@@ -154,7 +153,6 @@ ecore_src = [
154 'efl_model_composite_selection.c', 153 'efl_model_composite_selection.c',
155 'efl_model_accessor_view.c', 154 'efl_model_accessor_view.c',
156 'efl_model_accessor_view_private.h', 155 'efl_model_accessor_view_private.h',
157 'efl_interpolator.c',
158 'efl_interpolator_linear.c', 156 'efl_interpolator_linear.c',
159 'efl_interpolator_accelerate.c', 157 'efl_interpolator_accelerate.c',
160 'efl_interpolator_decelerate.c', 158 'efl_interpolator_decelerate.c',
diff --git a/src/lib/efl/CMakeLists.txt b/src/lib/efl/CMakeLists.txt
index 0c03b5c672..7f1672907a 100644
--- a/src/lib/efl/CMakeLists.txt
+++ b/src/lib/efl/CMakeLists.txt
@@ -29,6 +29,7 @@ set(PUBLIC_EO_FILES
29 interfaces/efl_image_load.eo 29 interfaces/efl_image_load.eo
30 interfaces/efl_input_device.eo 30 interfaces/efl_input_device.eo
31 interfaces/efl_input_types.eot 31 interfaces/efl_input_types.eot
32 interfaces/efl_interpolator.eo
32 interfaces/efl_io_buffer.eo 33 interfaces/efl_io_buffer.eo
33 interfaces/efl_io_closer.eo 34 interfaces/efl_io_closer.eo
34 interfaces/efl_io_positioner.eo 35 interfaces/efl_io_positioner.eo
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 6cebb21dae..8548ac95c8 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -117,6 +117,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
117 117
118/* Core interface */ 118/* Core interface */
119#include "interfaces/efl_animator.eo.h" 119#include "interfaces/efl_animator.eo.h"
120#include "interfaces/efl_interpolator.eo.h"
120 121
121/* Graphics */ 122/* Graphics */
122#include "interfaces/efl_gfx_entity.eo.h" 123#include "interfaces/efl_gfx_entity.eo.h"
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index f5b8634d68..a21d7505aa 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -61,6 +61,7 @@
61 61
62#include "interfaces/efl_model.eo.c" 62#include "interfaces/efl_model.eo.c"
63#include "interfaces/efl_animator.eo.c" 63#include "interfaces/efl_animator.eo.c"
64#include "interfaces/efl_interpolator.eo.c"
64#include "interfaces/efl_orientation.eo.c" 65#include "interfaces/efl_orientation.eo.c"
65#include "interfaces/efl_ui_base.eo.c" 66#include "interfaces/efl_ui_base.eo.c"
66#include "interfaces/efl_ui_direction.eo.c" 67#include "interfaces/efl_ui_direction.eo.c"
diff --git a/src/lib/ecore/efl_interpolator.eo b/src/lib/efl/interfaces/efl_interpolator.eo
index f24c601300..4c25d9c026 100644
--- a/src/lib/ecore/efl_interpolator.eo
+++ b/src/lib/efl/interfaces/efl_interpolator.eo
@@ -1,7 +1,6 @@
1class Efl.Interpolator (Efl.Object) 1interface Efl.Interpolator ()
2{ 2{
3 [[Efl interpolator class]] 3 [[Efl interpolator interface]]
4 data: Efl_Interpolator_Data;
5 methods { 4 methods {
6 interpolate { 5 interpolate {
7 [[Interpolate the given value.]] 6 [[Interpolate the given value.]]
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 012bc12ff2..03d88e2aac 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -71,6 +71,7 @@ pub_eo_files = [
71 'efl_gfx_size_hint.eo', 71 'efl_gfx_size_hint.eo',
72 'efl_model.eo', 72 'efl_model.eo',
73 'efl_animator.eo', 73 'efl_animator.eo',
74 'efl_interpolator.eo',
74 'efl_orientation.eo', 75 'efl_orientation.eo',
75 'efl_container.eo', 76 'efl_container.eo',
76 'efl_content.eo', 77 'efl_content.eo',
diff --git a/src/lib/evas/canvas/efl_canvas_animation.eo b/src/lib/evas/canvas/efl_canvas_animation.eo
index 7773ca3d7c..8040ac9dbe 100644
--- a/src/lib/evas/canvas/efl_canvas_animation.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation.eo
@@ -62,7 +62,7 @@ class Efl.Canvas.Animation (Efl.Object, Efl.Playable)
62 get { 62 get {
63 } 63 }
64 values { 64 values {
65 interpolator: Efl.Object; [[Interpolator which indicates interpolation fucntion. Efl_Interpolator is required.]] 65 interpolator: Efl.Interpolator; [[Interpolator which indicates interpolation fucntion. Efl_Interpolator is required.]]
66 } 66 }
67 } 67 }
68 animation_apply { 68 animation_apply {