diff --git a/gpn16/__init__.py b/gpn16/__init__.py
index 3bd0141..b5f35ad 100644
--- a/gpn16/__init__.py
+++ b/gpn16/__init__.py
@@ -23,31 +23,54 @@ def bounce(i, min, max, frames):
def introFrames(parameters):
frames = 10
+ yield (
+ ('eat', 'style', 'opacity', '%.4f' % 0),
+ ('sleep', 'style', 'opacity', '%.4f' % 0),
+ ('code', 'style', 'opacity', '%.4f' % 0),
+ ('repeat', 'style', 'opacity', '%.4f' % 0),
+ )
+
for i in range(0, frames):
+ scale = easeLinear(i, 0.5, 2, frames)
+ move = -0.5 * scale + 0.5
+ x = 1920 * move
+ y = 1080 * move
yield (
- ('eatTransform', 'attr', 'transform', "scale(%.4f)" % easeLinear(i, 0.5, 2.0, frames)),
- ('eatTransform', 'style', 'opacity', '%.4f' % bounce(i, 0.0, 1.0, frames))
+ ('eat', 'attr', 'transform', "translate(%.4f, %.4f) scale(%.4f)" % (x, y, scale)),
+ ('eat', 'style', 'opacity', '%.4f' % bounce(i, 0.0, 1.0, frames))
)
frames = 10
for i in range(0, frames):
+ scale = easeLinear(i, 0.5, 2, frames)
+ move = -0.5 * scale + 0.5
+ x = 1920 * move
+ y = 1080 * move
yield (
- ('sleep', 'attr', 'transform', "scale(%.4f)" % easeLinear(i, 0.5, 2.0, frames)),
- ('sleepTransform', 'style', 'opacity', '%.4f' % bounce(i, 0.0, 1.0, frames))
+ ('sleep', 'attr', 'transform', "translate(%.4f, %.4f) scale(%.4f)" % (x, y, scale)),
+ ('sleep', 'style', 'opacity', '%.4f' % bounce(i, 0.0, 1.0, frames))
)
frames = 10
for i in range(0, frames):
+ scale = easeLinear(i, 0.5, 2, frames)
+ move = -0.5 * scale + 0.5
+ x = 1920 * move
+ y = 1080 * move
yield (
- ('codeTransform', 'attr', 'transform', "scale(%.4f)" % easeLinear(i, 0.5, 2.0, frames)),
- ('codeTransform', 'style', 'opacity', '%.4f' % bounce(i, 0.0, 1.0, frames))
+ ('code', 'attr', 'transform', "translate(%.4f, %.4f) scale(%.4f)" % (x, y, scale)),
+ ('code', 'style', 'opacity', '%.4f' % bounce(i, 0.0, 1.0, frames))
)
frames = 10
for i in range(0, frames):
+ scale = easeLinear(i, 0.5, 2, frames)
+ move = -0.5 * scale + 0.5
+ x = 1920 * move
+ y = 1080 * move
yield (
- ('repeatTransform', 'attr', 'transform', "scale(%.4f)" % easeLinear(i, 0.5, 2.0, frames)),
- ('repeatTransform', 'style', 'opacity', '%.4f' % bounce(i, 0.0, 1.0, frames))
+ ('repeat', 'attr', 'transform', "translate(%.4f, %.4f) scale(%.4f)" % (x, y, scale)),
+ ('repeat', 'style', 'opacity', '%.4f' % bounce(i, 0.0, 1.0, frames))
)
diff --git a/gpn16/artwork/intro.svg b/gpn16/artwork/intro.svg
index 9605c72..50149f5 100644
--- a/gpn16/artwork/intro.svg
+++ b/gpn16/artwork/intro.svg
@@ -25,18 +25,18 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="0.175"
- inkscape:cx="24.589507"
- inkscape:cy="588.61655"
+ inkscape:zoom="0.35"
+ inkscape:cx="92.085614"
+ inkscape:cy="78.582849"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
- inkscape:window-width="1600"
+ inkscape:window-width="1920"
inkscape:window-height="1016"
inkscape:window-x="0"
inkscape:window-y="27"
- inkscape:window-maximized="0" />
+ inkscape:window-maximized="1" />
@@ -45,7 +45,7 @@
image/svg+xml
-
+
@@ -62,63 +62,48 @@
x="0"
y="-27.637838" />
+ inkscape:label="#g5170">
+ transform="matrix(1,0,0,-1,960.005,512.34716)"
+ id="eat-inner">
-
+
-
-
-
-
-
-
-
-
-
-
-
+ inkscape:connector-curvature="0" />
+
+
+
+
+
+ inkscape:label="#g5164">
+ style="font-size:medium;font-family:ProstoSans-Bold;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+ transform="translate(717.25155,401.37325)"
+ id="code-inner">
+ inkscape:label="#g5158">
+ transform="translate(392.14286,238.57143)"
+ id="sleep-inner">
+ inkscape:label="#g5149">
+ id="repeat-inner">
+ transform="matrix(1,0,0,-1,960.01198,512.19516)">
+ transform="matrix(1,0,0,-1,960.01198,512.19516)">