seoz pushed a commit to branch master.
commit a4226537bf7035445042fe49d1b481e893c142b3
Author: Daniel Juyung Seo <[email protected]>
Date: Sat Jul 6 15:35:05 2013 +0900
objects/test.edc: refactoring. use rel1.relative for oneliner.
---
data/objects/test.edc | 190 ++++++++++++++++----------------------------------
1 file changed, 59 insertions(+), 131 deletions(-)
diff --git a/data/objects/test.edc b/data/objects/test.edc
index 6c30333..a2ad805 100644
--- a/data/objects/test.edc
+++ b/data/objects/test.edc
@@ -313,130 +313,96 @@ collections {
parts {
part { name: "slot.0.0"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.0;
- }
- rel2 { relative: 0.25 0.25;
- }
+ rel2.relative: 0.25 0.25;
}
}
part { name: "slot.1.0"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.25 0.0;
- }
- rel2 { relative: 0.50 0.25;
- }
+ rel1.relative: 0.25 0.0;
+ rel2.relative: 0.50 0.25;
}
}
part { name: "slot.2.0"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.50 0.0;
- }
- rel2 { relative: 0.75 0.25;
- }
+ rel1.relative: 0.50 0.0;
+ rel2.relative: 0.75 0.25;
}
}
part { name: "slot.3.0"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.75 0.0;
- }
- rel2 { relative: 1.00 0.25;
- }
+ rel1.relative: 0.75 0.0;
+ rel2.relative: 1.00 0.25;
}
}
part { name: "slot.0.1"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.25;
- }
- rel2 { relative: 0.25 0.50;
- }
+ rel1.relative: 0.0 0.25;
+ rel2.relative: 0.25 0.50;
}
}
part { name: "slot.1.1"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.25 0.25;
- }
- rel2 { relative: 0.50 0.50;
- }
+ rel1.relative: 0.25 0.25;
+ rel2.relative: 0.50 0.50;
}
}
part { name: "slot.2.1"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.50 0.25;
- }
- rel2 { relative: 0.75 0.50;
- }
+ rel1.relative: 0.50 0.25;
+ rel2.relative: 0.75 0.50;
}
}
part { name: "slot.3.1"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.75 0.25;
- }
- rel2 { relative: 1.00 0.50;
- }
+ rel1.relative: 0.75 0.25;
+ rel2.relative: 1.00 0.50;
}
}
part { name: "slot.0.2"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.50;
- }
- rel2 { relative: 0.25 0.75;
- }
+ rel1.relative: 0.0 0.50;
+ rel2.relative: 0.25 0.75;
}
}
part { name: "slot.1.2"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.25 0.50;
- }
- rel2 { relative: 0.50 0.75;
- }
+ rel1.relative: 0.25 0.50;
+ rel2.relative: 0.50 0.75;
}
}
part { name: "slot.2.2"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.50 0.50;
- }
- rel2 { relative: 0.75 0.75;
- }
+ rel1.relative: 0.50 0.50;
+ rel2.relative: 0.75 0.75;
}
}
part { name: "slot.3.2"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.75 0.50;
- }
- rel2 { relative: 1.00 0.75;
- }
+ rel1.relative: 0.75 0.50;
+ rel2.relative: 1.00 0.75;
}
}
part { name: "slot.0.3"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.75;
- }
- rel2 { relative: 0.25 1.00;
- }
+ rel1.relative: 0.0 0.75;
+ rel2.relative: 0.25 1.00;
}
}
part { name: "slot.1.3"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.25 0.75;
- }
- rel2 { relative: 0.50 1.00;
- }
+ rel1.relative: 0.25 0.75;
+ rel2.relative: 0.50 1.00;
}
}
part { name: "slot.2.3"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.50 0.75;
- }
- rel2 { relative: 0.75 1.00;
- }
+ rel1.relative: 0.50 0.75;
+ rel2.relative: 0.75 1.00;
}
}
part { name: "slot.3.3"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.75 0.75;
- }
- rel2 { relative: 1.00 1.00;
- }
+ rel1.relative: 0.75 0.75;
}
}
}
@@ -445,9 +411,8 @@ collections {
parts {
part { name: "slot"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.0;
- }
- rel2 { relative: 1.00 0.00;
+ rel2 {
+ relative: 1.00 0.00;
to_y: "label";
}
}
@@ -473,10 +438,7 @@ collections {
description { state: "default" 0.0;
fixed: 1 1;
align: 0.5 1.0;
- rel1 { relative: 0.0 1.00;
- }
- rel2 { relative: 1.00 1.00;
- }
+ rel1.relative: 0.0 1.00;
color: 224 224 224 255;
color3: 0 0 0 64;
text {
@@ -712,74 +674,54 @@ collections {
parts {
part { name: "slot.0.0"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.0;
- }
- rel2 { relative: 0.33 0.33;
- }
+ rel2.relative: 0.33 0.33;
}
}
part { name: "slot.1.0"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.33 0.0;
- }
- rel2 { relative: 0.66 0.33;
- }
+ rel1.relative: 0.33 0.0;
+ rel2.relative: 0.66 0.33;
}
}
part { name: "slot.2.0"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.66 0.0;
- }
- rel2 { relative: 1.0. 0.33;
- }
+ rel1.relative: 0.66 0.0;
+ rel2.relative: 1.0. 0.33;
}
}
part { name: "slot.0.1"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.33;
- }
- rel2 { relative: 0.33 0.66;
- }
+ rel1.relative: 0.0 0.33;
+ rel2.relative: 0.33 0.66;
}
}
part { name: "slot.1.1"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.33 0.33;
- }
- rel2 { relative: 0.66 0.66;
- }
+ rel1.relative: 0.33 0.33;
+ rel2.relative: 0.66 0.66;
}
}
part { name: "slot.2.1"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.63 0.33;
- }
- rel2 { relative: 1.0 0.66;
- }
+ rel1.relative: 0.63 0.33;
+ rel2.relative: 1.0 0.66;
}
}
part { name: "slot.0.2"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.66;
- }
- rel2 { relative: 0.33 1.0;
- }
+ rel1.relative: 0.0 0.66;
+ rel2.relative: 0.33 1.0;
}
}
part { name: "slot.1.2"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.33 0.66;
- }
- rel2 { relative: 0.66 1.0;
- }
+ rel1.relative: 0.33 0.66;
+ rel2.relative: 0.66 1.0;
}
}
part { name: "slot.2.2"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.66 0.66;
- }
- rel2 { relative: 1.0 1.0;
- }
+ rel1.relative: 0.66 0.66;
}
}
}
@@ -788,10 +730,6 @@ collections {
parts {
part { name: "slot"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.0 0.0;
- }
- rel2 { relative: 1.00 1.00;
- }
}
}
part { name: "access"; type: RECT;
@@ -807,46 +745,36 @@ collections {
parts {
part { name: "red"; type: RECT;
description { state: "default" 0.0;
- rel1 { relative: 0.1 0.1;
- }
- rel2 { relative: 0.35 0.35;
- }
+ rel1.relative: 0.1 0.1;
+ rel2.relative: 0.35 0.35;
color: 255 0 0 255;
}
}
part { name: "green"; type: RECT;
description { state: "default" 0.0;
- rel1 { relative: 0.65 0.1;
- }
- rel2 { relative: 0.9 0.35;
- }
+ rel1.relative: 0.65 0.1;
+ rel2.relative: 0.9 0.35;
color: 0 255 0 255;
}
}
part { name: "blue"; type: RECT;
description { state: "default" 0.0;
- rel1 { relative: 0.1 0.65;
- }
- rel2 { relative: 0.35. 0.9;
- }
+ rel1.relative: 0.1 0.65;
+ rel2.relative: 0.35. 0.9;
color: 0 0 255 255;
}
}
part { name: "black"; type: RECT;
description { state: "default" 0.0;
- rel1 { relative: 0.65 0.65;
- }
- rel2 { relative: 0.9 0.9;
- }
+ rel1.relative: 0.65 0.65;
+ rel2.relative: 0.9 0.9;
color: 0 0 0 255;
}
}
part { name: "center"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 { relative: 0.35 0.35;
- }
- rel2 { relative: 0.65 0.65;
- }
+ rel1.relative: 0.35 0.35;
+ rel2.relative: 0.65 0.65;
}
}
}
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
