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

edje: add set_state_anim API to embryo script. 

Summary:
Issue: Current embryo script do not provide any mechanism to set transition type in animation
Solution: A new API set_state_anim is added.

Signed-Off by: Kumar Navneet <k.navneet@samsung.com>
Signed-Off by: Shilpa Singh <shilpa.singh@samsung.com>

Test Plan: A test edc (embryo_set_state_anim.edc) is added to edje examples to test set_state_anim API.

Reviewers: shilpasingh, raster, cedric

Reviewed By: cedric

Subscribers: poornima.srinivasan, cedric

Differential Revision: https://phab.enlightenment.org/D2470

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
kumar navneet 2015-05-18 11:01:24 +02:00 committed by Cedric BAIL
parent be5eb3f2de
commit 4db130a680
3 changed files with 159 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/edje/include/edje.inc
View File

@ -315,3 +315,4 @@ enum Anim_Param
};
native set_tween_state_anim (part_id, state1[], Float:state1_val, state2[], Float:state2_val, Anim_Param:p, Float:tween, ...);
native set_state_anim (part_id, state[], Float:state1_val, Anim_Param:p, Float:tween, ...);

52
src/examples/edje/embryo_set_state_anim.edc Normal file
View File

@ -0,0 +1,52 @@
collections {
group { name: "main";
script{
public test(val, Float:pos)
{
set_state_anim(PART:"red_rect", "default", 1.0, ACCELERATE, pos);
}
}
parts {
part { name: "bg";
type: RECT;
description { state: "default" 0.0;
color: 255 255 255 255;
}
}
part { name: "label";
type: TEXT;
description { state: "default" 0.0;
color: 0 0 0 255;
text {
text: "Click me.";
font: "Sans";
size: 12;
align: 0.0 0.7;
}
}
}
part { name: "red_rect";
type: RECT;
description { state: "default" 0.0;
color: 0 0 255 255;
max: 30 30;
align: 0.1 0.2;
}
description { state: "default" 1.0;
inherit: "default" 0.0;
color: 0 0 255 255;
align: 0.9 0.2;
}
}
}
programs {
program {
signal: "mouse,down,1";
source: "label";
script {
anim(0.9, "test", 1);
}
}
}
}
}

106
src/lib/edje/edje_embryo.c
View File

@ -1065,6 +1065,111 @@ _edje_embryo_fn_set_state(Embryo_Program *ep, Embryo_Cell *params)
return 0;
}
static Embryo_Cell
_edje_embryo_fn_set_state_anim(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
char *state = NULL;
int part_id = 0;
float f = 0.0;
double value = 0.0;
char *tmp = NULL;
Edje_Real_Part *rp;
int anim_type = 0;
double tween = 0.0, value1 = 0.0, value2 = 0.0, v1 = 0.0, v2 = 0.0, v3 = 0.0, v4 = 0.0;
if (HASNPARAMS(4)) return -1;
ed = embryo_program_data_get(ep);
GETSTR(state, params[2]);
if ((!state)) return 0;
part_id = params[1];
if (part_id < 0) return 0;
f = EMBRYO_CELL_TO_FLOAT(params[3]);
value = (double)f;
anim_type = params[4];
f = EMBRYO_CELL_TO_FLOAT(params[5]);
tween = (double)f;
if ((anim_type >= EDJE_TWEEN_MODE_LINEAR) &&
(anim_type <= EDJE_TWEEN_MODE_DECELERATE))
{
if (HASNPARAMS(6))
{
GETSTR(tmp, params[6]);
if (!strcmp(tmp, "CURRENT"))
anim_type |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
}
}
else if ((anim_type >= EDJE_TWEEN_MODE_ACCELERATE_FACTOR) &&
(anim_type <= EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR))
{
if (HASNPARAMS(7))
{
GETSTR(tmp, params[7]);
if (!strcmp(tmp, "CURRENT"))
anim_type |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
}
else if (HASNPARAMS(5))
{
ERR("parse error. Need 6th parameter to set factor");
return -1;
}
GETFLOAT_T(v1, params[6]);
}
else if ((anim_type >= EDJE_TWEEN_MODE_DIVISOR_INTERP) &&
(anim_type <= EDJE_TWEEN_MODE_SPRING))
{
if (HASNPARAMS(8))
{
GETSTR(tmp, params[8]);
if (!strcmp(tmp, "CURRENT"))
anim_type |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
}
else if (HASNPARAMS(5))
{
ERR("parse error.Need 6th and 7th parameters to set factor and counts");
return -1;
}
GETFLOAT_T(v1, params[6]);
GETFLOAT_T(v2, params[7]);
}
else if (anim_type == EDJE_TWEEN_MODE_CUBIC_BEZIER)
{
if (HASNPARAMS(12))
{
GETSTR(tmp, params[8]);
if (!strcmp(tmp, "CURRENT"))
anim_type |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
}
else if (HASNPARAMS(5))
{
ERR("parse error.Need 6th, 7th, 9th and 10th parameters to set x1, y1, x2 and y2");
return -1;
}
if (HASNPARAMS(10))
{
GETFLOAT_T(v1, params[6]);
GETFLOAT_T(v2, params[7]);
GETFLOAT_T(v3, params[9]);
GETFLOAT_T(v4, params[10]);
}
else
{
GETFLOAT_T(v1, params[6]);
GETFLOAT_T(v2, params[7]);
GETFLOAT_T(v3, params[8]);
GETFLOAT_T(v4, params[9]);
}
}
rp = ed->table_parts[part_id % ed->table_parts_size];
if (!rp) return 0;
_edje_part_description_apply(ed, rp, NULL, 0.0, state, value);
_edje_part_pos_set(ed, rp, anim_type, FROM_DOUBLE(tween), v1, v2,
v3, v4);
_edje_recalc(ed);
return 0;
}
/* get_state(part_id, dst[], maxlen, &Float:val) */
static Embryo_Cell
_edje_embryo_fn_get_state(Embryo_Program *ep, Embryo_Cell *params)
@ -3949,6 +4054,7 @@ _edje_embryo_script_init(Edje_Part_Collection *edc)
embryo_program_native_call_add(ep, "custom_state", _edje_embryo_fn_custom_state);
embryo_program_native_call_add(ep, "set_state_val", _edje_embryo_fn_set_state_val);
embryo_program_native_call_add(ep, "get_state_val", _edje_embryo_fn_get_state_val);
embryo_program_native_call_add(ep, "set_state_anim", _edje_embryo_fn_set_state_anim);
embryo_program_native_call_add(ep, "part_swallow", _edje_embryo_fn_part_swallow);