From e59e4d647140b6ed0028ab169d40bc9292287b3d Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Thu, 7 Jun 2018 22:18:25 +0200
Subject: [PATCH] lac18: Add fade-in animation

---
 lac18/__init__.py       | 65 +++++++++++++----------------------------
 lac18/artwork/intro.svg |  8 ++---
 2 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/lac18/__init__.py b/lac18/__init__.py
index da6db80..644d870 100644
--- a/lac18/__init__.py
+++ b/lac18/__init__.py
@@ -16,11 +16,11 @@ def bounce(i, min, max, frames):
         return max - easeInOutQuad(i - frames/2, min, max, frames/2)
 
 def introFrames(parameters):
-    # 3 Sekunde Text Fadein
+    # 1 Sekunde Text Fadein
     frames = 1*fps
     for i in range(0, frames):
         yield (
-            ('textblock', 'style',    'opacity', "%.4f" % easeLinear(i, 0, 1, frames)),
+            ('text', 'style',    'opacity', "%.4f" % easeLinear(i, 0, 1, frames)),
         )
 
     # 4 Sekunden stehen lassen
@@ -28,31 +28,6 @@ def introFrames(parameters):
     for i in range(0, frames):
         yield ()
 
-    # 1 Sekunde Fade to black layer
-    frames = 1*fps
-    for i in range(0, frames):
-        yield (
-            ('fadeout', 'style',    'opacity', "%.4f" % easeLinear(i, 0, 1, frames)),
-        )
-
-def pauseFrames(parameters):
-    frames = 3*fps
-    colors = ['#21A4D4', '#73BA25', '#6DA741', '#35B9AB', '#00A489', '#173F4F']
-    yield (
-        ('pause_bg', 'style', 'fill', "%s" % '#173F4F'),
-        ('pause_bg', 'attr', 'opacity', '%.4f' % 1.0),
-    )
-    for i in range(0, len(colors)):
-        z = 0
-        for z in range(0,frames):
-            yield (
-                ('pause_bg_alt', 'style', 'fill', "%s" % colors[i]),
-                ('pause_bg_alt', 'attr', 'opacity', '%.4f' % easeLinear(z, 0.0, 1.0, frames)),
-            )
-        yield (
-            ('pause_bg', 'style', 'fill', "%s" % colors[i]),
-            ('pause_bg', 'attr', 'opacity', '%.4f' % 1.0),
-        )
 
 def outroFrames(p):
     # 5 Sekunden stehen bleiben
@@ -61,30 +36,30 @@ def outroFrames(p):
         yield []
 
 def debug():
-#    render(
-#      'intro.svg',
-#      '../intro.ts',
-#      introFrames,
-#      {
-#          '$ID': 4711,
-#          '$TITLE': "Long Long Long title is LONG",
-#          '$SUBTITLE': 'Long Long Long Long subtitle is LONGER',
-#          '$SPEAKER': 'Long Name of Dr. Dr. Prof. Dr. Long Long'
-#      }
-#    )
-#
     render(
-        'pause.svg',
-        '../pause.ts',
-        pauseFrames
+      'intro.svg',
+      '../intro.ts',
+      introFrames,
+      {
+          '$ID': 4711,
+          '$TITLE': "Long Long Long title is LONG",
+          '$SUBTITLE': 'Long Long Long Long subtitle is LONGER',
+          '$SPEAKER': 'Long Name of Dr. Dr. Prof. Dr. Long Long'
+      }
     )
 
 #    render(
-#      'outro.svg',
-#      '../outro.ts',
-#      outroFrames
+#        'pause.svg',
+#        '../pause.ts',
+#        pauseFrames
 #    )
 #
+    render(
+      'outro.svg',
+      '../outro.ts',
+      outroFrames
+    )
+
 def tasks(queue, args, idlist, skiplist):
     # iterate over all events extracted from the schedule xml-export
     for event in events(scheduleUrl):
diff --git a/lac18/artwork/intro.svg b/lac18/artwork/intro.svg
index e484044..835ed8f 100644
--- a/lac18/artwork/intro.svg
+++ b/lac18/artwork/intro.svg
@@ -181,15 +181,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.49497475"
-     inkscape:cx="-365.72277"
+     inkscape:cx="955.81961"
      inkscape:cy="626.11187"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1916"
-     inkscape:window-height="1023"
+     inkscape:window-height="1040"
      inkscape:window-x="0"
-     inkscape:window-y="36"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -274,7 +274,7 @@
        id="text"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0.01%;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
        transform="translate(0,103.63782)"
-       inkscape:label="#flowRoot3029"><flowRegion
+       inkscape:label="#text"><flowRegion
          id="flowRegion3031"><rect
            ry="0"
            id="rect3033"