More WIP

innernaut.py

@@ -72,7 +72,7 @@ def SplitTriangle(width, height, bottom=0, color=TriangleColor, **kwargs):
                 FillPath()
 
 
-with Screen('main', width=1920, height=1200) as screen:
+with Screen('main', width=1920, height=1080) as screen:
     with Pattern('beads', width=BeadSeparation * 2, height=BeadSeparation * 2) as beads:
         for x in range(3):
             for y in range(3):
@@ -81,7 +81,7 @@ with Screen('main', width=1920, height=1200) as screen:
                     with Path(tags={'bead', 'odd' if odd else 'even'}, color=OddBeadColor if odd else EvenBeadColor):
                         Ellipse(0, 0, BeadRadius, BeadRadius)
                         FillPath()
-    with Group('stars', color='white'):
+    with Group('stars', color='white', composite='lighter'):
         for j in range(100):
             radius = 10
             with Path(x=screen.width / 2, y=screen.height / 2, tags='star'):
@@ -92,7 +92,7 @@ with Screen('main', width=1920, height=1200) as screen:
                     LineTo(r * math.cos(theta), r * math.sin(theta))
                 ClosePath()
                 FillPath()
-    with Group('mask', color=MaskColor, x=screen.width/2, y=screen.height/2):
+    with Group('mask', color=MaskColor, x=screen.width/2, y=screen.height/2, fader=0):
         with Path(tags='background'):
             Ellipse(x=0, y=0, radiusX=MaskOuterRadius, radiusY=MaskOuterRadius)
             FillPath()
@@ -123,7 +123,7 @@ with Screen('main', width=1920, height=1200) as screen:
                 FillPath()
             with Path(tags='inside'):
                 Ellipse(0, 0, radiusX=ThirdEyeXRadius - EyeRimThickness, radiusY=ThirdEyeYRadius - EyeRimThickness)
-                Text(font='120px NotoColorEmoji', textAlign='center', textBaseline='middle', color=HoleColor)
+                Text(font='120px NotoColorEmoji, NotoEmoji, emoji', textAlign='center', textBaseline='middle', color=HoleColor)
             with Path(tags='liner', color=EyelinerColor, lineWidth=EyelinerThickness, lineDash=EyelinerThickness):
                 Ellipse(0, 0, radiusX=ThirdEyeXRadius - EyeRimThickness, radiusY=ThirdEyeYRadius - EyeRimThickness)
                 StrokePath()
@@ -153,12 +153,15 @@ with Screen('main', width=1920, height=1200) as screen:
 
 client.activate()
 
-with Cue('Q1', name='Rotating triangles') as Q1:
+with Cue('Q00', name='Mask', fadeIn=5, fadeOut=5):
-    period = 9
+    Match('#mask').fader = 1
+
+with Cue('Q01', name='Rotating triangles') as Q1:
+    period = 9 / maximum(f, 1e-6)
     count = t / period
     Match('#triangles').rotate = count
 
-with Cue('Q2', name='Blinking eyes') as Q2:
+with Cue('Q02', name='Blinking eyes') as Q2:
     period = 3
     duration = 0.2
     count = t / period
@@ -168,21 +171,21 @@ with Cue('Q2', name='Blinking eyes') as Q2:
     Match('.pupil > Rect').y = -PupilHeight / 2 * blink
     Match('.pupil > Rect').height = PupilHeight * blink
 
-with Cue('Q3', name='Nightmare spots') as Q3:
+with Cue('Q03', name='Nightmare spots') as Q3:
     period = 1
     count = t / period
     Match('.bead.odd').scale = 2 * sine(count)
     Match('.bead.even').scale = 2 * (1 - sine(count))
 
-with Cue('Q4', name='Spinning triangles', fadeIn=1, fadeOut=1):
+with Cue('Q04', name='Spinning triangles', fadeIn=1, fadeOut=1):
     period = 5
     count = t / period
     scale = 2*sine((count + i / n) * 5)
-    Match('.triangle').rotate = (count % 1) * f
+    Match('.triangle').rotate = count
     Match('.triangle').scale = 1 + scale
     Match('.triangle').y = -TriangleRadius - TriangleHeight * scale
 
-with Cue('Q5', name='Talking'):
+with Cue('Q05', name='Talking'):
     period = 0.5
     duration = 0.1 + 0.2 * beta('Q5.duration')[count]
     count = t / period
@@ -192,39 +195,50 @@ with Cue('Q5', name='Talking'):
     height = uniform('Q5.height')[count] * (TongueHeight - MouthCornerRadius * 2)
     Match('.tongue > RoundedRect').height = TongueHeight - height * wag
 
-with Cue('Q6', name='Rotating mask'):
+with Cue('Q06', name='Rotating mask', fadeIn=1, fadeOut=2):
     period = 11
     count = t / period
-    Match('#mask').rotate = count
+    Match('#mask').rotate = count % 1 * f
 
-with Cue('Q7', name='Rainbow triangles'):
+with Cue('Q07', name='Rainbow triangles', fadeIn=1, fadeOut=1):
     period = 5
     count = t / period
     color = hsv(count + i / n, 1, 1)
     Match('.triangle .left').color = color
     Match('.triangle .right').color = color * 0.9
 
-with Cue('Q8', name='Twinkling stars'):
+with Cue('Q08', name='Twinkling stars', fadeIn=1, fadeOut=1):
-    period = 0.5
+    period = 1
     phase = uniform('Q8.phase')[i]
-    count = t / period + phase
+    count = gt / period + phase
+    with Match('.star') as m:
+        m.x = uniform('Q8.x', i)[count] * screen.width
+        m.y = uniform('Q8.y', i)[count] * screen.height
     with Match('.star') as m:
-        m.x = (beta('Q8.x', i)[count] + 0.5) % 1 * screen.width
-        m.y = (beta('Q8.y', i)[count] + 0.5) % 1 * screen.height
-        m.rotate = uniform('Q08.rotate', i)[count]
         m.scale = uniform('Q8.scale', i)[count]
-        m.fader = sine(count)
+        m.color = white(sine(count))
 
-with Cue('Q9', name='Emoji'):
+with Cue('Q09', name='Emoji'):
     emoji = '😳🎁🎉🤗💃🍰😉'
     period = 0.5
     count = t / period
     Match('#thirdeye Text').text = Expression.coerce(emoji)[count % len(emoji)]
 
+with Cue('Q10', name='Bouncing stars', fadeIn=1, fadeOut=1):
+    period = 1
+    phase = uniform('Q8.phase')[i]
+    count = gt / period + phase
+    with Match('.star') as m:
+        m.x = uniform('Q8.x', i)[count] * screen.width
+        m.y = uniform('Q8.y', i)[count] * screen.height
+    with Match('.star') as m:
+        m.rotate = count / 5
+        m.scale = bounce(count) * 25
+        m.color = hsv(uniform('Q10.hue', i)[count], 1, bounce(count))
+
 
 #%%
 
-client.start('#Q0')
 client.stop('#Q1')
 client.start('#Q2')
 client.stop('#Q3')

sync.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+rsync --archive --verbose --delete-after fonts/ flight.local:flight/fonts/
+rsync --archive --verbose --delete-after images/ flight.local:flight/images/