kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Jaehyun Cho 2018-11-23 19:30:36 +09:00
parent 424bd60084
commit 6cc7c1b830
20 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Ecore.am
View File

@ -33,7 +33,6 @@ ecore_eolian_files_public = \
lib/ecore/efl_io_file.eo \
lib/ecore/efl_io_copier.eo \
lib/ecore/efl_io_buffered_stream.eo \
lib/ecore/efl_interpolator.eo \
lib/ecore/efl_interpolator_linear.eo \
lib/ecore/efl_interpolator_accelerate.eo \
lib/ecore/efl_interpolator_decelerate.eo \
@ -127,7 +126,6 @@ lib/ecore/efl_model_composite_boolean.c \
lib/ecore/efl_model_composite_selection.c \
lib/ecore/efl_model_accessor_view.c \
lib/ecore/efl_model_accessor_view_private.h \
lib/ecore/efl_interpolator.c \
lib/ecore/efl_interpolator_linear.c \
lib/ecore/efl_interpolator_accelerate.c \
lib/ecore/efl_interpolator_decelerate.c \

1
src/Makefile_Efl.am
View File

@ -77,6 +77,7 @@ efl_eolian_files = \
lib/efl/interfaces/efl_gfx_color_class.eo \
lib/efl/interfaces/efl_gfx_text_class.eo \
lib/efl/interfaces/efl_gfx_size_class.eo \
lib/efl/interfaces/efl_interpolator.eo \
$(efl_eolian_legacy_files) \
$(NULL)

1
src/lib/ecore/CMakeLists.txt
View File

