diff --git a/eh17/__init__.py b/eh17/__init__.py
index 28fdc64..be0b90f 100644
--- a/eh17/__init__.py
+++ b/eh17/__init__.py
@@ -84,7 +84,6 @@ class hasenfarbe(animate):
self.hasen.append(p)
random.shuffle(self.hasen)
-
def frame(self, frame):
if frame % 3 is 0:
return(
@@ -119,11 +118,37 @@ class cclogo(animate):
)
+class flyin(animate):
+
+ def __init__(self, low, high, xml, svgid, runout=True):
+ animate.__init__(self, low, high, xml)
+ self.pathstr = xml.find(".//*[@id='flyinPath']").get('d')
+ self.path = svg.path.parse_path(self.pathstr)
+ self.init = self.path.point(0)
+ self.stopf = self.relframe(self.high) / 3
+ self.contf = 2 * self.stopf
+ print(self.contf)
+ self.svgid = svgid
+ self.runout = runout
+
+ def frame(self, frame):
+ if self.relframe(frame) <= self.stopf:
+ p = self.path.point(self.relframe(frame) / (self.frames)) - self.init
+ self.stoppos = p
+ return (
+ (self.svgid, 'attr', 'transform', 'translate(%.4f, %.4f)' % (p.real, p.imag)),)
+
+ if self.runout and self.relframe(frame) >= self.contf:
+ p = self.path.point(self.relframe(frame) / (self.frames)) - self.init - self.stoppos
+ return (
+ (self.svgid, 'attr', 'transform', 'translate(%.4f, %.4f)' % (p.real, p.imag)),)
+
+
def introFrames(args):
xml = etree.parse('eh17/artwork/intro.svg').getroot()
animations = [
- background(0, 6, xml),
+ background(0, 15, xml),
urldate(0.5, 1, xml),
hasenfarbe(1, 5, xml),
logotext(4, 5, xml)]
@@ -146,10 +171,11 @@ def outroFrames(args):
animations = [
background(0, 15, xml),
- hasenfarbe(1, 5, xml),
- cclogo(0.5, 2, xml)]
+ hasenfarbe(0, 15, xml),
+ flyin(0.5, 2, xml, 'zufall'),
+ flyin(1.5, 3, xml, 'ccby', False)]
- frames = int(14 * fps)
+ frames = int(4 * fps)
for frame in range(0, frames):
frameactions = ()
@@ -161,66 +187,6 @@ def outroFrames(args):
print (frameactions)
yield frameactions
-def oldoutroFrames(args):
- xml = etree.parse('eh17/artwork/outro.svg').getroot()
- pathstr = xml.find(".//*[@id='animatePath']").get('d')
- frog = xml.find(".//*[@id='animatePath']").get('d')
- path = svg.path.parse_path(pathstr)
-
- init = path.point(0)
-
- frames = int(0.5 * fps)
- for i in range(0, frames):
- p = path.point(i / frames) - init
- yield (
- ('animatePath', 'style', 'opacity', 0),
- ('license', 'style', 'opacity', 0),
- )
-
- frames = 3 * fps
- for i in range(0, frames):
- p = path.point(i / frames) - init
- yield (
- ('frog', 'attr', 'transform', 'translate(%.4f, %.4f)' % (p.real, p.imag)),
- )
-
- frames = int(0.5 * fps) + 1
- for i in range(0, frames):
- yield tuple()
-
- frames = 1 * fps
- for i in range(0, frames):
- yield (
- ('logo', 'style', 'opacity', easeLinear(i, 1, -1, frames)),
- )
-
- frames = 1 * fps
- for i in range(0, frames):
- yield (
- ('logo', 'style', 'opacity', 0),
- ('license', 'style', 'opacity', easeLinear(i, 0, 1, frames)),
- )
-
- frames = 2 * fps
- for i in range(0, frames):
- yield (
- ('logo', 'style', 'opacity', 0),
- ('license', 'style', 'opacity', 1),
- )
-
- frames = 1 * fps
- for i in range(0, frames):
- yield (
- ('logo', 'style', 'opacity', 0),
- ('license', 'style', 'opacity', easeLinear(i, 1, -1, frames)),
- )
-
- frames = 1 * fps
- for i in range(0, frames):
- yield (
- ('logo', 'style', 'opacity', 0),
- ('license', 'style', 'opacity', 0),
- )
def pauseFrames(args):
frames = 2 * fps
@@ -265,20 +231,20 @@ def pauseFrames(args):
('text2', 'style', 'opacity', 0),
)
+
def debug():
- render('intro.svg',
- '../intro.ts',
- introFrames,
- {
+ render('outro.svg',
+ '../outro.ts',
+ outroFrames,
+ {
'$id': 1302,
'$title': 'VlizedLab - Eine Open Source-Virtualisierungslösung für PC-Räume',
'$subtitle': 'IT Automatisierung und zentrales Management mit SALT',
'$personnames': 'Thorsten Kramm',
- '$url':'blubb',
- '$date':'huhu'
-
- }
- )
+ '$url': 'blubb',
+ '$date': 'huhu'
+ }
+ )
# # render('outro.svg',
# '../outro.ts',
diff --git a/eh17/artwork/outro.svg b/eh17/artwork/outro.svg
index 6a55b31..cdf19a9 100644
--- a/eh17/artwork/outro.svg
+++ b/eh17/artwork/outro.svg
@@ -202,8 +202,8 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1.4142136"
- inkscape:cx="589.89408"
- inkscape:cy="19.037941"
+ inkscape:cx="357.25596"
+ inkscape:cy="623.86528"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -715,13 +715,6 @@
transform="matrix(0.53843022,0,0,1.0487681,202.30557,-131.93506)"
id="text4272-36-8-5"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:100px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-
Ist das Zufall oder kann das weg?
+
+ id="ccby"
+ inkscape:label="ccby">
+
-
-
+ transform="matrix(2.4285715,0,0,2.4285715,204.14061,232.73715)"
+ inkscape:label="Layer 1"
+ id="license">
+ transform="matrix(0.9937728,0,0,0.9936696,-177.69267,6.25128e-7)"
+ id="g260"
+ inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by.png"
+ inkscape:export-xdpi="300.23013"
+ inkscape:export-ydpi="300.23013">
+ inkscape:connector-curvature="0"
+ id="path3817_1_"
+ nodetypes="ccccccc"
+ d="m 181.96579,0.51074 114.06396,0.20264 c 1.59375,0 3.01758,-0.23633 3.01758,3.18066 l -0.13965,37.56689 H 179.08737 V 3.75439 c 0,-1.68505 0.16309,-3.24365 2.87842,-3.24365 z"
+ style="fill:#aab2ab" />
-
-
-
+ inkscape:connector-curvature="0"
+ d="m 297.29636,0 h -116.229 c -1.24658,0 -2.26123,1.01416 -2.26123,2.26074 v 39.49658 c 0,0.28174 0.229,0.51025 0.51074,0.51025 h 119.73047 c 0.28174,0 0.51074,-0.22852 0.51074,-0.51025 V 2.26074 C 299.55807,1.01416 298.54343,0 297.29636,0 Z M 181.06735,1.02148 h 116.229 c 0.68408,0 1.24023,0.55566 1.24023,1.23926 0,0 0,15.94824 0,27.44971 h -83.34424 c -3.04492,5.50586 -8.91113,9.24414 -15.64355,9.24414 -6.73535,0 -12.6001,-3.73486 -15.64355,-9.24414 h -4.07764 c 0,-11.50146 0,-27.44971 0,-27.44971 1e-5,-0.68359 0.55616,-1.23926 1.23975,-1.23926 z"
+ id="path263" />
+ enable-background="new "
+ id="g265">
+ inkscape:connector-curvature="0"
+ d="m 253.07761,32.95605 c 0.31738,0 0.60742,0.02832 0.87012,0.08398 0.26172,0.05566 0.48535,0.14746 0.67285,0.27539 0.18652,0.12695 0.33203,0.29688 0.43457,0.50781 0.10254,0.21191 0.1543,0.47266 0.1543,0.78418 0,0.33594 -0.0762,0.61523 -0.22949,0.83887 -0.15234,0.22461 -0.37891,0.40723 -0.67773,0.55078 0.41211,0.11816 0.71973,0.3252 0.92285,0.62109 0.20312,0.29589 0.30469,0.65234 0.30469,1.06934 0,0.33594 -0.0654,0.62695 -0.19629,0.87305 -0.13086,0.24512 -0.30762,0.44629 -0.52832,0.60156 -0.22168,0.15625 -0.47461,0.27148 -0.75781,0.3457 -0.28418,0.0752 -0.5752,0.1123 -0.875,0.1123 H 249.936 v -6.66406 h 3.14161 z m -0.1875,2.69532 c 0.26172,0 0.47656,-0.0625 0.64551,-0.18652 0.16797,-0.12402 0.25195,-0.3252 0.25195,-0.60449 0,-0.15527 -0.0283,-0.2832 -0.084,-0.38184 -0.0566,-0.09961 -0.13086,-0.17676 -0.22461,-0.2334 -0.0937,-0.05566 -0.20117,-0.09473 -0.32227,-0.11621 -0.1211,-0.02148 -0.24805,-0.03223 -0.37793,-0.03223 h -1.37402 v 1.55469 h 1.48535 z m 0.0859,2.82812 c 0.14355,0 0.28027,-0.01367 0.41113,-0.04199 0.13086,-0.02832 0.24609,-0.0752 0.34668,-0.13965 0.0996,-0.06543 0.17871,-0.1543 0.23828,-0.2666 0.0596,-0.11133 0.0889,-0.25488 0.0889,-0.42871 0,-0.3418 -0.0967,-0.58594 -0.29004,-0.73242 -0.19336,-0.14551 -0.44922,-0.21875 -0.7666,-0.21875 h -1.59961 v 1.82812 h 1.57129 z"
+ id="path267"
+ style="fill:#ffffff" />
+
-
-
-
+ id="g5908_1_"
+ transform="matrix(0.872921,0,0,0.872921,50.12536,143.2144)">
+ inkscape:connector-curvature="0"
+ id="path5906_1_"
+ cx="296.35416"
+ ry="22.939548"
+ cy="264.3577"
+ type="arc"
+ rx="22.939548"
+ d="m 186.90065,-141.46002 c 0.006,8.68079 -7.02786,15.7215 -15.70808,15.72711 -8.68022,0.006 -15.72206,-7.02734 -15.7271,-15.70807 0,-0.006 0,-0.0123 0,-0.019 -0.005,-8.68079 7.02786,-15.7215 15.70808,-15.72656 8.68135,-0.006 15.72206,7.02734 15.7271,15.70813 0,0.006 0,0.0123 0,0.0184 z"
+ style="fill:#ffffff" />
+
+
+
+
+
+ cx="255.55124"
+ cy="15.31348"
+ r="10.80664"
+ id="circle277"
+ style="fill:#ffffff" />
+
+
+
+
+
-
+