diff --git a/demo/images/circle.png b/demo/images/circle.png new file mode 100644 index 0000000..4c3ce9f --- /dev/null +++ b/demo/images/circle.png diff --git a/demo/scripts/choreography.json b/demo/scripts/choreography.json new file mode 100644 index 0000000..b5afe45 --- /dev/null +++ b/demo/scripts/choreography.json @@ -0,0 +1,703 @@ +{ + "templates": + { + "circle-control": + { + "type": "ImageActor", + "inherit-position": true, + "size": [ + 70, + 70, + 1 + ], + "color": [ + 0.85, + 0.75, + 0.45, + 1 + ], + "image": { + "filename": "{DALI_IMAGE_DIR}circle.png" + } + }, + "rectangle-control": + { + "type": "Control", + "size": [ + 60, + 60, + 1 + ], + "background-color": [ + 0.95, + 0.41, + 0.18, + 1 + ], + "color-alpha": 0 + } + }, + "stage": [ + { + "type": "Control", + "actors": [], + "name": "topContainer", + "position": [ + 180, + 105, + 0 + ], + "inherit-position": true, + "size": [ + 20, + 20, + 1 + ], + "sizeAspectRatio": false, + "background-color": [ + 0.85, + 0.75, + 0.45, + 1 + ], + "color-alpha": 0 + }, + { + "type": "circle-control", + "name": "Circle1", + "position": [ + 84, + 198, + -1 + ], + "signals": [ + { + "name": "touched", + "action": "play", + "animation": "Animation_1" + } + ] + }, + { + "type": "circle-control", + "name": "Circle2", + "position": [ + 151, + 198, + -1 + ] + }, + { + "type": "circle-control", + "name": "Circle3", + "position": [ + 285, + 198, + -1 + ] + }, + { + "type": "circle-control", + "name": "Circle4", + "position": [ + 218, + 198, + -1 + ] + }, + { + "type": "rectangle-control", + "name": "Rect1", + "position": [ + 50, + 292, + 0 + ] + }, + { + "type": "rectangle-control", + "name": "Rect2", + "position": [ + 120, + 292, + 0 + ] + }, + { + "type": "rectangle-control", + "name": "Rect3", + "position": [ + 190, + 292, + 0 + ] + }, + { + "type": "rectangle-control", + "name": "Rect4", + "position": [ + 260, + 292, + 0 + ] + } + ], + "animations": { + "Animation_1": { + "properties": [ + { + "actor": "Circle1", + "property": "position", + "value": [ + 84, + 198, + -1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#d3e7fc" + }, + { + "actor": "Circle1", + "property": "position", + "value": [ + 130, + 190, + -1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.05 + }, + "timelineColor": "#d3e7fc" + }, + { + "actor": "Circle1", + "property": "position", + "value": [ + 150, + 170, + -1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.05, + "duration": 0.05 + }, + "timelineColor": "#d3e7fc" + }, + { + "actor": "Circle1", + "property": "position", + "value": [ + 160, + 150, + -1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.1, + "duration": 0.051 + }, + "timelineColor": "#d3e7fc" + }, + { + "actor": "Circle1", + "property": "position", + "value": [ + 170, + 125, + -1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.151, + "duration": 0.049 + }, + "timelineColor": "#d3e7fc" + }, + { + "actor": "Circle1", + "property": "position", + "value": [ + 180, + 100, + -1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.2, + "duration": 0.051 + }, + "timelineColor": "#d3e7fc" + }, + { + "actor": "Circle1", + "property": "size", + "value": [ + 70, + 70, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#d3e7fc" + }, + { + "actor": "Circle1", + "property": "size", + "value": [ + 20, + 20, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.151, + "duration": 0.1 + }, + "timelineColor": "#d3e7fc" + }, + { + "actor": "Circle2", + "property": "scale", + "value": [ + 1, + 1, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#ec9685" + }, + { + "actor": "Circle2", + "property": "scale", + "value": [ + 0.1, + 0.1, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.325 + }, + "timelineColor": "#ec9685" + }, + { + "actor": "Circle4", + "property": "scale", + "value": [ + 1, + 1, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#b28798" + }, + { + "actor": "Circle4", + "property": "scale", + "value": [ + 0.1, + 0.1, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.049, + "duration": 0.301 + }, + "timelineColor": "#b28798" + }, + { + "actor": "Circle3", + "property": "scale", + "value": [ + 1, + 1, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#dedcc4" + }, + { + "actor": "Circle3", + "property": "scale", + "value": [ + 0.1, + 0.1, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.1, + "duration": 0.272 + }, + "timelineColor": "#dedcc4" + }, + { + "actor": "topContainer", + "property": "size", + "value": [ + 20, + 20, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#acfc99" + }, + { + "actor": "topContainer", + "property": "size", + "value": [ + 360, + 210, + 1 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.227, + "duration": 0.122 + }, + "timelineColor": "#acfc99" + }, + { + "actor": "topContainer", + "property": "color-alpha", + "value": 0, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#acfc99" + }, + { + "actor": "topContainer", + "property": "color-alpha", + "value": 1, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.101, + "duration": 0.249 + }, + "timelineColor": "#acfc99" + }, + { + "actor": "Rect1", + "property": "position", + "value": [ + 50, + 280, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.1, + "duration": 0.075 + }, + "timelineColor": "#8c9ab4" + }, + { + "actor": "Rect1", + "property": "position", + "value": [ + 70, + 260, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.175, + "duration": 0.075 + }, + "timelineColor": "#8c9ab4" + }, + { + "actor": "Rect1", + "property": "position", + "value": [ + 75, + 250, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.25, + "duration": 0.075 + }, + "timelineColor": "#8c9ab4" + }, + { + "actor": "Rect1", + "property": "color-alpha", + "value": 0, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#8c9ab4" + }, + { + "actor": "Rect1", + "property": "color-alpha", + "value": 1, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.325 + }, + "timelineColor": "#8c9ab4" + }, + { + "actor": "Rect2", + "property": "position", + "value": [ + 120, + 280, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.148, + "duration": 0.077 + }, + "timelineColor": "#e8f4c7" + }, + { + "actor": "Rect2", + "property": "position", + "value": [ + 140, + 260, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.225, + "duration": 0.075 + }, + "timelineColor": "#e8f4c7" + }, + { + "actor": "Rect2", + "property": "position", + "value": [ + 145, + 250, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.3, + "duration": 0.072 + }, + "timelineColor": "#e8f4c7" + }, + { + "actor": "Rect2", + "property": "color-alpha", + "value": 0, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#e8f4c7" + }, + { + "actor": "Rect2", + "property": "color-alpha", + "value": 1, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.05, + "duration": 0.322 + }, + "timelineColor": "#e8f4c7" + }, + { + "actor": "Rect3", + "property": "position", + "value": [ + 190, + 280, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.2, + "duration": 0.074 + }, + "timelineColor": "#f39db5" + }, + { + "actor": "Rect3", + "property": "position", + "value": [ + 210, + 260, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.274, + "duration": 0.073 + }, + "timelineColor": "#f39db5" + }, + { + "actor": "Rect3", + "property": "position", + "value": [ + 215, + 250, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.347, + "duration": 0.078 + }, + "timelineColor": "#f39db5" + }, + { + "actor": "Rect3", + "property": "color-alpha", + "value": 0, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#f39db5" + }, + { + "actor": "Rect3", + "property": "color-alpha", + "value": 1, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.099, + "duration": 0.326 + }, + "timelineColor": "#f39db5" + }, + { + "actor": "Rect4", + "property": "position", + "value": [ + 260, + 280, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.251, + "duration": 0.075 + }, + "timelineColor": "#a99ec0" + }, + { + "actor": "Rect4", + "property": "position", + "value": [ + 280, + 260, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.326, + "duration": 0.074 + }, + "timelineColor": "#a99ec0" + }, + { + "actor": "Rect4", + "property": "position", + "value": [ + 285, + 250, + 0 + ], + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.4, + "duration": 0.075 + }, + "timelineColor": "#a99ec0" + }, + { + "actor": "Rect4", + "property": "color-alpha", + "value": 0, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0, + "duration": 0.025 + }, + "timelineColor": "#a99ec0" + }, + { + "actor": "Rect4", + "property": "color-alpha", + "value": 1, + "alpha-function": "LINEAR", + "time-period": { + "delay": 0.148, + "duration": 0.327 + }, + "timelineColor": "#a99ec0" + } + ], + "page": "" + } + }, + "connections": { + "Named_conn_1": { + "id": "_191kt3qlr075", + "name": "Named_conn_1", + "target": { + "type": "animation", + "name": "Animation_1", + "action": "play" + }, + "sources": [ + "Circle1" + ], + "signal": "click" + } + }, + "constants": {}, + "styles": {}, + "deviceHeight": 430, + "deviceWidth": 360, + "deviceOrientation": "portrait", + "version": "781" +} diff --git a/demo/scripts/timing.json b/demo/scripts/timing.json index dcb3248..74344c3 100644 --- a/demo/scripts/timing.json +++ b/demo/scripts/timing.json @@ -104,7 +104,7 @@ ], "signals": [ { - "name": "touched", + "name": "tapped", "action": "play", "animation": "Animation_1" }