diff --git a/show/dance2015/effectClass.n3 b/show/dance2015/effectClass.n3 --- a/show/dance2015/effectClass.n3 +++ b/show/dance2015/effectClass.n3 @@ -71,8 +71,12 @@ chase:backchase a :Chase; :channels ( ) . + +chase:mid a :Chase; :channels ( + ch:down-c1 ch:down-c3 ch:down-c4 ch:down-wide + ) . 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 + 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 ) . effect:midChase a :EffectClass; 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/subcomposer/default.n3 b/show/dance2015/sessions/subcomposer/default.n3 --- a/show/dance2015/sessions/subcomposer/default.n3 +++ b/show/dance2015/sessions/subcomposer/default.n3 @@ -277,5 +277,30 @@ ns1:level 0e+00 . a ns1:LocalSubmaster, - ns1:Submaster . + ns1:Submaster ; + 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 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/song13/curve-2.n3 b/show/dance2015/song13/curve-2.n3 --- a/show/dance2015/song13/curve-2.n3 +++ b/show/dance2015/song13/curve-2.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 225.2 0 229 0.2327 265.1 0.2229 274.8 0 331.2 0 337.3 1 340.2 1 342.6 0" . + ns1:points "0 0 225.2 0 229 0.3329 265.1 0.3189 274.8 0 331.2 0 337.3 0.6302 340.2 0.6302 342.6 0" . diff --git a/show/dance2015/song14.n3 b/show/dance2015/song14.n3 --- a/show/dance2015/song14.n3 +++ b/show/dance2015/song14.n3 @@ -9,13 +9,15 @@ , , , - ; + , + ; ns1:effect , , , , , - . + , + . a ns1:Curve ; rdfs:label "center" . @@ -35,6 +37,9 @@ a ns1:Curve ; rdfs:label "frontrand chase" . + a ns1:Curve ; + rdfs:label "slow color chase" . + a ns1:Effect ; rdfs:label "center" ; ns1:code "env = ", @@ -67,3 +72,13 @@ ns1:code "env = ", "out = chase(t, names=frontrand, ontime=.25, offset=0) * env" . + a ns1:Effect, + ; + rdfs:label "slow color chase" ; + ns1:code "b = * nsin((t+.6) / period)", + "env = ", + "out = [r*env,y*env,b*env]", + "period = 1", + "r = * nsin(t / period)", + "y = * nsin((t+.3) / period)" . + diff --git a/show/dance2015/song14/curve-4.n3 b/show/dance2015/song14/curve-4.n3 --- a/show/dance2015/song14/curve-4.n3 +++ b/show/dance2015/song14/curve-4.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 152.8 0 157.1 1 163.1 1 165.8 0" . + ns1:points "0 0 152.8 0 156.2 0.3441 158.9 1 163.1 1 165.8 0" . diff --git a/show/dance2015/song14/curve-7.n3 b/show/dance2015/song14/curve-7.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song14/curve-7.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 4.499 0 6.499 1 147.3 1 149.3 0" . + diff --git a/show/dance2015/song7.n3 b/show/dance2015/song7.n3 --- a/show/dance2015/song7.n3 +++ b/show/dance2015/song7.n3 @@ -80,7 +80,7 @@ ; rdfs:label "back chase" ; ns1:code "env = ", - "out = chase(t, names=midrand, ontime=.3, offset=-.11) * env" . + "out = chase(t+.2, names=mid, ontime=60/127.*2, offset=0) * env" . a ns1:Effect ; rdfs:label "whiteled" ; diff --git a/show/dance2015/song7/curve-2.n3 b/show/dance2015/song7/curve-2.n3 --- a/show/dance2015/song7/curve-2.n3 +++ b/show/dance2015/song7/curve-2.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 7.225 0 18.54 1 381.8 1 383.8 0" . + ns1:points "0 0 7.225 0 18.54 1 83.07 1 86.89 0 121.5 0 123.1 1 381.8 1 383.8 0" . diff --git a/show/dance2015/song7/curve-4.n3 b/show/dance2015/song7/curve-4.n3 --- a/show/dance2015/song7/curve-4.n3 +++ b/show/dance2015/song7/curve-4.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 82.61 0 84.59 1 120.4 1 121.1 0" . + ns1:points "0 0" . diff --git a/show/dance2015/song7/curve-5.n3 b/show/dance2015/song7/curve-5.n3 --- a/show/dance2015/song7/curve-5.n3 +++ b/show/dance2015/song7/curve-5.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 126.6 0 128.6 1 381.2 1 383.2 0" . + ns1:points "0 0 126.6 0 130.7 0.5585 289.6 0.5501 381.2 1 383.2 0" . diff --git a/show/dance2015/song7/curve-7.n3 b/show/dance2015/song7/curve-7.n3 --- a/show/dance2015/song7/curve-7.n3 +++ b/show/dance2015/song7/curve-7.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 66.8 0 68.8 1 88.8 1 90.8 0" . + ns1:points "0 0 83.66 0 83.9 1 119.4 1 121.4 0" .