remove unnecessary code, fix animation
This commit is contained in:
parent
f70a29ca95
commit
7cffd4b372
1 changed files with 29 additions and 63 deletions
|
@ -7,39 +7,12 @@ from easing import *
|
||||||
scheduleUrl = 'https://summit2019.hotosm.org/schedule.xml'
|
scheduleUrl = 'https://summit2019.hotosm.org/schedule.xml'
|
||||||
|
|
||||||
def introFrames(args):
|
def introFrames(args):
|
||||||
# show logo first for 2 seconds
|
|
||||||
frames = 4*fps
|
frames = 4*fps
|
||||||
for i in range(0, frames):
|
for i in range(0, frames):
|
||||||
yield (
|
yield (
|
||||||
('logo-artwork', 'style', 'opacity', 1),
|
('logo-artwork', 'style', 'opacity', 1),
|
||||||
('talk-metadata', 'style', 'opacity', 1),
|
('talk-metadata', 'style', 'opacity', 1),
|
||||||
)
|
)
|
||||||
# # show title, subtitle and speakers for 3 seconds
|
|
||||||
# frames = 3*fps
|
|
||||||
# for i in range(0, frames):
|
|
||||||
# yield (
|
|
||||||
# ('logo-artwork', 'style', 'opacity', 0),
|
|
||||||
# ('talk-metadata', 'style', 'opacity', 1),
|
|
||||||
# )
|
|
||||||
|
|
||||||
#def backgroundFrames(parameters):
|
|
||||||
# # 40 Sekunden
|
|
||||||
#
|
|
||||||
# frames = 20*fps
|
|
||||||
# for i in range(0, frames):
|
|
||||||
# xshift = (i+1) * 300/frames
|
|
||||||
# yshift = ((i+1) * (150/frames))
|
|
||||||
# yield(
|
|
||||||
# ('pillgroup', 'attr', 'transform', 'translate(%.4f, %.4f)' % (xshift, yshift)),
|
|
||||||
# )
|
|
||||||
#
|
|
||||||
# frames = 20*fps
|
|
||||||
# for i in range(0, frames):
|
|
||||||
# xshift = 300 - ((i+1) * (300/frames))
|
|
||||||
# yshift = 150 - ((i+1) * (150/frames))
|
|
||||||
# yield(
|
|
||||||
# ('pillgroup', 'attr', 'transform', 'translate(%.4f, %.4f)' % (xshift, yshift)),
|
|
||||||
# )
|
|
||||||
|
|
||||||
def outroFrames(args):
|
def outroFrames(args):
|
||||||
#fadein outro graphics
|
#fadein outro graphics
|
||||||
|
@ -54,13 +27,17 @@ def outroFrames(args):
|
||||||
('everything', 'style', 'opacity', 1),
|
('everything', 'style', 'opacity', 1),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def linearFade(step, start, end, steps):
|
||||||
|
i = float(step)/steps
|
||||||
|
return i * (end - start) + start
|
||||||
|
|
||||||
def pauseFrames(args):
|
def pauseFrames(args):
|
||||||
frames = int(3*fps) + 1
|
frames = int(3*fps) + 1
|
||||||
for i in range(0, frames):
|
for i in range(0, frames):
|
||||||
yield (
|
yield (
|
||||||
('logo', 'style', 'opacity', "%.4f" % easeInQuad(i, 0.0, 1.0, frames)),
|
('logo', 'style', 'opacity', "%.4f" % linearFade(i, 0.0, 1.0, frames)),
|
||||||
)
|
)
|
||||||
frames = int(3*fps)
|
frames = int(2*fps)
|
||||||
for i in range(0, frames):
|
for i in range(0, frames):
|
||||||
yield (
|
yield (
|
||||||
('logo', 'style', 'opacity', 1.0),
|
('logo', 'style', 'opacity', 1.0),
|
||||||
|
@ -68,37 +45,31 @@ def pauseFrames(args):
|
||||||
frames = int(3*fps)
|
frames = int(3*fps)
|
||||||
for i in range(0, frames):
|
for i in range(0, frames):
|
||||||
yield (
|
yield (
|
||||||
('logo', 'style', 'opacity', "%.4f" % easeOutQuad(i, 0.0, 1.0, frames)),
|
('logo', 'style', 'opacity', "%.4f" % linearFade(i, 1.0, 0.0, frames)),
|
||||||
)
|
)
|
||||||
frames = int(3*fps)
|
frames = int(2*fps)
|
||||||
for i in range(0, frames):
|
for i in range(0, frames):
|
||||||
yield (
|
yield (
|
||||||
('logo', 'style', 'opacity', 0),
|
('logo', 'style', 'opacity', 0),
|
||||||
)
|
)
|
||||||
|
|
||||||
def debug():
|
def debug():
|
||||||
# render('intro.svg',
|
render('intro.svg',
|
||||||
# '../intro.ts',
|
'../intro.ts',
|
||||||
# introFrames,
|
introFrames,
|
||||||
# {
|
{
|
||||||
# '$id': 7776,
|
'$id': 7776,
|
||||||
# '$title': 'StageWar live!',
|
'$title': 'StageWar live!',
|
||||||
# '$subtitle': 'Metal Konzert',
|
'$subtitle': 'Metal Konzert',
|
||||||
# '$persons': 'www.stagewar.de'
|
'$persons': 'www.stagewar.de'
|
||||||
# }
|
}
|
||||||
# )
|
)
|
||||||
|
|
||||||
render('outro.svg',
|
render('outro.svg',
|
||||||
'../outro.ts',
|
'../outro.ts',
|
||||||
outroFrames
|
outroFrames
|
||||||
)
|
)
|
||||||
|
|
||||||
# render(
|
|
||||||
# 'background.svg',
|
|
||||||
# '../background.ts',
|
|
||||||
# backgroundFrames
|
|
||||||
# )
|
|
||||||
#
|
|
||||||
render('pause.svg',
|
render('pause.svg',
|
||||||
'../pause.ts',
|
'../pause.ts',
|
||||||
pauseFrames
|
pauseFrames
|
||||||
|
@ -108,16 +79,19 @@ def debug():
|
||||||
def tasks(queue, args, idlist, skiplist):
|
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 event['room'] not in ('Chirurgie (Saal 1.04)', 'Kreißsaal (Saal 1.11)'):
|
if event['room'] not in ('Horsaal Ost', 'Horsaal West', 'Kleiner Horsaal'):
|
||||||
print("skipping room %s (%s [%s])" % (event['room'], event['title'], event['id']))
|
print("skipping room %s (%s [%s])" % (event['room'], event['title'], event['id']))
|
||||||
continue
|
continue
|
||||||
if not (idlist==[]):
|
if event['day'] == "1":
|
||||||
if 000000 in idlist:
|
print("skipping id ({} [{}])".format(event["title"], event["id"]))
|
||||||
print("skipping id (%s [%s])" % (event['title'], event['id']))
|
continue
|
||||||
continue
|
# if not (idlist==[]):
|
||||||
if int(event['id']) not in idlist:
|
# if 000000 in idlist:
|
||||||
print("skipping id (%s [%s])" % (event['title'], event['id']))
|
# print("skipping id (%s [%s])" % (event['title'], event['id']))
|
||||||
continue
|
# continue
|
||||||
|
# if int(event['id']) not in idlist:
|
||||||
|
# print("skipping id (%s [%s])" % (event['title'], event['id']))
|
||||||
|
# continue
|
||||||
|
|
||||||
# generate a task description and put them into the queue
|
# generate a task description and put them into the queue
|
||||||
queue.put(Rendertask(
|
queue.put(Rendertask(
|
||||||
|
@ -147,11 +121,3 @@ def tasks(queue, args, idlist, skiplist):
|
||||||
outfile = 'pause.ts',
|
outfile = 'pause.ts',
|
||||||
sequence = pauseFrames
|
sequence = pauseFrames
|
||||||
))
|
))
|
||||||
|
|
||||||
# # place the background-sequence into the queue
|
|
||||||
# if not "bg" in skiplist:
|
|
||||||
# queue.put(Rendertask(
|
|
||||||
# infile = 'background.svg',
|
|
||||||
# outfile = 'background.ts',
|
|
||||||
# sequence = backgroundFrames
|
|
||||||
# ))
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue