16c3: refinements

This commit is contained in:
Daniel Molkentin 2017-08-12 23:30:43 +02:00
parent 66e9ae27a8
commit 0a7fa9e3bb
3 changed files with 41 additions and 65 deletions

View file

@ -13,15 +13,6 @@ titlemap = {
# #
} }
def bounce(i, min, max, frames):
if i == frames - 1:
return 0
if i <= frames/2:
return easeInOutQuad(i, min, max, frames/2)
else:
return max - easeInOutQuad(i - frames/2, min, max, frames/2)
def introFrames(parameters): def introFrames(parameters):
move=50 move=50
@ -29,8 +20,9 @@ def introFrames(parameters):
frames = 3*fps frames = 3*fps
for i in range(0, frames): for i in range(0, frames):
yield ( yield (
('logo', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)),
('textblock', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)), ('textblock', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)),
('textblock', 'attr', 'transform', 'translate(%.4f, 0)' % easeOutQuad(i, -move, move, frames)), ('textblock', 'attr', 'transform', 'translate(%.4f, 0)' % easeOutQuad(i, -move/2, move/2, frames)),
) )
# 2 Sekunden stehen lassen # 2 Sekunden stehen lassen
@ -47,18 +39,7 @@ def introFrames(parameters):
) )
def pauseFrames(parameters): def pauseFrames(parameters):
frames = 25*3 pass
for i in range(0, frames):
yield (
('pause', 'attr', 'flood-opacity', '%.4f' % bounce(i, 0.0, 1.0, frames)),
)
frames = 25*1
for i in range(0, frames):
yield (
('glowFlood', 'attr', 'flood-opacity', '%.4f' % 0),
)
def outroFrames(p): def outroFrames(p):
# 5 Sekunden stehen bleiben # 5 Sekunden stehen bleiben
@ -94,10 +75,9 @@ def tasks(queue, args, idlist, skiplist):
# iterate over all events extracted from the schedule xml-export # iterate over all events extracted from the schedule xml-export
for event in events(scheduleUrl): for event in events(scheduleUrl):
if len(args) > 0: # if len(args) > 0:
if not str(event['id']) in args: # if not str(event['id']) in args:
continue # continue
# generate a task description and put it into the queue # generate a task description and put it into the queue
queue.put(Rendertask( queue.put(Rendertask(
infile = 'intro.svg', infile = 'intro.svg',

View file

@ -26,9 +26,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.98994949" inkscape:zoom="0.7"
inkscape:cx="411.85731" inkscape:cx="625.98717"
inkscape:cy="310.25482" inkscape:cy="489.17927"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"
@ -67,29 +67,37 @@
id="layer1" id="layer1"
transform="translate(0,-476.36216)"> transform="translate(0,-476.36216)">
<rect <rect
style="opacity:1;fill:#101077;fill-opacity:1;stroke:#ffdab9;stroke-width:0.20014016;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" style="opacity:1;fill:#101077;fill-opacity:1;stroke:#ffdab9;stroke-width:0.2002279;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="title" id="title"
width="721.24878" width="721.24872"
height="575.7868" height="576.29181"
x="7.0111157e-05" x="0.00011397823"
y="476.57526" /> y="476.07022" />
<g <g
id="g4369" id="logo"
transform="translate(-79.671342,81.766339)"> transform="translate(-79.671342,81.766339)"
style="opacity:1">
<g <g
id="g4360"> id="g4360"
style="">
<g <g
id="g4352"> id="g4352"
style="">
<g <g
id="g4345"> id="g4345"
style="">
<g <g
id="g4339"> id="g4339"
style="">
<g <g
id="g4334"> id="g4334"
style="">
<g <g
id="g4330"> id="g4330"
style="">
<g <g
id="g4327"> id="g4327"
style="">
<image <image
y="809.67682" y="809.67682"
x="97.233551" x="97.233551"
@ -225,7 +233,8 @@ nUIJAVToFEoIoEKnUEIAFTqFEgL+H0t9h22HcyP2AAAAAElFTkSuQmCC
" "
preserveAspectRatio="none" preserveAspectRatio="none"
height="150" height="150"
width="250" /> width="250"
style="" />
</g> </g>
</g> </g>
</g> </g>
@ -256,20 +265,7 @@ nUIJAVToFEoIoEKnUEIAFTqFEgL+H0t9h22HcyP2AAAAAElFTkSuQmCC
height="44.446712" height="44.446712"
x="569.72601" x="569.72601"
y="521.45178" /></flowRegion><flowPara y="521.45178" /></flowRegion><flowPara
id="flowPara4407">C#</flowPara></flowRoot> <flowRoot id="flowPara4407">C#</flowPara></flowRoot> <g
xml:space="preserve"
id="flowRoot4409"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:Umpush;-inkscape-font-specification:Umpush;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#ffe600;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(-5.0507627,500.60582)"><flowRegion
id="flowRegion4411"><rect
id="rect4413"
width="191.92902"
height="25.253798"
x="512.14734"
y="513.37061"
style="text-align:end;text-anchor:end;fill:#ffe600;fill-opacity:1" /></flowRegion><flowPara
id="flowPara4415"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:Umpush;-inkscape-font-specification:'Umpush, Bold';text-align:end;writing-mode:lr-tb;text-anchor:end">#$id</flowPara></flowRoot> <g
id="textblock"> id="textblock">
<flowRoot <flowRoot
transform="translate(9.7654088,499.79696)" transform="translate(9.7654088,499.79696)"

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -27,8 +27,8 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="3.959798" inkscape:zoom="3.959798"
inkscape:cx="793.37421" inkscape:cx="476.80789"
inkscape:cy="74.810391" inkscape:cy="579.88667"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"
@ -67,12 +67,12 @@
id="layer1" id="layer1"
transform="translate(0,-476.36216)"> transform="translate(0,-476.36216)">
<rect <rect
style="opacity:1;fill:#101077;fill-opacity:1;stroke:#ffdab9;stroke-width:0.20026293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" style="opacity:1;fill:#101077;fill-opacity:1;stroke:#ffdab9;stroke-width:0.20039448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect3515" id="rect3515"
width="721.50122" width="721.5011"
height="576.29175" height="577.04926"
x="-0.9897157" x="-0.98964989"
y="476.57532" /> y="475.81778" />
<g <g
id="g4369" id="g4369"
transform="matrix(0.58247028,0,0,0.58247028,508.0108,485.1402)"> transform="matrix(0.58247028,0,0,0.58247028,508.0108,485.1402)">

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB