From 764d808b2009cadc778063b647eb0813d1f847e5 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Fri, 31 Jul 2015 19:08:13 +0200 Subject: [PATCH] rearrange text & rocket base --- cccamp15/__init__.py | 31 +- cccamp15/artwork/intro.svg | 1100 +++++++++++++++++++----------------- 2 files changed, 604 insertions(+), 527 deletions(-) diff --git a/cccamp15/__init__.py b/cccamp15/__init__.py index 687ac36..c5c9338 100644 --- a/cccamp15/__init__.py +++ b/cccamp15/__init__.py @@ -15,7 +15,7 @@ def introFrames(parameters): #rnd.seed(title) rnd.seed("blafoo23") - tiles = range(1, 27) + tiles = range(1, 28) targets = {} frames = 5*fps @@ -26,7 +26,7 @@ def introFrames(parameters): maxdelay = max(maxdelay, delay) targets[tile] = ( # x/y - rnd.randint(-1200, -800), + rnd.randint(-1200, -820), rnd.randint(-600, 600), # delay @@ -64,12 +64,37 @@ def introFrames(parameters): placements = [] for tile in tiles: placements.append( - ('g%u' % tile, 'attr', 'transform', 'translate(%.4f, %.4f)' % (0, 0)) + ('g%u' % tile, 'attr', 'transform', 'translate(%.4f, %.4f)' % (0, 0)), ) + placements.extend([ + ('text', 'style', 'opacity', '%.4f' % 1), + ('text', 'attr', 'transform', 'translate(%.4f, 0)' % 0) + ]) + # final frame yield placements + return + + # fly the rocket + dr = 20.000 + dx = 1648.5714 + dy = -1562.8571 + + ox = -111.42858 + oy = 1265.7144 + + frames = 3*fps + for i in range(0, frames): + r = easeLinear(i, 0, dr, frames) + x = easeLinear(i, 0, dx, frames) + y = easeLinear(i, 0, dy, frames) + + yield ( + ('rocket', 'attr', 'transform', 'rotate(%.4f, %.4f, %.4f) translate(%.4f, %.4f)' % (r, ox+x, oy+y, x, y)), + ) + def outroFrames(p): # 5 Sekunden stehen bleiben diff --git a/cccamp15/artwork/intro.svg b/cccamp15/artwork/intro.svg index fac64a9..514a00c 100644 --- a/cccamp15/artwork/intro.svg +++ b/cccamp15/artwork/intro.svg @@ -7,6 +7,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="1920" @@ -26,10 +27,10 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.49497475" - inkscape:cx="668.23183" - inkscape:cy="565.59776" + inkscape:cx="640.65224" + inkscape:cy="633.69474" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="g4867" showgrid="false" inkscape:window-width="1920" inkscape:window-height="1014" @@ -40,17 +41,25 @@ showguides="true" inkscape:guide-bbox="true"> + id="guide3533" + inkscape:label="" + inkscape:color="rgb(0,0,255)" /> + id="guide3537" + inkscape:label="" + inkscape:color="rgb(0,0,255)" /> + + id="guide4487" /> @@ -69,8 +78,18 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,27.637408)"> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSA-Untersuchungsausschuss - Wer kontrolliert wen?A Practical Introduction to Acoustic CryptanalysisFrantisek Algoldor Apfelbeck + width="854.14764" + height="577.59332" + x="947.17649" + y="163.074498" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.50000381px;line-height:100%;font-family:Neris;-inkscape-font-specification:Neris;text-align:center;text-anchor:middle" />#2342HOW NOT TO SEEFNORDSif you don't see the fnord, itcan't eat youalice, bob, carol, eve + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +