diff --git a/show/dance2015/effectClass.n3 b/show/dance2015/effectClass.n3 --- a/show/dance2015/effectClass.n3 +++ b/show/dance2015/effectClass.n3 @@ -33,23 +33,19 @@ effect:fullToMusic a :EffectClass; rdfs: :quneoNote 38; :code "out = * music * env" . - - effect:blacklight a :EffectClass; rdfs:label "blacklight"; :quneoNote 37; :code "out = [env * p1, env * p2, env * p4]", "p1 = * .3", - "p2 = Strip.solid('LR', (0,0,1))", + "p2 = Strip.solid('LRW', (0,0,1))", "p4 = Blacklight(1)" . - effect:whiteLed a :EffectClass; rdfs:label "whiteLed"; - :code "out = Strip.solid('LR', (1,1,1)) * env" . - + :code "out = [Strip.solid('LR', (1,1,1)) * env, Strip.solid('W', (1,.5,.5)) * env]" . effect:slowColor a :EffectClass; rdfs:label "slow color chase"; @@ -63,13 +59,16 @@ effect:slowColor a :EffectClass; . chase:backchase a :Chase; :channels ( - - - - - - - + + + + + + + + + + ) . 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 @@ -7,6 +7,7 @@ ns1:currentRow 0 ; ns1:subSetting , , + , , , , @@ -34,6 +35,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 . 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+2619+415" . + ns1:currentSub ; + ns1:windowGeometry "324x638+2673+346" . a ns1:LocalSubmaster, ns1:Submaster . @@ -75,6 +75,18 @@ , . + a ns1:LocalSubmaster, + ns1:Submaster ; + ns1:lightLevel , + , + . + + a ns1:LocalSubmaster, + ns1:Submaster . + + a ns1:LocalSubmaster, + ns1:Submaster . + a ns1:ChannelSetting ; ns1:channel ; ns1:level 0e+00 . @@ -215,21 +227,18 @@ ns1:channel ; ns1:level 0 . - a ns1:LocalSubmaster, - ns1:Submaster ; - ns1:lightLevel , - , - . - a ns1:ChannelSetting ; ns1:channel ; ns1:level 0e+00 . a ns1:ChannelSetting ; ns1:channel ; - ns1:level 1e+00 . + ns1:level 0e+00 . a ns1:ChannelSetting ; ns1:channel ; ns1:level 0e+00 . + a ns1:LocalSubmaster, + ns1:Submaster . + diff --git a/show/dance2015/song1/curve-18.n3 b/show/dance2015/song1/curve-18.n3 --- a/show/dance2015/song1/curve-18.n3 +++ b/show/dance2015/song1/curve-18.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 154.3 0.035 168.2 1 234.8 1 236.8 0" . + ns1:points "0 0 168.8 0.035 185.7 1 205.6 1 217.6 0 233 0 236.8 0" . diff --git a/show/dance2015/song12/curve-1.n3 b/show/dance2015/song12/curve-1.n3 --- a/show/dance2015/song12/curve-1.n3 +++ b/show/dance2015/song12/curve-1.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 2.786 0 6.471 1 159.6 1 161.6 0" . + ns1:points "0 0 2.786 0 6.166 1 159.6 1 161.6 0" . diff --git a/show/dance2015/song12/curve-2.n3 b/show/dance2015/song12/curve-2.n3 --- a/show/dance2015/song12/curve-2.n3 +++ b/show/dance2015/song12/curve-2.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 152.2 0 155.5 0.6256 159.7 0.6256 161.7 0" . + ns1:points "0 0 57.08 0.3875 152.2 0 155.5 0.6256 159.7 0.6256 161.7 0" . diff --git a/show/dance2015/song2.n3 b/show/dance2015/song2.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song2.n3 @@ -0,0 +1,17 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:curve ; + ns1:effect . + + a ns1:Curve ; + rdfs:label "song2" . + + a ns1:Effect ; + rdfs:label "song2" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2015/song2/curve-1.n3 b/show/dance2015/song2/curve-1.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song2/curve-1.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 45.79 0 47.79 1 67.79 1 69.79 0" . + diff --git a/show/dance2015/song6.n3 b/show/dance2015/song6.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song6.n3 @@ -0,0 +1,37 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:curve , + , + ; + ns1:effect , + , + . + + a ns1:Curve ; + rdfs:label "song6" . + + a ns1:Curve ; + rdfs:label "full" . + + a ns1:Curve ; + rdfs:label "song6glow" . + + a ns1:Effect ; + rdfs:label "song6" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect ; + rdfs:label "full" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect ; + rdfs:label "song6glow" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2015/song6/curve-1.n3 b/show/dance2015/song6/curve-1.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song6/curve-1.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 2.816 0 4.078 1 60.63 1 61.43 0 70.96 0 71.92 1 157.1 1 159.1 0" . + diff --git a/show/dance2015/song6/curve-2.n3 b/show/dance2015/song6/curve-2.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song6/curve-2.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 148 0 153.3 0.7381 158.2 0.746 160.3 0" . + diff --git a/show/dance2015/song6/curve-3.n3 b/show/dance2015/song6/curve-3.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song6/curve-3.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 59.05 0 60.23 1 73.9 1 75.37 0 133.7 0 138.2 0" . + 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 35.58 0 87.39 0.9883 135.5 0.9284 379.9 1 383.2 0" . + ns1:points "0 0 3.478 0 26.69 1 138.8 1 379.9 1 383.2 0" . diff --git a/show/dance2015/sub/song2.n3 b/show/dance2015/sub/song2.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/sub/song2.n3 @@ -0,0 +1,159 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + a ns1:Submaster ; + rdfs:label "song2" ; + ns1:lightLevel , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 6.0775e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.25e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 2.7625e-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 9.8e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.4e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 6.1e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 6.05e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.4e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.4e-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 3.1025e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.865e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 3.1875e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 2.55e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.3e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.9e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 7e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.4e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + diff --git a/show/dance2015/sub/song6.n3 b/show/dance2015/sub/song6.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/sub/song6.n3 @@ -0,0 +1,189 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + a ns1:Submaster ; + rdfs:label "song6" ; + ns1:lightLevel , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + . + + 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.9e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.3e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 6.1e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 2.55e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5e-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 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 4.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 6.05e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.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 5e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + 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 5e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 2.772e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.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 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 0e+00 . + diff --git a/show/dance2015/sub/song6glow.n3 b/show/dance2015/sub/song6glow.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/sub/song6glow.n3 @@ -0,0 +1,59 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + a ns1:Submaster ; + rdfs:label "song6glow" ; + ns1:lightLevel , + , + , + , + , + , + , + , + , + . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.2e-01 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 5.2e-01 . +