diff --git a/constants.py b/constants.py index 53365f3..da10218 100644 --- a/constants.py +++ b/constants.py @@ -5,7 +5,7 @@ from flight.server import FlightServer Width = 1920 -Height = 1080 +Height = 1200 MaskOuterRadius = 460 MaskInnerRadius = 400 BeadSeparation = 15 @@ -48,4 +48,4 @@ EvenBeadColor = Color.white(0) #server = FlightServer.ensure_threaded_instance() -client = FlightClient('http://duquesne.local:8888') +client = FlightClient() #'http://duquesne.local:8888') diff --git a/cues.py b/cues.py index 8e94532..6653bdc 100644 --- a/cues.py +++ b/cues.py @@ -19,7 +19,7 @@ with Cue('Q01', name='Mask', fadeIn=5, fadeOut=5): with Cue('Q02', name='Rotating mask', fadeIn=1, fadeOut=2): period = 11 count = t / period - Match('#master_mask').rotate = count % 1 * f + Match('#main_mask').rotate = count % 1 * f with Cue('Q03', name='Multiple masks'): period = 3 @@ -63,13 +63,13 @@ with Cue('Q07', name='Helmet', fadeIn=1, fadeOut=1): with Cue('Q08', name='Shrinking mask', fadeIn=1, fadeOut=1): period = 20 count = t / period - Match('#master_mask').scale = 0.01 + sine(count) + Match('#main_mask').scale = 0.01 + sine(count) with Cue('Q09', name='Beating mask', fadeIn=1, fadeOut=1): period = 60 / BPM count = t / period beat = sawtooth(count, duty=0.25) - Match('#master_mask').scale = 0.9 + 0.2 * impulse(beat) + Match('#main_mask').scale = 0.9 + 0.2 * impulse(beat) with Cue('Q11', name='Rainbow triangles', fadeIn=1, fadeOut=1): period = 5 diff --git a/setup.py b/setup.py index cd014f9..50474a0 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ with Screen('main', width=Width, height=Height) as screen: Ellipse(0, 0, BeadRadius, BeadRadius) FillPath() with Pattern('mask_pattern', width=screen.width, height=screen.height) as container: - with Group('master_mask', color=MaskColor, x=container.width/2, y=container.height/2): + with Group('main_mask', color=MaskColor, x=container.width/2, y=container.height/2): with Path(tags='background'): Ellipse(x=0, y=0, radiusX=MaskOuterRadius, radiusY=MaskOuterRadius) FillPath()