diff --git a/foss4g-2016/__init__.py b/foss4g-2016/__init__.py
index acd0ffb..fedac63 100644
--- a/foss4g-2016/__init__.py
+++ b/foss4g-2016/__init__.py
@@ -70,23 +70,51 @@ def outroFrames(p):
('g3', 'style', 'opacity', "%.4f" % 1),
)
+def pauseFrames(p):
+ # 3 Sekunden animation bleiben
+
+ for nr in range(0, 3):
+ # 10 sekunden sehen
+ frames = 3*fps
+ for i in range(0, frames):
+ yield (
+ ('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),
+ )
+
+ # 1 sekunde faden
+ frames = 2*fps
+ for i in range(0, frames):
+ yield (
+ ('image%u' % ((nr+0)%3), 'style', 'opacity', "%.4f" % easeLinear(i, 1, -1, frames)),
+ ('image%u' % ((nr+1)%3), 'style', 'opacity', "%.4f" % easeLinear(i, 0, +1, frames)),
+ ('image%u' % ((nr+2)%3), 'style', 'opacity', "%.4f" % 0),
+ )
+
def debug():
- render(
- 'intro.svg',
- '../intro.ts',
- introFrames,
- {
- '$id': 65,
- '$title': 'Passwort, Karte oder Gesicht',
- '$subtitle': 'zur Sicherheit von Authentifizierungssystemen',
- '$personnames': 'starbug'
- }
- )
+ # render(
+ # 'intro.svg',
+ # '../intro.ts',
+ # introFrames,
+ # {
+ # '$id': 65,
+ # '$title': 'Passwort, Karte oder Gesicht',
+ # '$subtitle': 'zur Sicherheit von Authentifizierungssystemen',
+ # '$personnames': 'starbug'
+ # }
+ # )
+
+ # render(
+ # 'outro.svg',
+ # '../outro.ts',
+ # outroFrames
+ # )
render(
- 'outro.svg',
- '../outro.ts',
- outroFrames
+ 'pause.svg',
+ '../pause.ts',
+ pauseFrames
)
def tasks(queue, args):
diff --git a/foss4g-2016/artwork/Panorama-v-Stadthaus-2013-02.jpg b/foss4g-2016/artwork/Panorama-v-Stadthaus-2013-02.jpg
new file mode 100644
index 0000000..52abe6d
Binary files /dev/null and b/foss4g-2016/artwork/Panorama-v-Stadthaus-2013-02.jpg differ
diff --git a/foss4g-2016/artwork/outro.svg b/foss4g-2016/artwork/outro.svg
index 4973e8c..54ff7af 100644
--- a/foss4g-2016/artwork/outro.svg
+++ b/foss4g-2016/artwork/outro.svg
@@ -25,16 +25,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.49497475"
- inkscape:cx="428.58661"
- inkscape:cy="336.54291"
+ inkscape:zoom="1.4"
+ inkscape:cx="874.56464"
+ inkscape:cy="88.823033"
inkscape:document-units="px"
- inkscape:current-layer="layer2"
+ inkscape:current-layer="g3"
showgrid="false"
units="px"
showguides="true"
inkscape:window-width="1920"
- inkscape:window-height="1016"
+ inkscape:window-height="1021"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
@@ -83,18 +83,24 @@
id="guide4690"
inkscape:label=""
inkscape:color="rgb(0,0,255)" />
-
+
+
+
@@ -503,7 +509,7 @@
transform="matrix(0.42793827,0,0,0.42793827,13.580927,631.5475)" />
+ transform="matrix(3.6666668,0,0,3.6666668,740.00005,872.46707)">
+ CC-BY - Deutschland 3.0
diff --git a/foss4g-2016/artwork/pause.svg b/foss4g-2016/artwork/pause.svg
new file mode 100644
index 0000000..ffb49bc
--- /dev/null
+++ b/foss4g-2016/artwork/pause.svg
@@ -0,0 +1,542 @@
+
+
+
+
diff --git a/foss4g-2016/artwork/ship.jpg b/foss4g-2016/artwork/ship.jpg
new file mode 100644
index 0000000..df32b0f
Binary files /dev/null and b/foss4g-2016/artwork/ship.jpg differ