From 8822f5be5af1327a22bbb9b6342ebf70019c0e06 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 30 Jun 2015 16:14:49 +0900 Subject: [PATCH] template: update to new sexy edc style. --- data/templates/clip.edc | 14 ++++++-------- data/templates/group.edc | 21 +++++++++------------ data/templates/image.edc | 9 ++++----- data/templates/map.edc | 29 ++++++++++++----------------- data/templates/minimum.edc | 4 ++-- data/templates/proxy.edc | 14 ++++++-------- data/templates/rect.edc | 9 ++++----- data/templates/rotation+zoom.edc | 22 ++++++++++------------ data/templates/sound.edc | 11 +++++------ data/templates/spacer.edc | 19 ++++++++----------- data/templates/text.edc | 9 ++++----- data/templates/textblock.edc | 11 +++++------ data/templates/transition.edc | 20 +++++++++----------- data/templates/tween.edc | 14 ++++++-------- 14 files changed, 90 insertions(+), 116 deletions(-) diff --git a/data/templates/clip.edc b/data/templates/clip.edc index 95360db..f31faa2 100644 --- a/data/templates/clip.edc +++ b/data/templates/clip.edc @@ -2,20 +2,18 @@ collections { images { image: "logo.png" COMP; } - group { name: "main"; + group { "main"; parts { - part { name: "clipper"; - type: RECT; - description { state: "default" 0.0; + rect { "clipper"; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 0.5 1.0; color: 0 136 170 255; } } - part { name: "logo"; - type: IMAGE; + image { "logo"; clip_to: "clipper"; - description { state: "default" 0.0; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; image.normal: "logo.png"; @@ -25,4 +23,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/group.edc b/data/templates/group.edc index 36aa1d0..858e97e 100644 --- a/data/templates/group.edc +++ b/data/templates/group.edc @@ -1,31 +1,28 @@ collections { - group { name: "main"; + group { "main"; parts { - part { name: "rect"; - type: RECT; - description { state: "default" 0.0; + rect { "rect"; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 0.5; color: 0 136 170 255; } } - part { name: "group"; - type: GROUP; + group { "group"; source: "my_group"; - description { state: "default" 0.0; + desc { "default"; rel1.relative: 0.0 0.5; rel2.relative: 1.0 1.0; } } } } - group { name: "my_group"; + group { "my_group"; parts { - part { name: "text"; - type: TEXT; + text { "text"; scale: 1; effect: FAR_SOFT_SHADOW; - description { state: "default" 0.0; + desc { "default"; color: 0 136 170 255; color2: 0 136 170 50; color3: 0 136 170 25; @@ -38,4 +35,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/image.edc b/data/templates/image.edc index 488ecce..fa74c9d 100644 --- a/data/templates/image.edc +++ b/data/templates/image.edc @@ -2,11 +2,10 @@ collections { images { image: "logo.png" COMP; } - group { name: "main"; + group { "main"; parts { - part { name: "logo"; - type: IMAGE; - description { state: "default" 0.0; + image { "logo"; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; image.normal: "logo.png"; @@ -16,4 +15,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/map.edc b/data/templates/map.edc index 4c46f1c..5dc6734 100644 --- a/data/templates/map.edc +++ b/data/templates/map.edc @@ -2,11 +2,10 @@ collections { images { image: "logo.png" COMP; } - group { name: "main"; + group { "main"; parts { - part { name: "logo"; - type: IMAGE; - description { state: "default" 0.0; + image { "logo"; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 0.5 0.5; image.normal: "logo.png"; @@ -17,17 +16,15 @@ collections { map.color[3]: 0 0 0 0; } } - part { name: "perps_point"; - type: RECT; - description { state: "default" 0.0; + rect { "perps_point"; + desc { "default"; rel1.relative: 0.6 0.1; rel2.relative: 0.9 0.4; visible: 0; } } - part { name: "rect"; - type: RECT; - description { state: "default" 0.0; + rect { "rect"; + desc { "default"; rel1.relative: 0.5 0.0; rel2.relative: 1.0 0.5; color: 0 136 170 255; @@ -40,11 +37,10 @@ collections { } } } - part { name: "text"; - type: TEXT; + text { "text"; scale: 1; effect: FAR_SOFT_SHADOW; - description { state: "default" 0.0; + desc { "default"; rel1.relative: 0.0 0.5; rel2.relative: 0.5 1.0; color: 0 136 170 255; @@ -62,9 +58,8 @@ collections { } } } - part { name: "rect2"; - type: RECT; - description { state: "default" 0.0; + rect { "rect2"; + desc { "default"; rel1.relative: 0.55 0.55; rel2.relative: 0.95 0.95; map { @@ -78,4 +73,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/minimum.edc b/data/templates/minimum.edc index c184f42..b9a5eea 100644 --- a/data/templates/minimum.edc +++ b/data/templates/minimum.edc @@ -1,6 +1,6 @@ collections { - group { name: "main"; + group { "main"; parts { } } -} \ No newline at end of file +} diff --git a/data/templates/proxy.edc b/data/templates/proxy.edc index 7361914..33200cb 100644 --- a/data/templates/proxy.edc +++ b/data/templates/proxy.edc @@ -2,11 +2,10 @@ collections { images { image: "logo.png" COMP; } - group { name: "main"; + group { "main"; parts { - part { name: "logo"; - type: IMAGE; - description { state: "default" 0.0; + image { "logo"; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 0.5 0.5; image.normal: "logo.png"; @@ -14,9 +13,8 @@ collections { aspect_preference: BOTH; } } - part { name: "proxy"; - type: PROXY; - description { state: "default" 0.0; + proxy { "proxy"; + desc { "default"; rel1.relative: 0.5 0.5; rel2.relative: 1.0 1.0; aspect: 1 1; @@ -26,4 +24,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/rect.edc b/data/templates/rect.edc index 6f79346..df7ea1d 100644 --- a/data/templates/rect.edc +++ b/data/templates/rect.edc @@ -1,9 +1,8 @@ collections { - group { name: "main"; + group { "main"; parts { - part { name: "rect"; - type: RECT; - description { state: "default" 0.0; + rect { "rect"; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; color: 0 136 170 255; @@ -11,4 +10,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/rotation+zoom.edc b/data/templates/rotation+zoom.edc index 6594fdd..710db17 100644 --- a/data/templates/rotation+zoom.edc +++ b/data/templates/rotation+zoom.edc @@ -2,18 +2,17 @@ collections { images { image: "logo.png" COMP; } - group { name: "main"; + group { "main"; parts { - part { name: "logo"; - type: IMAGE; - description { state: "default" 0.0; + image { "logo"; + desc { "default"; image.normal: "logo.png"; aspect: 1 1; aspect_preference: BOTH; map.on: 1; } - description { state: "rotated" 0.0; - inherit: "default" 0.0; + desc { "rotated"; + inherit: "default"; map { rotation.z: 360; zoom.x: 0.25; @@ -23,20 +22,19 @@ collections { } } programs { - program { name: "anim1"; + program { "anim1"; signal: "load"; - source: ""; - action: STATE_SET "rotated" 0.0; + action: STATE_SET "rotated"; target: "logo"; transition: ACCELERATE 2; after: "anim2"; } - program { name: "anim2"; - action: STATE_SET "default" 0.0; + program { "anim2"; + action: STATE_SET "default"; target: "logo"; transition: ACCELERATE 2.0; after: "anim1"; } } } -} \ No newline at end of file +} diff --git a/data/templates/sound.edc b/data/templates/sound.edc index e16e8b7..ed808e5 100644 --- a/data/templates/sound.edc +++ b/data/templates/sound.edc @@ -4,21 +4,20 @@ collections { source: "kbd-tap.wav"; } } - group { name: "main"; + group { "main"; parts { - part { name: "rect"; - type: RECT; - description { state: "default" 0.0; + rect { "rect"; + desc { "default"; color: 0 136 170 255; } } } programs { - program { name: "mouse_down"; + program { "mouse_down"; signal: "mouse,down,1"; source: "rect"; action: PLAY_SAMPLE "sound" 1.0; } } } -} \ No newline at end of file +} diff --git a/data/templates/spacer.edc b/data/templates/spacer.edc index 3fc3bc4..efb15a3 100644 --- a/data/templates/spacer.edc +++ b/data/templates/spacer.edc @@ -1,10 +1,9 @@ collections { - group { name: "main"; + group { "main"; parts { - part { name: "spacer1"; - type: SPACER; + spacer { "spacer1"; scale: 1; - description { state: "default" 0.0; + desc { "default"; min: 50 50; fixed: 1 1; align: 0 0; @@ -12,10 +11,9 @@ collections { rel2.relative: 0.0 0.0; } } - part { name: "spacer2"; - type: SPACER; + spacer { "spacer2"; scale: 1; - description { state: "default" 0.0; + description { "default"; min: 50 50; fixed: 1 1; align: 1 1; @@ -23,9 +21,8 @@ collections { rel2.relative: 1.0 1.0; } } - part { name: "rect"; - type: RECT; - description { state: "default" 0.0; + rect { "rect"; + desc { "default"; rel1.to: "spacer1"; rel1.relative: 1.0 1.0; rel2.to: "spacer2"; @@ -35,4 +32,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/text.edc b/data/templates/text.edc index d5eff9b..eb1b13c 100644 --- a/data/templates/text.edc +++ b/data/templates/text.edc @@ -1,11 +1,10 @@ collections { - group { name: "main"; + group { "main"; parts { - part { name: "text"; - type: TEXT; + text { "text"; scale: 1; effect: FAR_SOFT_SHADOW; - description { state: "default" 0.0; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; color: 0 136 170 255; @@ -21,4 +20,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/textblock.edc b/data/templates/textblock.edc index ba1cb0f..bf234b4 100644 --- a/data/templates/textblock.edc +++ b/data/templates/textblock.edc @@ -1,15 +1,14 @@ collections { styles { - style { name: "text_style"; + style { "text_style"; base: "font="Sans" font_size=30 text_class=entry color=#0088AA style=shadow,bottom shadow_color=#00000080 valign=0.5 ellipsis=1.0 wrap=none align=center"; } } - group { name: "main"; + group { "main"; parts { - part { name: "text"; - type: TEXTBLOCK; + textblock { "text"; scale: 1; - description { state: "default" 0.0; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; text { @@ -20,4 +19,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/transition.edc b/data/templates/transition.edc index c8d04fb..364bb02 100644 --- a/data/templates/transition.edc +++ b/data/templates/transition.edc @@ -1,14 +1,13 @@ collections { - group { name: "main"; + group { "main"; parts { - part { name: "rect"; - type: RECT; - description { state: "default" 0.0; + rect { "rect"; + desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 0.25 0.25; color: 255 255 0 255; } - description { state: "changed" 0.0; + desc { "changed"; rel1.relative: 0.5 0.5; rel2.relative: 1.0 1.0; color: 0 136 170 255; @@ -16,20 +15,19 @@ collections { } } programs { - program { name: "anim1"; + program { "anim1"; signal: "load"; - source: ""; - action: STATE_SET "changed" 0.0; + action: STATE_SET "changed"; target: "rect"; transition: ACCELERATE 1; after: "anim2"; } - program { name: "anim2"; - action: STATE_SET "default" 0.0; + program { "anim2"; + action: STATE_SET "default"; target: "rect"; transition: DECELERATE 2; after: "anim1"; } } } -} \ No newline at end of file +} diff --git a/data/templates/tween.edc b/data/templates/tween.edc index a37167f..ed8ed36 100644 --- a/data/templates/tween.edc +++ b/data/templates/tween.edc @@ -13,11 +13,10 @@ collections { image: "TRIAB-11.png" COMP; image: "TRIAB-12.png" COMP; } - group { name: "main"; + group { "main"; parts { - part { name: "image"; - type: IMAGE; - description { state: "default" 0.0; + image { "image"; + desc { "default"; image.normal: "TRIAB-01.png"; image.tween: "TRIAB-02.png"; image.tween: "TRIAB-03.png"; @@ -36,14 +35,13 @@ collections { } } programs { - program { name: "tween_anim"; + program { "tween_anim"; signal: "load"; - source: ""; - action: STATE_SET "default" 0.0; + action: STATE_SET "default"; transition: LINEAR 1; target: "image"; after: "tween_anim"; } } } -} \ No newline at end of file +}