From c860483071cca6d4ab88f49a2974d85894c49c38 Mon Sep 17 00:00:00 2001 From: Matt Gray Date: Sun, 31 Jul 2016 16:31:30 +0100 Subject: [PATCH] updated emf2016 artwork --- emf2016/.DS_Store | Bin 6148 -> 6148 bytes emf2016/__init__.py | 62 +++++++++++++------------------------- emf2016/artwork/.DS_Store | Bin 6148 -> 8196 bytes emf2016/artwork/intro.svg | 55 +++++++++++++++++++-------------- 4 files changed, 53 insertions(+), 64 deletions(-) diff --git a/emf2016/.DS_Store b/emf2016/.DS_Store index 32e1b5413b6e3602f1fbc0581c60b14d50ca2efc..1bbff26044a86c1a191d57182b2a57957349480f 100644 GIT binary patch delta 121 zcmZoMXfc@JFUrioz`)4BAi%(o%#aAg84Rfm@tX~qmoqAZq_`R4fv|v~5?PudKBYK0 zCn-NaXEHa_84fd3Qym2(Q_IQsncOAVfu-iOY-*~bU~FVOnTgqb Sa|-ifmWd5^o7p-3@&f?o@etVn diff --git a/emf2016/__init__.py b/emf2016/__init__.py index 63a88c3..3d01b77 100644 --- a/emf2016/__init__.py +++ b/emf2016/__init__.py @@ -15,43 +15,23 @@ def introFrames(p): nr = p['$id']; - # five initial frames - for i in range(0, 5): - yield ( - ('text', 'style', 'opacity', "%.4f" % 0), - ('text', 'attr', 'transform', 'translate(%.4f, 0)' % -move), - ('image%u' % ((nr+0)%3), 'style', 'opacity', "%.4f" % 1), - ('image%u' % ((nr+1)%3), 'style', 'opacity', "%.4f" % 0), - ('image%u' % ((nr+2)%3), 'style', 'opacity', "%.4f" % 0), - ) - - # 3 Sekunde Text Fadein - frames = 3*fps - for i in range(0, frames): - yield ( - ('text', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)), - ('text', 'attr', 'transform', 'translate(%.4f, 0)' % easeOutQuad(i, move, -move, frames)), - ) - - # 2 Sekunden stehen lassen - frames = 2*fps + # Hold still + frames = 5*fps for i in range(0, frames): yield () - # 3 Sekunde Text Fadeout - frames = 3*fps + # 1s fade out + frames = 1*fps for i in range(0, frames): yield ( ('text', 'style', 'opacity', "%.4f" % easeLinear(i, 1, -1, frames)), - ('text', 'attr', 'transform', 'translate(%.4f, 0)' % easeInQuad(i, 0, -move, frames)), ) - # two final frames - for i in range(0, 2): + # final frames + for i in range(0,5): yield ( ('text', 'style', 'opacity', "%.4f" % 0), - ('text', 'attr', 'transform', 'translate(%.4f, 0)' % move), ) def outroFrames(p): @@ -111,24 +91,24 @@ def debug(): '../intro.ts', introFrames, { - '$id': 65, - '$title': 'Passwort, Karte oder Gesicht', - '$subtitle': 'zur Sicherheit von Authentifizierungssystemen', - '$personnames': 'starbug' + '$id': 69, + '$title': 'How To Make "Your Mum" Jokes Successfully', + '$subtitle': 'But not necessarily tastefully', + '$personnames': 'Matt Gray' } ) - render( - 'outro.svg', - '../outro.ts', - outroFrames - ) - - render( - 'pause.svg', - '../pause.ts', - pauseFrames - ) +# render( +# 'outro.svg', +# '../outro.ts', +# outroFrames +# ) +# +# render( +# 'pause.svg', +# '../pause.ts', +# pauseFrames +# ) def tasks(queue, args): # iterate over all events extracted from the schedule xml-export diff --git a/emf2016/artwork/.DS_Store b/emf2016/artwork/.DS_Store index 07edd3ee8ca173ba193d3d022cd6f42de4434299..e3ee571c1971fa33be375e65f00b5676e1ddfcc8 100644 GIT binary patch literal 8196 zcmeHMU2GIp6h2>D=&T*vX+dcRn%!C{zd}KXvOA%YrN?Y0@q21jXWWwyuy0hIP z8r?TF21tw##0ZH&V+8*m6#RK3J{XBlR{V)EJ{S{U^g*LO_~5zs&Nj%>H={)6Cii@E z@44sRyWjnGX3s1Up?AjGMAS?~8drfv9h>VE;TN@{R0TcNjNo{p4B6znesMVER*Vii zLIy$xLIy$xLIy$xZUhGSnJtR8z;j=DLmM&>GH_EeAnp$_t^(r$mK4fc2OF6JFxGIl zEPTy*fQ*R+7!RiXg>+3TJ;z3}=i7SW>9M2`Zcrtc)N-fn1&AVsbbk zt}wJA10e&I42aylmNw8K%2V>{{M}3OxBEmY=Q@6&v-4|IRo5(9T&qQHsnc&Yd;1bg z^!_QMsp#0VL%D+EW&M42-e;UL8vMiF?C!Le9nRarKc4p7nM~H7G8)rKH$CGf3wDp| zjyT6`?rZSVdCzr+J>L=2OimQ+qXprsa82y@y?mihPBvv2Grqmo=DD1ro!}Y$35S;y zfd(Sy>X)sEtz5ft%eL)v4MtwVDa30JWIq`#=DyGw6>V$L&DRSx7k{nCIi~;F!fPiY#|v8 z>{zAiqeq;qW%$9Q>(=Y$n43)5u3<$~Sm!3)94{*RjDetY>r&mENPC$KZ`u#~y1GsC zpjdV==@*7_c9ysFF|XZZG&YzmW?a)Ig}2ADcuVc^v*+Y_x5rnjb8jynf22L$8C+}B zN}DM`gEY+wc#MwIDLPN@&;`0km*_HGp>OC1`iXv_-{^Px13*0tG@=R1u?nlP2AgpY zy3mb#k-%;YU=Vw-4+n4%Q<#Q>N8qD?89aff@HC#mb9f17@iJb)n|KRv;{$w%kMJq3 z;0v{FHwVF%0QmfBjU#rpnUH3QW58Sv~{i#z=g?D489yJz8EsN%stsGe+)h?P{-RxZ~MJ<~5?ck|2saesi z>xk-FkYJ0pass@*bL-n}NRo%D|c= delta 133 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGqg=C6q~50D9Q+A12Ir6har)nlA$=II5}rx zp*kbu<}A^7Ah diff --git a/emf2016/artwork/intro.svg b/emf2016/artwork/intro.svg index dfcb761..8d33db6 100644 --- a/emf2016/artwork/intro.svg +++ b/emf2016/artwork/intro.svg @@ -27,10 +27,10 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.54374781" - inkscape:cx="961.8177" + inkscape:cx="1033.9414" inkscape:cy="528.4333" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer2" showgrid="false" inkscape:window-width="1440" inkscape:window-height="803" @@ -81,10 +81,11 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,27.637408)"> + transform="translate(0,27.637408)" + sodipodi:insensitive="true"> + transform="matrix(1.4553101,0,0,1.4553101,25.480246,44.431864)"> - $title$subtitle$personnames + + $title$subtitle$personnames