diff --git a/emf2016/.DS_Store b/emf2016/.DS_Store index 1bbff26..e110bfb 100644 Binary files a/emf2016/.DS_Store and b/emf2016/.DS_Store differ diff --git a/emf2016/__init__.py b/emf2016/__init__.py index 3d01b77..cda51e3 100644 --- a/emf2016/__init__.py +++ b/emf2016/__init__.py @@ -6,9 +6,7 @@ from easing import * # URL to Schedule-XML scheduleUrl = 'https://www.emfcamp.org/schedule.frab' -titlemap = { - 1533: "Building applications with FOSS4G bricks" -} +titlemap = {} def introFrames(p): move=50 @@ -16,74 +14,58 @@ def introFrames(p): nr = p['$id']; - # Hold still + # Show Title frames = 5*fps for i in range(0, frames): - yield () + yield ( + ('sponsors', 'style', 'opacity', 0), + ('white', 'style', 'opacity', 0), + ) - # 1s fade out - frames = 1*fps + # Fade In Sponsor + frames = int(fps/2) for i in range(0, frames): yield ( - ('text', 'style', 'opacity', "%.4f" % easeLinear(i, 1, -1, frames)), + ('white', 'style', 'opacity', easeLinear(i, 0, 1, frames)), + ('sponsors', 'style', 'opacity', 0), + ('text', 'style', 'opacity', easeLinear(i, 1, 0, frames)), + ('bg', 'style', 'opacity', easeLinear(i, 1, 0, frames)), + ) + + frames = int(fps/2) + for i in range(0, frames): + yield ( + ('white', 'style', 'opacity', 1), + ('sponsors', 'style', 'opacity', easeLinear(i, 0, 1, frames)), + ('text', 'style', 'opacity', 0), + ('bg', 'style', 'opacity',0), + ) + + # Show Sponsor + frames = 5*fps + for i in range(0, frames): + yield ( + ('white', 'style', 'opacity', 1), + ('sponsors', 'style', 'opacity', 1), + ('text', 'style', 'visibility', 0), + ('bg', 'style', 'visibility', 0), ) - # final frames - for i in range(0,5): - yield ( - ('text', 'style', 'opacity', "%.4f" % 0), - ) + def outroFrames(p): - # 3 Sekunden animation bleiben + # hold slide for 5s frames = 5*fps - - # five initial frames - for i in range(0, 5): - yield ( - ('g1', 'style', 'opacity', "%.4f" % 0), - ('g2', 'style', 'opacity', "%.4f" % 0), - ('g3', 'style', 'opacity', "%.4f" % 0), - ) - - # 3 Sekunden - frames = 6*fps for i in range(0, frames): yield ( - ('g1', 'style', 'opacity', "%.4f" % easeDelay(easeLinear, 0*fps, i, 0, 1, 4*fps)), - ('g2', 'style', 'opacity', "%.4f" % easeDelay(easeLinear, 1*fps, i, 0, 1, 4*fps)), - ('g3', 'style', 'opacity', "%.4f" % easeDelay(easeLinear, 2*fps, i, 0, 1, 4*fps)), - ) - - # five final frames - for i in range(0, 5): - yield ( - ('g1', 'style', 'opacity', "%.4f" % 1), - ('g2', 'style', 'opacity', "%.4f" % 1), - ('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), - ) + # hold slide for 5s + frames = 5*fps + for i in range(0, frames): + yield ( + ) def debug(): render( @@ -98,17 +80,17 @@ def debug(): } ) -# 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 e3ee571..fbd0f94 100644 Binary files a/emf2016/artwork/.DS_Store and b/emf2016/artwork/.DS_Store differ diff --git a/emf2016/artwork/ElectromagneticField2016-Logos-13-crop.png b/emf2016/artwork/ElectromagneticField2016-Logos-13-crop.png new file mode 100644 index 0000000..cdb8b42 Binary files /dev/null and b/emf2016/artwork/ElectromagneticField2016-Logos-13-crop.png differ diff --git a/emf2016/artwork/Logo-OnBackgroundImage.jpg b/emf2016/artwork/Logo-OnBackgroundImage.jpg new file mode 100644 index 0000000..1bf4788 Binary files /dev/null and b/emf2016/artwork/Logo-OnBackgroundImage.jpg differ diff --git a/emf2016/artwork/overlays/.DS_Store b/emf2016/artwork/Sponsor Logos/.DS_Store similarity index 69% rename from emf2016/artwork/overlays/.DS_Store rename to emf2016/artwork/Sponsor Logos/.DS_Store index 5008ddf..de531a7 100644 Binary files a/emf2016/artwork/overlays/.DS_Store and b/emf2016/artwork/Sponsor Logos/.DS_Store differ diff --git "a/emf2016/artwork/Sponsor Logos/1 Gold/Icon\r" "b/emf2016/artwork/Sponsor Logos/1 Gold/Icon\r" new file mode 100644 index 0000000..e69de29 diff --git a/emf2016/artwork/Sponsor Logos/1 Gold/mathworks.jpg b/emf2016/artwork/Sponsor Logos/1 Gold/mathworks.jpg new file mode 100644 index 0000000..749142a Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/1 Gold/mathworks.jpg differ diff --git a/emf2016/artwork/Sponsor Logos/1 Gold/microsoft.jpg b/emf2016/artwork/Sponsor Logos/1 Gold/microsoft.jpg new file mode 100644 index 0000000..729d0e1 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/1 Gold/microsoft.jpg differ diff --git a/emf2016/artwork/Sponsor Logos/1 Gold/nexmo.png b/emf2016/artwork/Sponsor Logos/1 Gold/nexmo.png new file mode 100644 index 0000000..5514876 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/1 Gold/nexmo.png differ diff --git a/emf2016/artwork/Sponsor Logos/1 Gold/spotify.png b/emf2016/artwork/Sponsor Logos/1 Gold/spotify.png new file mode 100644 index 0000000..3542e5e Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/1 Gold/spotify.png differ diff --git a/emf2016/artwork/Sponsor Logos/1 Gold/ucl.png b/emf2016/artwork/Sponsor Logos/1 Gold/ucl.png new file mode 100644 index 0000000..3c1e0c9 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/1 Gold/ucl.png differ diff --git "a/emf2016/artwork/Sponsor Logos/2 Badge/Icon\r" "b/emf2016/artwork/Sponsor Logos/2 Badge/Icon\r" new file mode 100644 index 0000000..e69de29 diff --git a/emf2016/artwork/Sponsor Logos/2 Badge/getsmarterenergy.png b/emf2016/artwork/Sponsor Logos/2 Badge/getsmarterenergy.png new file mode 100644 index 0000000..b3c4a52 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/2 Badge/getsmarterenergy.png differ diff --git a/emf2016/artwork/Sponsor Logos/2 Badge/hcd.jpg b/emf2016/artwork/Sponsor Logos/2 Badge/hcd.jpg new file mode 100644 index 0000000..59b873d Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/2 Badge/hcd.jpg differ diff --git a/emf2016/artwork/Sponsor Logos/2 Badge/rs.png b/emf2016/artwork/Sponsor Logos/2 Badge/rs.png new file mode 100644 index 0000000..8084b35 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/2 Badge/rs.png differ diff --git a/emf2016/artwork/Sponsor Logos/2 Badge/st.png b/emf2016/artwork/Sponsor Logos/2 Badge/st.png new file mode 100644 index 0000000..a4a73da Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/2 Badge/st.png differ diff --git a/emf2016/artwork/Sponsor Logos/2 Badge/ti.png b/emf2016/artwork/Sponsor Logos/2 Badge/ti.png new file mode 100644 index 0000000..82e0592 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/2 Badge/ti.png differ diff --git a/emf2016/artwork/Sponsor Logos/2 Badge/wurth.jpg b/emf2016/artwork/Sponsor Logos/2 Badge/wurth.jpg new file mode 100644 index 0000000..c8bd298 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/2 Badge/wurth.jpg differ diff --git "a/emf2016/artwork/Sponsor Logos/3 Silver/Icon\r" "b/emf2016/artwork/Sponsor Logos/3 Silver/Icon\r" new file mode 100644 index 0000000..e69de29 diff --git a/emf2016/artwork/Sponsor Logos/3 Silver/heartinternet.png b/emf2016/artwork/Sponsor Logos/3 Silver/heartinternet.png new file mode 100644 index 0000000..4c56459 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/3 Silver/heartinternet.png differ diff --git a/emf2016/artwork/Sponsor Logos/3 Silver/portcullis.jpg b/emf2016/artwork/Sponsor Logos/3 Silver/portcullis.jpg new file mode 100644 index 0000000..fb36cad Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/3 Silver/portcullis.jpg differ diff --git a/emf2016/artwork/Sponsor Logos/3 Silver/yelp.png b/emf2016/artwork/Sponsor Logos/3 Silver/yelp.png new file mode 100644 index 0000000..64314dd Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/3 Silver/yelp.png differ diff --git "a/emf2016/artwork/Sponsor Logos/4 Bronze/Icon\r" "b/emf2016/artwork/Sponsor Logos/4 Bronze/Icon\r" new file mode 100644 index 0000000..e69de29 diff --git a/emf2016/artwork/Sponsor Logos/4 Bronze/chef.png b/emf2016/artwork/Sponsor Logos/4 Bronze/chef.png new file mode 100644 index 0000000..dbb6389 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/4 Bronze/chef.png differ diff --git a/emf2016/artwork/Sponsor Logos/4 Bronze/codethink.png b/emf2016/artwork/Sponsor Logos/4 Bronze/codethink.png new file mode 100644 index 0000000..e1dd497 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/4 Bronze/codethink.png differ diff --git a/emf2016/artwork/Sponsor Logos/4 Bronze/dhtmlx.jpg b/emf2016/artwork/Sponsor Logos/4 Bronze/dhtmlx.jpg new file mode 100644 index 0000000..8b13fdd Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/4 Bronze/dhtmlx.jpg differ diff --git a/emf2016/artwork/Sponsor Logos/4 Bronze/flexoptix.jpg b/emf2016/artwork/Sponsor Logos/4 Bronze/flexoptix.jpg new file mode 100644 index 0000000..1829418 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/4 Bronze/flexoptix.jpg differ diff --git a/emf2016/artwork/Sponsor Logos/4 Bronze/improbable.png b/emf2016/artwork/Sponsor Logos/4 Bronze/improbable.png new file mode 100644 index 0000000..f9c4bda Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/4 Bronze/improbable.png differ diff --git a/emf2016/artwork/Sponsor Logos/4 Bronze/justaddsharks.png b/emf2016/artwork/Sponsor Logos/4 Bronze/justaddsharks.png new file mode 100644 index 0000000..22757c1 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/4 Bronze/justaddsharks.png differ diff --git a/emf2016/artwork/Sponsor Logos/4 Bronze/medicalconnections.png b/emf2016/artwork/Sponsor Logos/4 Bronze/medicalconnections.png new file mode 100644 index 0000000..9ddf989 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/4 Bronze/medicalconnections.png differ diff --git a/emf2016/artwork/Sponsor Logos/4 Bronze/twilio.png b/emf2016/artwork/Sponsor Logos/4 Bronze/twilio.png new file mode 100644 index 0000000..48d1517 Binary files /dev/null and b/emf2016/artwork/Sponsor Logos/4 Bronze/twilio.png differ diff --git a/emf2016/artwork/intro.svg b/emf2016/artwork/intro.svg index 8d33db6..46bf4ad 100644 --- a/emf2016/artwork/intro.svg +++ b/emf2016/artwork/intro.svg @@ -26,11 +26,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.54374781" - inkscape:cx="1033.9414" - inkscape:cy="528.4333" + inkscape:zoom="0.38669902" + inkscape:cx="962.58599" + inkscape:cy="540" inkscape:document-units="px" - inkscape:current-layer="layer2" + inkscape:current-layer="sponsors" showgrid="false" inkscape:window-width="1440" inkscape:window-height="803" @@ -64,6 +64,30 @@ position="2144.3766,60.6899" orientation="0,1" id="guide3900" /> + + + + + + @@ -78,71826 +102,25 @@ + + + - - - + + inkscape:label="Title Text" + style="display:inline" + sodipodi:insensitive="true"> $title$subtitle$personnames + + + + + + + Sponsored By + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/emf2016/artwork/outro.svg b/emf2016/artwork/outro.svg index d4327e8..fd3ced5 100644 --- a/emf2016/artwork/outro.svg +++ b/emf2016/artwork/outro.svg @@ -7,16 +7,18 @@ 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" height="1080" - id="svg2" + viewBox="0 0 1920.0001 1080" + id="svg4309" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="outro.svg"> + id="defs4311" /> + inkscape:guide-bbox="true"> + id="guide3533" + inkscape:label="" + inkscape:color="rgb(0,0,255)" /> + + id="guide4485" /> - + id="guide4487" /> + id="guide3900" /> + + + - - - + id="guide3995" /> + id="guide3997" /> + + id="metadata4314"> @@ -99,238 +102,54 @@ + + + + transform="translate(0,27.637408)" + style="display:inline" + sodipodi:insensitive="true"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CC-BY-SA 4.0 DE - + style="fill:#ffffff" + id="rect3902" + width="143.82289" + height="64.063606" + x="1923.686" + y="991.97723" /> + + + + diff --git a/emf2016/artwork/overlays/notext.svg b/emf2016/artwork/overlays/notext.svg deleted file mode 100644 index ec5f3fd..0000000 --- a/emf2016/artwork/overlays/notext.svg +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/emf2016/artwork/overlays/s1.svg b/emf2016/artwork/overlays/s1.svg deleted file mode 100644 index 3ad1278..0000000 --- a/emf2016/artwork/overlays/s1.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - Project 2501 - - - - - - - - diff --git a/emf2016/artwork/overlays/s2.svg b/emf2016/artwork/overlays/s2.svg deleted file mode 100644 index 3206ddb..0000000 --- a/emf2016/artwork/overlays/s2.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - Simulacron-3 - - - - - - - - - - diff --git a/emf2016/artwork/pause.svg b/emf2016/artwork/pause.svg new file mode 100644 index 0000000..fd3ced5 --- /dev/null +++ b/emf2016/artwork/pause.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/emf2016/artwork/pieces-grouped.svg b/emf2016/artwork/pieces-grouped.svg deleted file mode 100644 index 644fcfa..0000000 --- a/emf2016/artwork/pieces-grouped.svg +++ /dev/null @@ -1,1028 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/emf2016/artwork/supersource.svg b/emf2016/artwork/supersource.svg deleted file mode 100644 index 9fbf952..0000000 --- a/emf2016/artwork/supersource.svg +++ /dev/null @@ -1,955 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -