From c9de7968bd61babe2c0e9113f2f3aacae0e0f0a2 Mon Sep 17 00:00:00 2001 From: MinJeong Kim Date: Thu, 11 May 2017 22:21:17 +0900 Subject: [PATCH] Added new effect group zoom-easout and adjust duration of transition Change-Id: I1d620f290732c859603ea8ef0855310fd32cc693 Signed-off-by: MinJeong Kim --- data/effect.edc | 5 + data/group/background-zoom-fade.edc | 13 +- data/group/zoom-easeout.edc | 305 ++++++++++++++++++++++++++++++++++++ 3 files changed, 320 insertions(+), 3 deletions(-) create mode 100644 data/group/zoom-easeout.edc diff --git a/data/effect.edc b/data/effect.edc index f227fb0..b13b221 100644 --- a/data/effect.edc +++ b/data/effect.edc @@ -19,6 +19,11 @@ collections { #include "group/zoom.edc" /*-----------------------------------------------------*/ + /* group "e/comp/effects/zoom-easeout" */ + /*-----------------------------------------------------*/ + #include "group/zoom-easeout.edc" + + /*-----------------------------------------------------*/ /* group "e/comp/effects/keyboard" */ /*-----------------------------------------------------*/ #include "group/keyboard.edc" diff --git a/data/group/background-zoom-fade.edc b/data/group/background-zoom-fade.edc index fe04e47..bd2b349 100644 --- a/data/group/background-zoom-fade.edc +++ b/data/group/background-zoom-fade.edc @@ -112,8 +112,7 @@ group { name: "e/comp/effects/background-zoom-fade"; source: "e"; filter: "e.swallow.content" "zoom-in"; action: STATE_SET "zoom-in" 1.0; - transition: DECEL_FAC 0.11 0.8; - target: "clipper"; + transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; target: "e.swallow.content"; after: "zoom-in2"; } @@ -122,12 +121,20 @@ group { name: "e/comp/effects/background-zoom-fade"; target: "e.swallow.content"; after: "done"; } + program { name: "zoom-in1-opacity"; + signal: "e,action,go"; + source: "e"; + filter: "clipper" "zoom-in"; + action: STATE_SET "zoom-in" 1.0; + transition: CUBIC_BEZIER 0.2 0.25 0.46 0.45 1.0; + target: "clipper"; + } program { name: "zoom-out1"; signal: "e,action,go"; source: "e"; filter: "e.swallow.content" "zoom-out"; action: STATE_SET "zoom-out" 1.0; - transition: ACCEL_FAC 0.21 1.5; + transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; target: "clipper"; target: "e.swallow.content"; after: "zoom-out2"; diff --git a/data/group/zoom-easeout.edc b/data/group/zoom-easeout.edc new file mode 100644 index 0000000..0b43f84 --- /dev/null +++ b/data/group/zoom-easeout.edc @@ -0,0 +1,305 @@ +group { name: "e/comp/effects/zoom-easeout"; + script { + public message(Msg_Type:type, id, ...) { + if ((type == MSG_INT_SET) && (id == 0)) { + /*set state */ + new st; + st = getarg(2); + if (st == 0) + { + set_state(PART:"clipper", "default", 0.0); + set_state(PART:"shower", "default", 0.0); + set_state(PART:"e.swallow.content", "default", 0.0); + set_state(PART:"under", "default", 0.0); + } + else if (st == 1) + { + set_state(PART:"clipper", "visible", 0.0); + set_state(PART:"shower", "visible", 0.0); + set_state(PART:"e.swallow.content", "visible", 0.0); + set_state(PART:"under", "visible", 0.0); + } + else if (st == 2) + { + set_state(PART:"clipper", "restack_hidden", 0.0); + set_state(PART:"shower", "restack_hidden", 0.0); + set_state(PART:"e.swallow.content", "restack_hidden", 0.0); + set_state(PART:"under", "restack_hidden", 0.0); + } + else if (st == 3) + { + set_state(PART:"clipper", "restack_visible", 0.0); + set_state(PART:"shower", "restack_visible", 0.0); + set_state(PART:"e.swallow.content", "restack_visible", 0.0); + set_state(PART:"under", "restack_visible", 0.0); + } + else if (st == 4) + { + set_state(PART:"clipper", "restack_done", 0.0); + set_state(PART:"shower", "restack_done", 0.0); + set_state(PART:"e.swallow.content", "restack_done", 0.0); + set_state(PART:"under", "restack_done", 0.0); + } + } else if ((type == MSG_INT_SET) && (id == 1)) + { + } + } + } + parts { + part { name: "clipper"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 255 255 255 0; + rel1.relative: -1.0 -1.0; + rel1.offset: -9999 -9999; + rel2.relative: 2.0 2.0; + rel2.offset: 9999 9999; + visible: 1; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + } + description { state: "restack_visible" 0.0; + inherit: "visible" 0.0; + } + description { state: "restack_hidden" 0.0; + inherit: "default" 0.0; + } + description { state: "restack_done" 0.0; + inherit: "visible" 0.0; + } + } + part { name: "shower"; + type: SPACER; + description { state: "default" 0.0; + rel1.relative: 0 0; + rel2.relative: 1 1; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.relative: 0 0; + rel1.offset: 0 0; + rel2.relative: 1 1; + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + } + description { state: "restack_visible" 0.0; + inherit: "visible" 0.0; + } + description { state: "restack_hidden" 0.0; + inherit: "default" 0.0; + } + description { state: "restack_done" 0.0; + inherit: "visible" 0.0; + } + } + part { name: "e.swallow.content"; type: SWALLOW; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + map { + on: 1; + smooth: 1; + zoom.x: 0.3; + zoom.y: 0.3; + } + } + description { state: "visible" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + map { + on: 1; + smooth: 1; + zoom.x: 1; + zoom.y: 1; + } + } + description { state: "visible_default" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + rel1.relative: 0 0; + rel2.relative: 1 1; + map.on : 0; + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + } + description { state: "restack_visible" 0.0; + inherit: "visible" 0.0; + } + description { state: "restack_hidden" 0.0; + inherit: "default" 0.0; + } + description { state: "restack_done" 0.0; + inherit: "visible" 0.0; + } + } + part { name: "under"; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + map { + on: 1; + smooth: 1; + zoom.x: 0.3; + zoom.y: 0.3; + } + } + description { state: "visible" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + map { + on: 1; + smooth: 1; + zoom.x: 1; + zoom.y: 1; + } + } + description { state: "visible_default" 0.0; + rel1.to: "shower"; + rel2.to: "shower"; + rel1.relative: 0 0; + rel2.relative: 1 1; + map.on : 0; + } + description { state: "hide" 0.0; + inherit: "default" 0.0; + } + description { state: "restack_visible" 0.0; + inherit: "visible" 0.0; + } + description { state: "restack_hidden" 0.0; + inherit: "default" 0.0; + } + description { state: "restack_done" 0.0; + inherit: "visible" 0.0; + } + } + } + programs { + program { name: "show1"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "default"; + action: STATE_SET "default" 0.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "show2"; + } + program { name: "show2"; + action: STATE_SET "visible" 0.0; + transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "show3"; + } + program { name: "show3"; + action: STATE_SET "visible_default" 0.0; + target: "under"; + target: "e.swallow.content"; + after: "done"; + } + program { name: "hide1"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "visible"; + action: STATE_SET "visible" 0.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "hide2"; + } + program { name: "hide2"; + action: STATE_SET "hide" 0.0; + transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "hide3"; + } + program { name: "hide3"; + action: STATE_SET "default" 0.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "done"; + } + program { name: "restack,show1"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "restack_hidden"; + action: STATE_SET "restack_hidden" 0.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "restack,show2"; + } + program { name: "restack,show2"; + action: STATE_SET "visible" 0.0; + transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "restack,show3"; + } + program { name: "restack,show3"; + action: STATE_SET "visible_default" 0.0; + target: "e.swallow.content"; + target: "under"; + after: "done"; + } + program { name: "restack,hide1"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "restack_visible"; + action: STATE_SET "restack_visible" 0.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "restack,hide2"; + } + program { name: "restack,hide2"; + action: STATE_SET "hide" 0.0; + transition: CUBIC_BEZIER 0.4 0.25 0.46 0.45 1.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "done"; + } + program { name: "restack,finish"; + signal: "e,action,go"; + source: "e"; + filter: "shower" "restack_done"; + action: STATE_SET "visible" 0.0; + target: "shower"; + target: "clipper"; + target: "e.swallow.content"; + target: "under"; + after: "done"; + } + program { name: "done"; + action: SIGNAL_EMIT "e,action,done" "e"; + } + } +} -- 2.7.4