diff --git a/show/dance2015/effectClass.n3 b/show/dance2015/effectClass.n3 --- a/show/dance2015/effectClass.n3 +++ b/show/dance2015/effectClass.n3 @@ -88,18 +88,18 @@ effect:backChaseSlower a :EffectClass; :code "out = chase(t, names=backchase, ontime=.7, offset=-.11) * env" . chase:frontrand 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 @@ -29,7 +29,7 @@ , , ; - ns1:windowGeometry "692x790+2233+317" . + ns1:windowGeometry "692x790+2033+296" . a ns1:SubSetting ; ns1:level 0e+00 ; diff --git a/show/dance2015/song14.n3 b/show/dance2015/song14.n3 --- a/show/dance2015/song14.n3 +++ b/show/dance2015/song14.n3 @@ -8,12 +8,14 @@ , , , - ; + , + ; ns1:effect , , , , - . + , + . a ns1:Curve ; rdfs:label "center" . @@ -30,6 +32,9 @@ a ns1:Curve ; rdfs:label "whiteLed" . + a ns1:Curve ; + rdfs:label "frontrand chase" . + a ns1:Effect ; rdfs:label "center" ; ns1:code "env = ", @@ -56,3 +61,9 @@ ns1:code "env = ", "out = [Strip.solid('LR', (1,1,1)) * env, Strip.solid('W', (1,.5,.5)) * env]" . + a ns1:Effect, + ; + rdfs:label "frontrand chase" ; + ns1:code "env = ", + "out = chase(t, names=frontrand, ontime=.25, offset=0) * env" . + 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 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" . + 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 0.6035 163.5 0.6035 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 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" . + ns1:points "0 0 2.629 0 4.629 0.4531 97.86 0.4531 108.7 0.5564 163.1 0.5706 164.5 0.4531 165.3 0" . diff --git a/show/dance2015/song14/curve-6.n3 b/show/dance2015/song14/curve-6.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song14/curve-6.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 4.246 0 6.246 1 146.7 1 154.6 0" . + diff --git a/show/dance2015/song9.n3 b/show/dance2015/song9.n3 --- a/show/dance2015/song9.n3 +++ b/show/dance2015/song9.n3 @@ -8,8 +8,10 @@ , , , - ; + , + ; ns1:effect , + , , . @@ -33,11 +35,20 @@ a ns1:Curve ; rdfs:label "blue" . + a ns1:Curve ; + rdfs:label "mid chase" . + a ns1:Effect ; rdfs:label "song9" ; ns1:code "env = ", "out = * env" . + a ns1:Effect, + ; + rdfs:label "mid chase" ; + ns1:code "env = ", + "out = chase(t, names=midrand, ontime=.3, offset=-.11) * env" . + a ns1:Effect ; rdfs:label "full" ; ns1:code "env = ", diff --git a/show/dance2015/song9/curve-6.n3 b/show/dance2015/song9/curve-6.n3 new file mode 100644 --- /dev/null +++ b/show/dance2015/song9/curve-6.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 0.1 0 2.1 1 20.75 1 22.75 0" . +