# HG changeset patch # User drewp@bigasterisk.com # Date 2015-06-14 21:28:24 # Node ID ae4a67906c39731113e9b3c3c03a6c1fa2254dd1 # Parent 3e89b00be550223280f4b3ffd1ad5ce3f8a99982 checkpoint show data Ignore-this: 402bac712330145343e3e20ed384e037 diff --git a/show/dance2015/curves/song15.markers b/show/dance2015/curves/song15.markers new file mode 100644 --- /dev/null +++ b/show/dance2015/curves/song15.markers @@ -0,0 +1,1 @@ +183.406269 'q' diff --git a/show/dance2015/effectClass.n3 b/show/dance2015/effectClass.n3 --- a/show/dance2015/effectClass.n3 +++ b/show/dance2015/effectClass.n3 @@ -71,6 +71,13 @@ chase:backchase a :Chase; :channels ( ) . +chase:midrand a :Chase; :channels ( + ch:down-c1 ch:down-wide ch:down-c3 ch:down-c4 ch:down-wide ch:down-c1 ch:down-c3 ch:down-c2 ch:down-c3 ch:down-c4 ch:down-wide ch:down-c1 ch:down-c4 ch:down-c2 ch:down-wide ch:down-c2 ch:down-c4 ch:down-c1 +) . + +effect:midChase a :EffectClass; + rdfs:label "mid chase"; + :code "out = chase(t, names=midrand, ontime=.3, offset=-.11) * env" . effect:backChase a :EffectClass; rdfs:label "back chase"; diff --git a/show/dance2015/sessions/curvecalc/default.n3 b/show/dance2015/sessions/curvecalc/default.n3 --- a/show/dance2015/sessions/curvecalc/default.n3 +++ b/show/dance2015/sessions/curvecalc/default.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:currentSong . + ns1:currentSong . diff --git a/show/dance2015/sessions/keyboardcomposer/default.n3 b/show/dance2015/sessions/keyboardcomposer/default.n3 --- a/show/dance2015/sessions/keyboardcomposer/default.n3 +++ b/show/dance2015/sessions/keyboardcomposer/default.n3 @@ -8,6 +8,7 @@ ns1:subSetting , , , + , , , , @@ -23,9 +24,12 @@ , , , + , + , + , , ; - ns1:windowGeometry "617x627+2053+346" . + ns1:windowGeometry "692x790+2233+317" . a ns1:SubSetting ; ns1:level 0e+00 ; @@ -39,6 +43,10 @@ ns1:level 0e+00 ; ns1:sub . + a ns1:SubSetting ; + ns1:level 0e+00 ; + ns1:sub . + a ns1:SubSetting ; ns1:level 0e+00 ; ns1:sub . @@ -99,6 +107,18 @@ ns1:level 0e+00 ; ns1:sub . + a ns1:SubSetting ; + ns1:level 0e+00 ; + ns1:sub . + + a ns1:SubSetting ; + ns1:level 0e+00 ; + ns1:sub . + + a ns1:SubSetting ; + ns1:level 0e+00 ; + ns1:sub . + a ns1:SubSetting ; ns1:level 0e+00 ; ns1:sub . diff --git a/show/dance2015/sessions/keyboardcomposer/fixed.n3 b/show/dance2015/sessions/keyboardcomposer/fixed.n3 --- a/show/dance2015/sessions/keyboardcomposer/fixed.n3 +++ b/show/dance2015/sessions/keyboardcomposer/fixed.n3 @@ -5,7 +5,8 @@ @prefix xsd: . ns1:currentRow 0 ; - ns1:subSetting . + ns1:subSetting ; + ns1:windowGeometry "378x108+1319+0" . a ns1:SubSetting ; ns1:level 3.3e-01 ; diff --git a/show/dance2015/sessions/subcomposer/default.n3 b/show/dance2015/sessions/subcomposer/default.n3 --- a/show/dance2015/sessions/subcomposer/default.n3 +++ b/show/dance2015/sessions/subcomposer/default.n3 @@ -4,8 +4,8 @@ @prefix xml: . @prefix xsd: . - ns1:currentSub ; - ns1:windowGeometry "324x638+2673+346" . + ns1:currentSub ; + ns1:windowGeometry "324x638+2797+343" . a ns1:LocalSubmaster, ns1:Submaster . @@ -87,6 +87,23 @@ a ns1:LocalSubmaster, ns1:Submaster . + a ns1:LocalSubmaster, + ns1:Submaster ; + ns1:lightLevel , + , + , + , + . + + a ns1:LocalSubmaster, + ns1:Submaster . + + a ns1:LocalSubmaster, + ns1:Submaster . + + a ns1:LocalSubmaster, + ns1:Submaster . + a ns1:ChannelSetting ; ns1:channel ; ns1:level 0e+00 . @@ -239,6 +256,26 @@ ns1:channel ; ns1:level 0e+00 . - a ns1:LocalSubmaster, + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:LocalSubmaster, ns1:Submaster . diff --git a/show/dance2015/song11.n3 b/show/dance2015/song11.n3 --- a/show/dance2015/song11.n3 +++ b/show/dance2015/song11.n3 @@ -5,9 +5,11 @@ @prefix xsd: . ns1:curve , - ; + , + ; ns1:effect , - . + , + . a ns1:Curve ; rdfs:label "song11" . @@ -15,6 +17,9 @@ a ns1:Curve ; rdfs:label "full" . + a ns1:Curve ; + rdfs:label "widered" . + a ns1:Effect ; rdfs:label "song11" ; ns1:code "env = ", @@ -25,3 +30,8 @@ ns1:code "env = ", "out = * env" . + a ns1:Effect ; + rdfs:label "widered" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2015/song11/curve-3.n3 b/show/dance2015/song11/curve-3.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song11/curve-3.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 135.6 0 137.6 1 207.2 1 209.2 0" . + diff --git a/show/dance2015/song14.n3 b/show/dance2015/song14.n3 --- a/show/dance2015/song14.n3 +++ b/show/dance2015/song14.n3 @@ -7,11 +7,13 @@ ns1:curve , , , - ; + , + ; ns1:effect , , , - . + , + . a ns1:Curve ; rdfs:label "center" . @@ -25,6 +27,9 @@ a ns1:Curve ; rdfs:label "full" . + a ns1:Curve ; + rdfs:label "whiteLed" . + a ns1:Effect ; rdfs:label "center" ; ns1:code "env = ", @@ -45,3 +50,9 @@ ns1:code "env = ", "out = * env" . + a ns1:Effect, + ; + rdfs:label "whiteLed" ; + ns1:code "env = ", + "out = [Strip.solid('LR', (1,1,1)) * env, Strip.solid('W', (1,.5,.5)) * env]" . + diff --git a/show/dance2015/song14/curve-1.n3 b/show/dance2015/song14/curve-1.n3 --- a/show/dance2015/song14/curve-1.n3 +++ b/show/dance2015/song14/curve-1.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 61.28 0 63.28 1 96.32 1 98.32 0" . + ns1:points "0 0 61.28 0 63.28 1 101.4 1 103.4 0" . diff --git a/show/dance2015/song14/curve-2.n3 b/show/dance2015/song14/curve-2.n3 --- a/show/dance2015/song14/curve-2.n3 +++ b/show/dance2015/song14/curve-2.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 11.29 0 13.29 0.8086 163.2 0.8086 165.2 0" . + ns1:points "0 0 2.643 0 4.643 0.8086 62.11 0.8086 66.81 0.2543 95.05 0.2543 106.9 1 163.5 1 165.2 0" . diff --git a/show/dance2015/song14/curve-3.n3 b/show/dance2015/song14/curve-3.n3 --- a/show/dance2015/song14/curve-3.n3 +++ b/show/dance2015/song14/curve-3.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 13.35 0 15.35 0.4531 163.3 0.4531 165.3 0" . + ns1:points "0 0 2.629 0 4.629 0.4531 97.86 0.4531 108.7 0.884 163.1 0.9067 164.5 0.4531 165.3 0" . diff --git a/show/dance2015/song14/curve-5.n3 b/show/dance2015/song14/curve-5.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song14/curve-5.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 147.2 0 155.2 0" . + diff --git a/show/dance2015/song15.n3 b/show/dance2015/song15.n3 --- a/show/dance2015/song15.n3 +++ b/show/dance2015/song15.n3 @@ -5,9 +5,15 @@ @prefix xsd: . ns1:curve , - ; + , + , + , + ; ns1:effect , - . + , + , + , + . a ns1:Curve ; rdfs:label "full" . @@ -15,6 +21,15 @@ a ns1:Curve ; rdfs:label "full to music" . + a ns1:Curve ; + rdfs:label "song15" . + + a ns1:Curve ; + rdfs:label "back chase" . + + a ns1:Curve ; + rdfs:label "cyc to music" . + a ns1:Effect ; rdfs:label "full" ; ns1:code "env = ", @@ -27,3 +42,21 @@ "music = ", "out = * (music*2) * env" . + a ns1:Effect ; + rdfs:label "song15" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect, + ; + rdfs:label "back chase" ; + ns1:code "env = ", + "out = chase(t, names=backchase, ontime=60/130., offset=0) * env" . + + a ns1:Effect, + ; + rdfs:label "cyc to music" ; + ns1:code "env = ", + "music = ", + "out = * music * env" . + diff --git a/show/dance2015/song15/curve-2.n3 b/show/dance2015/song15/curve-2.n3 --- a/show/dance2015/song15/curve-2.n3 +++ b/show/dance2015/song15/curve-2.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 165.1 0 176.8 0.455 293.9 0.455 305.6 0" . + ns1:points "0 0 110.8 0 111.5 0.4348 111.9 1 125.2 0.4096 181.5 0.3624 188.6 1 244 1 244.7 0.3654 299 0.3304 301.7 0.7425 320.6 0.7292 326.3 0" . diff --git a/show/dance2015/song15/curve-3.n3 b/show/dance2015/song15/curve-3.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song15/curve-3.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 3.031 0 19.72 1 193 1 199.2 0.6908 244 0.528 244.2 0.1769 294.5 0.2653 330.6 1 332.6 0" . + diff --git a/show/dance2015/song15/curve-4.n3 b/show/dance2015/song15/curve-4.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song15/curve-4.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 244.1 0 244.3 1 323.5 1 325.5 0" . + diff --git a/show/dance2015/song15/curve-5.n3 b/show/dance2015/song15/curve-5.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song15/curve-5.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 246.7 0 276.2 0.9912 323 1 325 0" . + diff --git a/show/dance2015/song16.n3 b/show/dance2015/song16.n3 --- a/show/dance2015/song16.n3 +++ b/show/dance2015/song16.n3 @@ -4,7 +4,18 @@ @prefix xml: . @prefix xsd: . + ns1:curve ; + ns1:effect . + ns1:code "env = ", "music = curve(, t+.05)", "out = * music * env" . + a ns1:Curve ; + rdfs:label "widered" . + + a ns1:Effect ; + rdfs:label "widered" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2015/song16/curve-10.n3 b/show/dance2015/song16/curve-10.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song16/curve-10.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 89.46 0 91.46 1 724.7 1 726.7 0" . + diff --git a/show/dance2015/song6.n3 b/show/dance2015/song6.n3 --- a/show/dance2015/song6.n3 +++ b/show/dance2015/song6.n3 @@ -6,10 +6,12 @@ ns1:curve , , - ; + , + ; ns1:effect , , - . + , + . a ns1:Curve ; rdfs:label "song6" . @@ -20,6 +22,9 @@ a ns1:Curve ; rdfs:label "song6glow" . + a ns1:Curve ; + rdfs:label "blacklight" . + a ns1:Effect ; rdfs:label "song6" ; ns1:code "env = ", @@ -35,3 +40,12 @@ ns1:code "env = ", "out = * env" . + a ns1:Effect, + ; + rdfs:label "blacklight" ; + ns1:code "env = ", + "out = [env * p1, env * p2, env * p4]", + "p1 = * .3", + "p2 = Strip.solid('LRW', (0,0,1))", + "p4 = Blacklight(1)" . + diff --git a/show/dance2015/song6/curve-4.n3 b/show/dance2015/song6/curve-4.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song6/curve-4.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 58.48 0 60.48 1 73.55 1 75.55 0" . + diff --git a/show/dance2015/song7.n3 b/show/dance2015/song7.n3 --- a/show/dance2015/song7.n3 +++ b/show/dance2015/song7.n3 @@ -4,14 +4,86 @@ @prefix xml: . @prefix xsd: . - ns1:curve ; - ns1:effect . + ns1:curve , + , + , + , + , + , + , + ; + ns1:effect , + , + , + , + , + , + , + . a ns1:Curve ; rdfs:label "orange" . + a ns1:Curve ; + rdfs:label "cyc" . + + a ns1:Curve ; + rdfs:label "back chase slower" . + + a ns1:Curve ; + rdfs:label "mid-down" . + + a ns1:Curve ; + rdfs:label "f-normal" . + + a ns1:Curve ; + rdfs:label "full" . + + a ns1:Curve ; + rdfs:label "back chase" . + + a ns1:Curve ; + rdfs:label "whiteled" . + a ns1:Effect ; rdfs:label "orange" ; ns1:code "env = ", "out = * env" . + a ns1:Effect ; + rdfs:label "cyc" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect, + ; + rdfs:label "back chase slower" ; + ns1:code "env = ", + "out = chase(t, names=backchase, ontime=60./125, offset=-.11) * env" . + + a ns1:Effect ; + rdfs:label "mid-down" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect ; + rdfs:label "f-normal" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect ; + rdfs:label "full" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect, + ; + rdfs:label "back chase" ; + ns1:code "env = ", + "out = chase(t, names=midrand, ontime=.3, offset=-.11) * env" . + + a ns1:Effect ; + rdfs:label "whiteled" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2015/song7/curve-1.n3 b/show/dance2015/song7/curve-1.n3 --- a/show/dance2015/song7/curve-1.n3 +++ b/show/dance2015/song7/curve-1.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 3.478 0 26.69 1 138.8 1 379.9 1 383.2 0" . + ns1:points "0 0 3.478 0 28.09 0.5201 99.43 0.5425 121.7 0.801 122.8 0 139.4 0 379.9 1 383.2 0" . diff --git a/show/dance2015/song7/curve-2.n3 b/show/dance2015/song7/curve-2.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song7/curve-2.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 7.225 0 18.54 1 381.8 1 383.8 0" . + diff --git a/show/dance2015/song7/curve-3.n3 b/show/dance2015/song7/curve-3.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song7/curve-3.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 123.1 0 124.5 1 358 1 377.8 0" . + diff --git a/show/dance2015/song7/curve-4.n3 b/show/dance2015/song7/curve-4.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song7/curve-4.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 82.61 0 84.59 1 120.4 1 121.1 0" . + diff --git a/show/dance2015/song7/curve-5.n3 b/show/dance2015/song7/curve-5.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song7/curve-5.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 126.6 0 128.6 1 381.2 1 383.2 0" . + diff --git a/show/dance2015/song7/curve-6.n3 b/show/dance2015/song7/curve-6.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song7/curve-6.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 372.2 0 374.2 1 382 1 384 0" . + diff --git a/show/dance2015/song7/curve-7.n3 b/show/dance2015/song7/curve-7.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song7/curve-7.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 66.8 0 68.8 1 88.8 1 90.8 0" . + diff --git a/show/dance2015/song7/curve-8.n3 b/show/dance2015/song7/curve-8.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song7/curve-8.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 120.6 0 120.6 1 142.7 1 144.7 0" . + diff --git a/show/dance2015/song8.n3 b/show/dance2015/song8.n3 --- a/show/dance2015/song8.n3 +++ b/show/dance2015/song8.n3 @@ -4,14 +4,44 @@ @prefix xml: . @prefix xsd: . - ns1:curve ; - ns1:effect . + ns1:curve , + , + , + ; + ns1:effect , + , + , + . a ns1:Curve ; rdfs:label "houseside" . + a ns1:Curve ; + rdfs:label "ctr-cool" . + + a ns1:Curve ; + rdfs:label "full" . + + a ns1:Curve ; + rdfs:label "song8" . + a ns1:Effect ; rdfs:label "houseside" ; ns1:code "env = ", "out = * env" . + a ns1:Effect ; + rdfs:label "ctr-cool" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect ; + rdfs:label "full" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect ; + rdfs:label "song8" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2015/song8/curve-1.n3 b/show/dance2015/song8/curve-1.n3 --- a/show/dance2015/song8/curve-1.n3 +++ b/show/dance2015/song8/curve-1.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 177 0 179 1 183 1 185 0" . + ns1:points "0 0 250.6 0 258.6 0" . diff --git a/show/dance2015/song8/curve-2.n3 b/show/dance2015/song8/curve-2.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song8/curve-2.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 95.62 0 110.4 1 279.9 1 281.9 0" . + diff --git a/show/dance2015/song8/curve-3.n3 b/show/dance2015/song8/curve-3.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song8/curve-3.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 158.6 0 160.6 0.382 197.3 0.382 204 0.6091 273.9 0.6091 276.1 0.8995 280.2 0.8995 281.2 0" . + diff --git a/show/dance2015/song8/curve-4.n3 b/show/dance2015/song8/curve-4.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song8/curve-4.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 2.907 0 5.544 0.4651 16.33 1 108.8 1 109.7 0" . + diff --git a/show/dance2015/song9.n3 b/show/dance2015/song9.n3 --- a/show/dance2015/song9.n3 +++ b/show/dance2015/song9.n3 @@ -6,10 +6,17 @@ ns1:curve , , - ; + , + , + ; ns1:effect , - , - . + , + . + + a ns1:Effect ; + rdfs:label "blacklight" ; + ns1:code "level = ", + "out = [Blacklight(level), Strip.solid('LRW', (0, 0, .16)) * level]" . a ns1:Curve ; rdfs:label "song9" . @@ -20,18 +27,24 @@ a ns1:Curve ; rdfs:label "full" . + a ns1:Curve ; + rdfs:label "blacklight" . + + a ns1:Curve ; + rdfs:label "blue" . + a ns1:Effect ; rdfs:label "song9" ; ns1:code "env = ", "out = * env" . - a ns1:Effect ; - rdfs:label "blacklight" ; - ns1:code "env = ", - "out = * env" . - a ns1:Effect ; rdfs:label "full" ; ns1:code "env = ", "out = * env" . + a ns1:Effect ; + rdfs:label "blue" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2015/song9/curve-1.n3 b/show/dance2015/song9/curve-1.n3 --- a/show/dance2015/song9/curve-1.n3 +++ b/show/dance2015/song9/curve-1.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 8.608 0 23.55 1 199.5 1 215.7 1 217.7 0" . + ns1:points "0 0 3.805 0 7.573 1 53.55 1 61.43 0.9266 75.69 0.9266 148 0.9165 199.5 1 215.7 1 217.7 0" . diff --git a/show/dance2015/song9/curve-2.n3 b/show/dance2015/song9/curve-2.n3 --- a/show/dance2015/song9/curve-2.n3 +++ b/show/dance2015/song9/curve-2.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 25.27 0 40.73 1 144.4 1 165.8 0" . + ns1:points "0 0 23.87 0 165.8 0" . diff --git a/show/dance2015/song9/curve-4.n3 b/show/dance2015/song9/curve-4.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song9/curve-4.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0" . + diff --git a/show/dance2015/song9/curve-5.n3 b/show/dance2015/song9/curve-5.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song9/curve-5.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 163.9 0 165.9 1 216.3 1 218.3 0" . + diff --git a/show/dance2015/sub/ctr-cool.n3 b/show/dance2015/sub/ctr-cool.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/sub/ctr-cool.n3 @@ -0,0 +1,89 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + a ns1:Submaster ; + rdfs:label "ctr-cool" ; + ns1:lightLevel , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.75e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 3.36e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 8e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 8e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 8e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 8e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 8e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 3.3e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + diff --git a/show/dance2015/sub/leds.n3 b/show/dance2015/sub/leds.n3 --- a/show/dance2015/sub/leds.n3 +++ b/show/dance2015/sub/leds.n3 @@ -32,11 +32,15 @@ eff:e5 a :Effect; :code "level = currentSubLevel()", "out = Strip.solid('W', (0,0,1)) * level" . -sub:blacklight a :Submaster ; rdfs:label "blacklight" ; :drivesEffect eff:e6, eff:e7 . +sub:blacklight a :Submaster ; rdfs:label "blacklight" ; :drivesEffect eff:e6 . eff:e6 a :Effect; :code "level = currentSubLevel()", - "out = Blacklight(level)" . -eff:e7 a :Effect; - :code "level = currentSubLevel()", - "out = Strip.solid('LRW', (0, 0, .16)) * level" . + "out = [Blacklight(level), Strip.solid('LRW', (0, 0, .16)) * level]" . + + rdfs:label "whiteled" ; a :Submaster ; :drivesEffect eff:e8 . +eff:e8 a :Effect; +:code "level = currentSubLevel()", + + "out = [Strip.solid('LR', (1,1,1)) * level, Strip.solid('W', (1,.5,.5)) * level]" . + diff --git a/show/dance2015/sub/song15.n3 b/show/dance2015/sub/song15.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/sub/song15.n3 @@ -0,0 +1,179 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + a ns1:Submaster ; + rdfs:label "song15" ; + ns1:lightLevel , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.96e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 3.25e-02 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.3e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 3.75e-02 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.3e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 6.9e-02 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.96e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.96e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 3.036e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 9.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 9.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 9.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.29e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.96e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5e-02 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 9.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.96e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.3e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 3.65e-02 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 7.15e-02 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.3e-01 . + diff --git a/show/dance2015/sub/song8.n3 b/show/dance2015/sub/song8.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/sub/song8.n3 @@ -0,0 +1,99 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + a ns1:Submaster ; + rdfs:label "song8" ; + ns1:lightLevel , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.1e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1.722e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 7.7e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 7.7e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 8.5e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.6585e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.697e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 8.5e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.1e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 7.7e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.1e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 7.7e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.1e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.61e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.1e-01 . + diff --git a/show/dance2015/sub/whiteled.n3 b/show/dance2015/sub/whiteled.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/sub/whiteled.n3 @@ -0,0 +1,8 @@ +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . +@prefix : . + + rdfs:label "whiteled" ; a :Submaster . +