diff --git a/DS2016/__init__.py b/DS2016/__init__.py index 4a52bda..3fcc4dc 100644 --- a/DS2016/__init__.py +++ b/DS2016/__init__.py @@ -1,6 +1,7 @@ #!/usr/bin/python3 from lxml import etree +from slugify import slugify from renderlib import * from renderlib import * from easing import * @@ -25,18 +26,18 @@ def introFrames(parameters): frames = 1*fps for i in range(0, frames): yield ( - ('names', 'style', 'opacity', "%.4f" % easeOutCubic(i, 0, 1, frames)), - ('title', 'style', 'opacity', 0), + ('names', 'style', 'opacity', 0), + ('title', 'style', 'opacity', "%.4f" % easeInCubic(i, 0, 1, frames)), ) frames = 1*fps for i in range(0, frames): yield ( - ('names', 'style', 'opacity', 1), - ('title', 'style', 'opacity', "%.4f" % easeInCubic(i, 0, 1, frames)), + ('names', 'style', 'opacity', "%.4f" % easeInCubic(i, 0, 1, frames)), + ('title', 'style', 'opacity', 1), ) - frames = 3*fps + frames = 4*fps for i in range(0, frames): yield ( ('names', 'style', 'opacity', 1), @@ -47,15 +48,15 @@ def introFrames(parameters): for i in range(0, frames): yield ( ('names', 'style', 'opacity', "%.4f" % easeOutCubic(i, 1, -1, frames)), - ('title', 'style', 'opacity', "%.4f" % easeInCubic(i, 1, -1, frames)), + ('title', 'style', 'opacity', "%.4f" % easeOutCubic(i, 1, -1, frames)), ) - frames = 1*fps - for i in range(0, frames): - yield ( - ('names', 'style', 'opacity', 0), - ('title', 'style', 'opacity', 0), - ) + #frames = 1*fps + #for i in range(0, frames): + # yield ( + # ('names', 'style', 'opacity', 0), + # ('title', 'style', 'opacity', 0), + # ) def debug(): render('intro.svg', diff --git a/DS2016/artwork/BigDots.ttf b/DS2016/artwork/BigDots.ttf new file mode 100755 index 0000000..c19a69a Binary files /dev/null and b/DS2016/artwork/BigDots.ttf differ diff --git a/DS2016/artwork/intro.svg b/DS2016/artwork/intro.svg index 75f3be8..b678526 100644 --- a/DS2016/artwork/intro.svg +++ b/DS2016/artwork/intro.svg @@ -23,16 +23,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.25" - inkscape:cx="1258.7322" - inkscape:cy="34.310133" + inkscape:zoom="0.35355339" + inkscape:cx="459.26446" + inkscape:cy="464.66845" inkscape:document-units="px" - inkscape:current-layer="flowRoot4546" + inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1920" - inkscape:window-height="971" - inkscape:window-x="1280" - inkscape:window-y="31" + inkscape:window-width="1600" + inkscape:window-height="875" + inkscape:window-x="1600" + inkscape:window-y="25" inkscape:window-maximized="1" fit-margin-top="0" fit-margin-left="0" @@ -41,7 +41,7 @@ units="px" inkscape:object-nodes="true" inkscape:snap-nodes="false" - showguides="true" + showguides="false" inkscape:guide-bbox="true"> image/svg+xml - + @@ -711,104 +711,34 @@ transform="translate(-2.0000067,-92.36219)"> - - - - - - - - - - - - - - + transform="matrix(1.140124,0.05884594,-0.05667367,1.0980368,557.15347,681.74571)"> @@ -9315,28 +9245,93 @@ $personnames $title + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.01152611px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';fill:#000000;fill-opacity:1">$title + + + + + + + + + + + + + + + + +