diff --git a/16c3/__init__.py b/16c3/__init__.py index fd159a5..07d4ab2 100644 --- a/16c3/__init__.py +++ b/16c3/__init__.py @@ -13,15 +13,6 @@ titlemap = { # } -def bounce(i, min, max, frames): - if i == frames - 1: - return 0 - - if i <= frames/2: - return easeInOutQuad(i, min, max, frames/2) - else: - return max - easeInOutQuad(i - frames/2, min, max, frames/2) - def introFrames(parameters): move=50 @@ -29,8 +20,9 @@ def introFrames(parameters): frames = 3*fps for i in range(0, frames): yield ( + ('logo', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)), ('textblock', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)), - ('textblock', 'attr', 'transform', 'translate(%.4f, 0)' % easeOutQuad(i, -move, move, frames)), + ('textblock', 'attr', 'transform', 'translate(%.4f, 0)' % easeOutQuad(i, -move/2, move/2, frames)), ) # 2 Sekunden stehen lassen @@ -47,18 +39,7 @@ def introFrames(parameters): ) def pauseFrames(parameters): - frames = 25*3 - for i in range(0, frames): - yield ( - ('pause', 'attr', 'flood-opacity', '%.4f' % bounce(i, 0.0, 1.0, frames)), - ) - - frames = 25*1 - for i in range(0, frames): - yield ( - ('glowFlood', 'attr', 'flood-opacity', '%.4f' % 0), - ) - + pass def outroFrames(p): # 5 Sekunden stehen bleiben @@ -94,10 +75,9 @@ def tasks(queue, args, idlist, skiplist): # iterate over all events extracted from the schedule xml-export for event in events(scheduleUrl): - if len(args) > 0: - if not str(event['id']) in args: - continue - +# if len(args) > 0: +# if not str(event['id']) in args: +# continue # generate a task description and put it into the queue queue.put(Rendertask( infile = 'intro.svg', diff --git a/16c3/artwork/intro.svg b/16c3/artwork/intro.svg index e436452..a6b5f1e 100644 --- a/16c3/artwork/intro.svg +++ b/16c3/artwork/intro.svg @@ -26,9 +26,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.98994949" - inkscape:cx="411.85731" - inkscape:cy="310.25482" + inkscape:zoom="0.7" + inkscape:cx="625.98717" + inkscape:cy="489.17927" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -67,29 +67,37 @@ id="layer1" transform="translate(0,-476.36216)"> + width="721.24872" + height="576.29181" + x="0.00011397823" + y="476.07022" /> + id="logo" + transform="translate(-79.671342,81.766339)" + style="opacity:1"> + id="g4360" + style=""> + id="g4352" + style=""> + id="g4345" + style=""> + id="g4339" + style=""> + id="g4334" + style=""> + id="g4330" + style=""> + id="g4327" + style=""> + width="250" + style="" /> @@ -256,20 +265,7 @@ nUIJAVToFEoIoEKnUEIAFTqFEgL+H0t9h22HcyP2AAAAAElFTkSuQmCC height="44.446712" x="569.72601" y="521.45178" />C# #$id C# + width="721.5011" + height="577.04926" + x="-0.98964989" + y="475.81778" />