@ -38,7 +38,6 @@ set(PUBLIC_EO_FILES
efl_loop_timer.eo
efl_loop_user.eo
efl_promise.eo
efl_interpolator.eo
efl_interpolator_linear.eo
efl_interpolator_accelerate.eo
efl_interpolator_decelerate.eo

1
src/lib/ecore/Ecore_Eo.h
View File

@ -78,7 +78,6 @@ EAPI Eina_Promise *efl_loop_promise_new(const Eo *obj, Eina_Promise_Cancel_Cb ca
#include "efl_loop_fd.eo.h"
#include "efl_loop_handler.eo.h"
#include "efl_interpolator.eo.h"
#include "efl_interpolator_linear.eo.h"
#include "efl_interpolator_accelerate.eo.h"
#include "efl_interpolator_decelerate.eo.h"

24
src/lib/ecore/efl_interpolator.c
View File

@ -1,24 +0,0 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "Ecore.h"
#include "ecore_private.h"
#define MY_CLASS EFL_INTERPOLATOR_CLASS
typedef struct _Efl_Interpolator_Data Efl_Interpolator_Data;
struct _Efl_Interpolator_Data
{
};
EOLIAN static double
_efl_interpolator_interpolate(Eo *eo_obj EINA_UNUSED,
Efl_Interpolator_Data *pd EINA_UNUSED,
double progress)
{
return progress;
}
#include "efl_interpolator.eo.c"

2
src/lib/ecore/efl_interpolator_accelerate.eo
View File

@ -1,4 +1,4 @@
class Efl.Interpolator_Accelerate (Efl.Interpolator)
class Efl.Interpolator_Accelerate (Efl.Object, Efl.Interpolator)
{
[[Efl accelerate interpolator class

2
src/lib/ecore/efl_interpolator_bounce.eo
View File

@ -1,4 +1,4 @@
class Efl.Interpolator_Bounce (Efl.Interpolator)
class Efl.Interpolator_Bounce (Efl.Object, Efl.Interpolator)
{
[[Efl bounce interpolator class]]
data: Efl_Interpolator_Bounce_Data;

2
src/lib/ecore/efl_interpolator_cubic_bezier.eo
View File

@ -1,4 +1,4 @@
class Efl.Interpolator_Cubic_Bezier (Efl.Interpolator)
class Efl.Interpolator_Cubic_Bezier (Efl.Object, Efl.Interpolator)
{
[[Efl cubic_bezier interpolator class]]
data: Efl_Interpolator_Cubic_Bezier_Data;

2
src/lib/ecore/efl_interpolator_decelerate.eo
View File

@ -1,4 +1,4 @@
class Efl.Interpolator_Decelerate (Efl.Interpolator)
class Efl.Interpolator_Decelerate (Efl.Object, Efl.Interpolator)
{
[[Efl decelerate interpolator class

2
src/lib/ecore/efl_interpolator_divisor.eo
View File

@ -1,4 +1,4 @@
class Efl.Interpolator_Divisor (Efl.Interpolator)
class Efl.Interpolator_Divisor (Efl.Object, Efl.Interpolator)
{
[[Efl divisor interpolator class]]
data: Efl_Interpolator_Divisor_Data;

2
src/lib/ecore/efl_interpolator_linear.eo
View File

@ -1,4 +1,4 @@
class Efl.Interpolator_Linear (Efl.Interpolator)
class Efl.Interpolator_Linear (Efl.Object, Efl.Interpolator)
{
[[Efl linear interpolator class]]
data: Efl_Interpolator_Linear_Data;

2
src/lib/ecore/efl_interpolator_sinusoidal.eo
View File

@ -1,4 +1,4 @@
class Efl.Interpolator_Sinusoidal (Efl.Interpolator)
class Efl.Interpolator_Sinusoidal (Efl.Object, Efl.Interpolator)
{
[[Efl sinusoidal interpolator class

2
src/lib/ecore/efl_interpolator_spring.eo
View File

@ -1,4 +1,4 @@
class Efl.Interpolator_Spring (Efl.Interpolator)
class Efl.Interpolator_Spring (Efl.Object, Efl.Interpolator)
{
[[Efl spring interpolator class]]
data: Efl_Interpolator_Spring_Data;

2
src/lib/ecore/meson.build
View File

@ -57,7 +57,6 @@ pub_eo_files = [
'efl_io_file.eo',
'efl_io_copier.eo',
'efl_io_buffered_stream.eo',
'efl_interpolator.eo',
'efl_interpolator_linear.eo',
'efl_interpolator_accelerate.eo',
'efl_interpolator_decelerate.eo',
@ -154,7 +153,6 @@ ecore_src = [
'efl_model_composite_selection.c',
'efl_model_accessor_view.c',
'efl_model_accessor_view_private.h',
'efl_interpolator.c',
'efl_interpolator_linear.c',
'efl_interpolator_accelerate.c',
'efl_interpolator_decelerate.c',

1
src/lib/efl/CMakeLists.txt
View File

@ -29,6 +29,7 @@ set(PUBLIC_EO_FILES
interfaces/efl_image_load.eo
interfaces/efl_input_device.eo
interfaces/efl_input_types.eot
interfaces/efl_interpolator.eo
interfaces/efl_io_buffer.eo
interfaces/efl_io_closer.eo
interfaces/efl_io_positioner.eo

1
src/lib/efl/Efl.h
View File

@ -117,6 +117,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
/* Core interface */
#include "interfaces/efl_animator.eo.h"
#include "interfaces/efl_interpolator.eo.h"
/* Graphics */
#include "interfaces/efl_gfx_entity.eo.h"

1
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -61,6 +61,7 @@
#include "interfaces/efl_model.eo.c"
#include "interfaces/efl_animator.eo.c"
#include "interfaces/efl_interpolator.eo.c"
#include "interfaces/efl_orientation.eo.c"
#include "interfaces/efl_ui_base.eo.c"
#include "interfaces/efl_ui_direction.eo.c"

5
src/lib/ecore/efl_interpolator.eo → src/lib/efl/interfaces/efl_interpolator.eo
View File

@ -1,7 +1,6 @@
class Efl.Interpolator (Efl.Object)
interface Efl.Interpolator ()
{
[[Efl interpolator class]]
data: Efl_Interpolator_Data;
[[Efl interpolator interface]]
methods {
interpolate {
[[Interpolate the given value.]]

1
src/lib/efl/interfaces/meson.build
View File

@ -71,6 +71,7 @@ pub_eo_files = [
'efl_gfx_size_hint.eo',
'efl_model.eo',
'efl_animator.eo',
'efl_interpolator.eo',
'efl_orientation.eo',
'efl_container.eo',
'efl_content.eo',

2
src/lib/evas/canvas/efl_canvas_animation.eo
View File

@ -62,7 +62,7 @@ class Efl.Canvas.Animation (Efl.Object, Efl.Playable)
get {
}
values {
interpolator: Efl.Object; [[Interpolator which indicates interpolation fucntion. Efl_Interpolator is required.]]
interpolator: Efl.Interpolator; [[Interpolator which indicates interpolation fucntion. Efl_Interpolator is required.]]
}
}
animation_apply {