diff --git a/emf2016/.DS_Store b/emf2016/.DS_Store
index 32e1b54..1bbff26 100644
Binary files a/emf2016/.DS_Store and b/emf2016/.DS_Store differ
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 07edd3e..e3ee571 100644
Binary files a/emf2016/artwork/.DS_Store and b/emf2016/artwork/.DS_Store differ
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