From 7b19aa5b2078c8e5f03797382825a913ac5b6322 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 20 Oct 2017 12:48:16 +0200 Subject: [PATCH] asg2017: Improve/fix animations --- asg2017/__init__.py | 79 ++++--- asg2017/artwork/outro.svg | 433 ++++++++++++++++++++------------------ 2 files changed, 279 insertions(+), 233 deletions(-) diff --git a/asg2017/__init__.py b/asg2017/__init__.py index dfbc810..39c9297 100644 --- a/asg2017/__init__.py +++ b/asg2017/__init__.py @@ -45,43 +45,68 @@ def introFrames(parameters): yield [] def pauseFrames(parameters): - frames = 25*3 + frames = 1*fps for i in range(0, frames): yield ( - ('pause', 'attr', 'flood-opacity', '%.4f' % bounce(i, 0.0, 1.0, frames)), + ('pause', 'attr', 'opacity', '%.4f' % easeLinear(i, 0, 1, frames)), + ('details', 'attr', 'opacity', '%.4f' % easeLinear(i, 1, -1, frames)), ) - - frames = 25*1 + frames = 2*fps for i in range(0, frames): yield ( - ('glowFlood', 'attr', 'flood-opacity', '%.4f' % 0), + ('pause', 'attr', 'opacity', '1'), + ('details', 'attr', 'opacity', '0'), + ) + frames = 1*fps + for i in range(0, frames): + yield ( + ('pause', 'attr', 'opacity', '%.4f' % easeLinear(i, 1, -1, frames)), + ('details', 'attr', 'opacity', '%.4f' % easeLinear(i, 0, 1, frames)), + ) + frames = 2*fps + for i in range(0, frames): + yield ( + ('pause', 'attr', 'opacity', '0'), + ('details', 'attr', 'opacity', '1'), ) - def outroFrames(p): # 2 Sekunden stehen bleiben frames = 2*fps for i in range(0, frames): yield ( - ('sponsoredby', 'style', 'opacity', "%.4f" % 1), - ('recordedby', 'style', 'opacity', "%.4f" % 0), + ('sponsoredby', 'style', 'opacity', "1"), + ('recordedby', 'style', 'opacity', "0"), + ('cc', 'style', 'opacity', "0"), ) frames = 1*fps for i in range(0, frames): yield ( - ('sponsoredby', 'style', 'opacity', "%.4f" % easeLinear(i, 1, -1, frames)), - ('recordedby', 'style', 'opacity', "%.4f" % 0), + ('sponsoredby', 'style', 'opacity', "%.4f" % easeInOutQuad(i, 1, -1, frames)), + ('recordedby', 'style', 'opacity', "%.4f" % easeInOutQuad(i, 0, 1, frames)), + ('cc', 'style', 'opacity', "0"), ) frames = 1*fps for i in range(0, frames): yield ( - ('sponsoredby', 'style', 'opacity', "%.4f" % 0), - ('recoededby', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)), + ('sponsoredby', 'style', 'opacity', "0"), + ('recordedby', 'style', 'opacity', "1"), + ('cc', 'style', 'opacity', "0"), ) - frames = 2*fps + frames = 1*fps for i in range(0, frames): - yield [] - + yield ( + ('sponsoredby', 'style', 'opacity', "0"), + ('recordedby', 'style', 'opacity', "%.4f" % easeInOutQuad(i, 1, -1, frames)), + ('cc', 'style', 'opacity', "%.4f" % easeInOutQuad(i, 0, 1, frames)), + ) + frames = 1*fps + for i in range(0, frames): + yield ( + ('sponsoredby', 'style', 'opacity', "0"), + ('recordedby', 'style', 'opacity', "0"), + ('cc', 'style', 'opacity', "1"), + ) def backgroundFrames(parameters): return @@ -106,24 +131,24 @@ def backgroundFrames(parameters): ) def debug(): - render( - 'intro.svg', - '../intro.ts', - introFrames, - { - '$ID': 4711, - '$TITLE': "Long Long Long title is LONG", - '$COMPANY': 'Long Running Co', - '$SPEAKER': 'Dr. Dr. Prof. Dr. Long Long' - } - ) +# render( +# 'intro.svg', +# '../intro.ts', +# introFrames, +# { +# '$ID': 4711, +# '$TITLE': "Long Long Long title is LONG", +# '$COMPANY': 'Long Running Co', +# '$SPEAKER': 'Dr. Dr. Prof. Dr. Long Long' +# } +# ) # render( # 'pause.svg', # '../pause.ts', # pauseFrames # ) -# + render( 'outro.svg', '../outro.ts', diff --git a/asg2017/artwork/outro.svg b/asg2017/artwork/outro.svg index feedd6e..76b6285 100644 --- a/asg2017/artwork/outro.svg +++ b/asg2017/artwork/outro.svg @@ -74,9 +74,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.7" - inkscape:cx="1014.9289" - inkscape:cy="184.59441" + inkscape:zoom="3.959798" + inkscape:cx="717.30067" + inkscape:cy="67.703085" inkscape:document-units="px" inkscape:current-layer="g5787" showgrid="false" @@ -85,7 +85,18 @@ inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + showguides="true" + inkscape:guide-bbox="true"> + + + @@ -352,110 +363,6 @@ y="0" x="0 24.309 40.367001 56.424999 79.846001 98.235001 108.78 124.061 139.342 161.69 172.97501 184.25999 196.174 214.563 235.616 254.005 270.06299 291.92999 328.26401 346.65302 358.56699 379.47198 402.375 412.92001 424.20499">https://all-systems-go.io - - - R - - - ECORDED - - - BY - - - : - - - - - - - - - - - www.c3voc.de - - @@ -876,108 +783,222 @@ - - R - - - ECORDED - - - BY - - - : - + id="recordedby" + style="opacity:1"> + transform="matrix(0.89056662,0,0,0.89056662,86.164111,12.885503)" + id="g7240" + style=""> - - - - - - - - + + + + + + + + + www.c3voc.de + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.13311577px;line-height:125%;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:1;fill:#000000;fill-opacity:1;stroke:none" + xml:space="preserve">www.c3voc.de + + + + + R + + + ECORDED + + + BY + + + : + + + R + + + ECORDED + + + BY + + + : + + + + + + + + + + + + + + +