Loads'o'changes

This commit is contained in:
2019-09-22 08:44:18 +01:00
parent 472b456964
commit 66d9f63af3

View File

@ -11,8 +11,8 @@ from flight.expressions import Expression
from flight.server import FlightServer from flight.server import FlightServer
#server = FlightServer.ensure_threaded_instance() server = FlightServer.ensure_threaded_instance()
client = FlightClient('http://flight.local:8888') client = FlightClient() #('http://192.168.178.32:8888')
#%% #%%
@ -72,6 +72,15 @@ def SplitTriangle(width, height, bottom=0, color=TriangleColor, **kwargs):
FillPath() FillPath()
def Star(radius):
MoveTo(radius / 2, 0)
for k in range(1, 10):
theta = 2 * math.pi * k / 10
r = (1 + (k % 2)) * radius / 2
LineTo(r * math.cos(theta), r * math.sin(theta))
ClosePath()
with Screen('main', width=1920, height=1080) as screen: with Screen('main', width=1920, height=1080) as screen:
with Pattern('beads', width=BeadSeparation * 2, height=BeadSeparation * 2) as beads: with Pattern('beads', width=BeadSeparation * 2, height=BeadSeparation * 2) as beads:
for x in range(3): for x in range(3):
@ -81,18 +90,8 @@ with Screen('main', width=1920, height=1080) as screen:
with Path(tags={'bead', 'odd' if odd else 'even'}, color=OddBeadColor if odd else EvenBeadColor): with Path(tags={'bead', 'odd' if odd else 'even'}, color=OddBeadColor if odd else EvenBeadColor):
Ellipse(0, 0, BeadRadius, BeadRadius) Ellipse(0, 0, BeadRadius, BeadRadius)
FillPath() FillPath()
with Group('stars', color='white', composite='lighter'): with Pattern('mask_pattern', width=screen.width, height=screen.height) as container:
for j in range(100): with Group('master_mask', color=MaskColor, x=container.width/2, y=container.height/2):
radius = 10
with Path(x=screen.width / 2, y=screen.height / 2, tags='star'):
MoveTo(radius / 2, 0)
for k in range(1, 10):
theta = 2 * math.pi * k / 10
r = (1 + (k % 2)) * radius / 2
LineTo(r * math.cos(theta), r * math.sin(theta))
ClosePath()
FillPath()
with Group('mask', color=MaskColor, x=screen.width/2, y=screen.height/2, fader=0):
with Path(tags='background'): with Path(tags='background'):
Ellipse(x=0, y=0, radiusX=MaskOuterRadius, radiusY=MaskOuterRadius) Ellipse(x=0, y=0, radiusX=MaskOuterRadius, radiusY=MaskOuterRadius)
FillPath() FillPath()
@ -147,37 +146,72 @@ with Screen('main', width=1920, height=1080) as screen:
Ellipse(x=0, y=0, radiusX=EyeXRadius, radiusY=EyeYRadius) Ellipse(x=0, y=0, radiusX=EyeXRadius, radiusY=EyeYRadius)
StrokePath() StrokePath()
SplitTriangle(id='nose', width=NoseWidth, height=NoseHeight, bottom=NoseBottom) SplitTriangle(id='nose', width=NoseWidth, height=NoseHeight, bottom=NoseBottom)
with Group('stars', composite='lighter', fader=0):
for j in range(100):
with Group(x=screen.width / 2, y=screen.height / 2, tags='star', lineWidth=2):
with Path(tags='fill'):
Star(10)
FillPath()
with Path(tags='outline'):
Star(10)
StrokePath()
with Path(id='mask', pattern='mask_pattern', fader=0):
Rect(0, 0, container.width, container.height)
FillPath()
#%% #%%
client.activate() client.activate()
with Cue('Q00', name='Mask', fadeIn=5, fadeOut=5): with Cue('Q01', name='Mask', fadeIn=5, fadeOut=5):
Match('#mask').fader = 1 Match('#mask').fader = 1
with Cue('Q01', name='Rotating triangles') as Q1: with Cue('Q02', name='Rotating mask', fadeIn=1, fadeOut=2):
period = 9 / maximum(f, 1e-6) period = 11
count = t / period count = t / period
Match('#triangles').rotate = count Match('#master_mask').rotate = count % 1 * f
with Cue('Q02', name='Blinking eyes') as Q2: with Cue('Q03', name='Multiple masks'):
period = 3
scale = 1 / (1 + (t / period) // 1)
Match('#mask').scale = scale
Match('#mask Rect').width = container.width / scale
Match('#mask Rect').height = container.height / scale
with Cue('Q04', name='Blinking eyes') as Q2:
period = 3 period = 3
duration = 0.2 duration = 0.2
count = t / period count = t / period
cycle = t % period cycle = t % period
offset = beta('Q2.offset')[count] * (period - duration) offset = beta('Q04.offset')[count] * (period - duration)
blink = 1 - when((cycle > offset) & (cycle < offset + duration), impulse((cycle - offset) / duration), 0) blink = 1 - when((cycle > offset) & (cycle < offset + duration), impulse((cycle - offset) / duration), 0)
Match('.pupil > Rect').y = -PupilHeight / 2 * blink Match('.pupil > Rect').y = -PupilHeight / 2 * blink
Match('.pupil > Rect').height = PupilHeight * blink Match('.pupil > Rect').height = PupilHeight * blink
with Cue('Q03', name='Nightmare spots') as Q3: with Cue('Q05', name='Talking'):
period = 1 period = 0.5
duration = 0.1 + 0.2 * beta('Q04.duration')[count]
count = t / period count = t / period
Match('.bead.odd').scale = 2 * sine(count) cycle = t % period
Match('.bead.even').scale = 2 * (1 - sine(count)) offset = beta('Q05.offset')[count] * (period - duration)
wag = when((cycle > offset) & (cycle < offset + duration), impulse((cycle - offset) / duration), 0)
height = uniform('Q05.height')[count] * (TongueHeight - MouthCornerRadius * 2)
Match('.tongue > RoundedRect').height = TongueHeight - height * wag
with Cue('Q04', name='Spinning triangles', fadeIn=1, fadeOut=1): with Cue('Q06', 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('Q07', name='Rotating triangles') as Q1:
period = 9 / maximum(f, 1e-6)
count = t / period
Match('#triangles').rotate = count
with Cue('Q08', name='Spinning triangles', fadeIn=1, fadeOut=1):
period = 5 period = 5
count = t / period count = t / period
scale = 2*sine((count + i / n) * 5) scale = 2*sine((count + i / n) * 5)
@ -185,61 +219,51 @@ with Cue('Q04', name='Spinning triangles', fadeIn=1, fadeOut=1):
Match('.triangle').scale = 1 + scale Match('.triangle').scale = 1 + scale
Match('.triangle').y = -TriangleRadius - TriangleHeight * scale Match('.triangle').y = -TriangleRadius - TriangleHeight * scale
with Cue('Q05', name='Talking'): with Cue('Q09', name='Nightmare spots') as Q3:
period = 0.5
duration = 0.1 + 0.2 * beta('Q5.duration')[count]
count = t / period
cycle = t % period
offset = beta('Q5.offset')[count] * (period - duration)
wag = when((cycle > offset) & (cycle < offset + duration), impulse((cycle - offset) / duration), 0)
height = uniform('Q5.height')[count] * (TongueHeight - MouthCornerRadius * 2)
Match('.tongue > RoundedRect').height = TongueHeight - height * wag
with Cue('Q06', name='Rotating mask', fadeIn=1, fadeOut=2):
period = 11
count = t / period
Match('#mask').rotate = count % 1 * f
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('Q08', name='Twinkling stars', fadeIn=1, fadeOut=1):
period = 1 period = 1
phase = uniform('Q8.phase')[i] count = t / period
count = gt / period + phase Match('.bead.odd').scale = 2 * sine(count)
with Match('.star') as m: Match('.bead.even').scale = 2 * (1 - sine(count))
m.x = uniform('Q8.x', i)[count] * screen.width
m.y = uniform('Q8.y', i)[count] * screen.height
with Match('.star') as m:
m.scale = uniform('Q8.scale', i)[count]
m.color = white(sine(count))
with Cue('Q09', name='Emoji'): with Cue('Q10', name='Emoji'):
emoji = '😳🎁🎉🤗💃🍰😉' emoji = '😳🎁🎉🤗💃🍰😉'
period = 0.5 period = 0.5
count = t / period count = t / period
Match('#thirdeye Text').text = Expression.coerce(emoji)[count % len(emoji)] Match('#thirdeye Text').text = Expression.coerce(emoji)[count % len(emoji)]
with Cue('Q10', name='Bouncing stars', fadeIn=1, fadeOut=1): with Cue('Q21', name='Twinkling stars', fadeIn=1, fadeOut=1):
period = 1 period = 1
phase = uniform('Q8.phase')[i] phase = uniform('Q21.phase')[i]
count = gt / period + phase count = gt / period + phase
Match('#stars').fader = 1
with Match('.star') as m: with Match('.star') as m:
m.x = uniform('Q8.x', i)[count] * screen.width m.x = uniform('Q21.x', i)[count] * screen.width
m.y = uniform('Q8.y', i)[count] * screen.height m.y = uniform('Q21.y', i)[count] * screen.height
Match('.star').scale = uniform('Q21.scale', i)[count]
Match('.star .fill').color = white(sine(count))
with Cue('Q22', name='Bouncing stars', fadeIn=1, fadeOut=1):
period = 1
phase = uniform('Q21.phase')[i]
count = gt / period + phase
Match('#stars').fader = 1
with Match('.star') as m: with Match('.star') as m:
m.x = uniform('Q21.x', i)[count] * screen.width
m.y = uniform('Q21.y', i)[count] * screen.height
m.rotate = count / 5 m.rotate = count / 5
m.scale = bounce(count) * 25 m.scale = bounce(count) * 25
m.color = hsv(uniform('Q10.hue', i)[count], 1, bounce(count)) Match('.star .outline').color = hsv(uniform('Q22.hue', i)[count], 1, bounce(count))
with Cue('Q23', name='Thin stars', fadeIn=1, fadeOut=1):
#%% period = 9 + beta('Q23.period')[i] * 2
phase = uniform('Q23.phase')[i]
client.stop('#Q1') count = t / period + phase
client.start('#Q2') hue = quad(count, uniform('Q23.hue', i)[count], uniform('Q23.hue', i)[count + 1])
client.stop('#Q3') Match('#stars').fader = 1
client.stop('#Q4') with Match('.star') as m:
m.lineWidth = sine(count) / 10
m.scale = 50
m.x = uniform('Q23.x')[i] * screen.width
m.y = uniform('Q23.y')[i] * screen.height
m.rotate = count / 10
Match('.star .outline').color = hsv(hue, 0.8, 1)