From 698f07c6ff5dacdecbf1d1fd4f38532969de28a7 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Sun, 22 Sep 2019 12:58:01 +0100
Subject: [PATCH] Stuff

---
 constants.py |  5 ++++-
 cues.py      | 23 +++++++++++++++--------
 setup.py     | 33 +++++++++++++++++++++++++++------
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/constants.py b/constants.py
index e906579..9a8a4a2 100644
--- a/constants.py
+++ b/constants.py
@@ -1,5 +1,7 @@
 
 from flight.color import Color
+from flight.client import *
+from flight.server import FlightServer
 
 
 MaskOuterRadius = 460
@@ -29,6 +31,7 @@ TriangleCount = 30
 TriangleWidth = 60
 TriangleHeight = 40
 TriangleRadius = 430
+Spirals = 7
 
 MaskColor = Color.hsv(0.09, 0.8, 0.25)
 DarkMaskColor = MaskColor * 0.25
@@ -40,4 +43,4 @@ EvenBeadColor = Color.white(0)
 
 
 server = FlightServer.ensure_threaded_instance()
-client = FlightClient('http://192.168.178.32:8888')
+client = FlightClient('http://flight.local:8888')
diff --git a/cues.py b/cues.py
index d84ed05..5cb4f2a 100644
--- a/cues.py
+++ b/cues.py
@@ -1,14 +1,7 @@
 #%%
 
-import math
-import random
-
 from flight.case import *
-from flight.color import Color
-from flight.client import *
 from flight.expressions import *
-from flight.expressions import Expression
-from flight.server import FlightServer
 
 from constants import *
 
@@ -63,6 +56,11 @@ with Cue('Q06', name='Emoji'):
 with Cue('Q07', name='Helmet', fadeIn=1, fadeOut=1):
     Match('#helmet').fader = 1
 
+with Cue('Q08', name='Shrinking mask', fadeIn=1, fadeOut=1):
+    period = 20
+    count = t / period
+    Match('#master_mask').scale = 0.01 + sine(count)
+
 with Cue('Q11', name='Rainbow triangles', fadeIn=1, fadeOut=1):
     period = 5
     count = t / period
@@ -101,7 +99,7 @@ with Cue('Q21', name='Twinkling stars', fadeIn=1, fadeOut=1):
     Match('.star .fill').color = white(sine(count))
 
 with Cue('Q22', name='Bouncing stars', fadeIn=1, fadeOut=1):
-    period = 1
+    period = 2
     phase = uniform('Q21.phase')[i]
     count = gt / period + phase
     Match('#stars').fader = 1
@@ -136,3 +134,12 @@ with Cue('Q24', name='Rushing stars', fadeIn=1, fadeOut=1):
         m.y = (uniform('Q24.y', i)[count] - 0.5) * screen.height * 2 * (count % 1)
         m.color = white(sine(count))
         m.scale = count % 1
+
+with Cue('Q31', name='Spirals', fadeIn=1, fadeOut=1):
+    period = 10
+    count = t / period
+    value = 0.25 + 0.75 * sine(1.3 * (count + meta.count / Spirals))
+    Match('#spirals').fader = 1
+    Match('#spirals').rotate = -count
+    Match('.spiral .segment').lineWidth = 1.5 ** meta.index
+    Match('.spiral .segment').color = hsv(count + meta.count / Spirals, meta.index / 8, value)
diff --git a/setup.py b/setup.py
index d5a868c..03af6c4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,8 @@
 #%%
 
 import math
-import random
 
 from flight.case import *
-from flight.color import Color
-from flight.client import *
-from flight.expressions import *
-from flight.expressions import Expression
-from flight.server import FlightServer
 
 from constants import *
 
@@ -42,6 +36,30 @@ def Star(radius):
     ClosePath()
 
 
+def Spiral(count, startRadius=10, loops=2, **kwargs):
+    with Group(**kwargs):
+        r = startRadius
+        x = -r
+        y = 0
+        for j in range(loops * 4):
+            d = j % 4
+            start = d / 4
+            end = (d + 1) / 4
+            with Path(tags='segment', meta_index=j, meta_count=count):
+                Ellipse(x, y, r, r, startAngle=start, endAngle=end)
+                StrokePath()
+            if d == 0:
+                y -= r
+            elif d == 1:
+                x += r
+            elif d == 2:
+                y += r
+            elif d == 3:
+                x -= r
+            r *= 2
+
+
+
 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):
@@ -130,6 +148,9 @@ with Screen('main', width=1920, height=1080) as screen:
                 with Path(tags='outline'):
                     Star(10)
                     StrokePath()
+    with Group('spirals', x=screen.width/2, y=screen.height/2, color='white', lineWidth=2, fader=0, composite='lighter'):
+        for j in range(Spirals):
+            Spiral(rotate=j/Spirals, count=j, tags='spiral')
     with Path(id='mask', pattern='mask_pattern', fader=0):
         Rect(0, 0, container.width, container.height)
         FillPath()