diff --git a/show/dance2014/song1.n3 b/show/dance2014/song1.n3 --- a/show/dance2014/song1.n3 +++ b/show/dance2014/song1.n3 @@ -4,10 +4,15 @@ @prefix xml: . @prefix xsd: . - ns1:curve , + ns1:curve , + , ; ns1:effect , - . + , + . + + a ns1:Curve ; + rdfs:label "patio" . a ns1:Curve ; rdfs:label "lowstage" . @@ -25,3 +30,8 @@ ns1:code "env = ", "out = * env" . + a ns1:Effect ; + rdfs:label "patio" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2014/song1/curve-1.n3 b/show/dance2014/song1/curve-1.n3 new file mode 100644 --- /dev/null +++ b/show/dance2014/song1/curve-1.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 5.473 0 7.473 0.2689 207.3 0.2689 209.3 0" . + diff --git a/show/dance2014/song1/curve-13.n3 b/show/dance2014/song1/curve-13.n3 --- a/show/dance2014/song1/curve-13.n3 +++ b/show/dance2014/song1/curve-13.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 3.711 0 5.711 1 199.6 1 201.6 0" . + ns1:points "0 0 3.711 0 5.711 1 207.5 1 209.5 0" . diff --git a/show/dance2014/song1/curve-14.n3 b/show/dance2014/song1/curve-14.n3 --- a/show/dance2014/song1/curve-14.n3 +++ b/show/dance2014/song1/curve-14.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 186.2 0 188.2 1 208.2 1 210.2 0" . + ns1:points "0 0 3.986 0 6.132 0.7963 184.8 0.7712 188.2 1 207.8 1 209.8 0" . diff --git a/show/dance2014/song17.n3 b/show/dance2014/song17.n3 --- a/show/dance2014/song17.n3 +++ b/show/dance2014/song17.n3 @@ -9,12 +9,14 @@ , , , - ; + , + ; ns1:effect , , , , - . + , + . a ns1:Effect ; rdfs:label "sub patio" ; @@ -38,6 +40,9 @@ a ns1:Curve ; rdfs:label "full to music" . + a ns1:Curve ; + rdfs:label "patio" . + a ns1:Effect ; rdfs:label "patio" ; ns1:code "env = ", @@ -67,3 +72,8 @@ "music = * 2", "out = * music * env" . + a ns1:Effect ; + rdfs:label "patio" ; + ns1:code "env = ", + "out = * env" . + diff --git a/show/dance2014/song17/curve-2.n3 b/show/dance2014/song17/curve-2.n3 --- a/show/dance2014/song17/curve-2.n3 +++ b/show/dance2014/song17/curve-2.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 84.01 0 96.36 1 110 1 125.5 0.3511 164.9 0.3662 166.7 0.9986 168.8 1 171 0" . + ns1:points "0 0 84.01 0 96.36 0.2713 110 0.2713 125.5 0.09522 164.9 0.1539 166.8 0.239 168.9 0.2394 171 0" . diff --git a/show/dance2014/song17/curve-4.n3 b/show/dance2014/song17/curve-4.n3 --- a/show/dance2014/song17/curve-4.n3 +++ b/show/dance2014/song17/curve-4.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 83.34 0 101.1 1 126.4 1 128.4 0" . + ns1:points "0 0 83.34 0 101.1 1 168.1 1 170.1 0" . diff --git a/show/dance2014/song17/curve-7.n3 b/show/dance2014/song17/curve-7.n3 new file mode 100644 --- /dev/null +++ b/show/dance2014/song17/curve-7.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0" . + diff --git a/show/dance2014/song8/curve-3.n3 b/show/dance2014/song8/curve-3.n3 --- a/show/dance2014/song8/curve-3.n3 +++ b/show/dance2014/song8/curve-3.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 4.332 0 5.27 1 207.7 1 209.7 0" . + ns1:points "0 0 3.47 0 5.076 1 207.7 1 209.7 0" . diff --git a/show/dance2014/sub/curtain.n3 b/show/dance2014/sub/curtain.n3 new file mode 100644 --- /dev/null +++ b/show/dance2014/sub/curtain.n3 @@ -0,0 +1,91 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + a ns1:Submaster ; + rdfs:label "curtain" ; + ns1:group "showsliders" ; + ns1:lightLevel , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + ns1:order "4" . + + 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 1e+00 . + + 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 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 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 0e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + diff --git a/show/dance2014/sub/cyc.n3 b/show/dance2014/sub/cyc.n3 --- a/show/dance2014/sub/cyc.n3 +++ b/show/dance2014/sub/cyc.n3 @@ -7,6 +7,7 @@ a ns1:Submaster ; rdfs:label "cyc" ; ns1:color "#00ffff"; + ns1:group "showsliders"; ns1:order "2"; ns1:lightLevel , , , diff --git a/show/dance2014/sub/full.n3 b/show/dance2014/sub/full.n3 --- a/show/dance2014/sub/full.n3 +++ b/show/dance2014/sub/full.n3 @@ -6,7 +6,7 @@ a ns1:Submaster ; rdfs:label "full" ; - ns1:color "#ffffff"; ns1:group "showsliders"; + ns1:color "#ffffff"; ns1:group "showsliders"; ns1:order "5"; ns1:lightLevel , , diff --git a/show/dance2014/sub/house.n3 b/show/dance2014/sub/house.n3 --- a/show/dance2014/sub/house.n3 +++ b/show/dance2014/sub/house.n3 @@ -7,7 +7,7 @@ a ns1:Submaster ; ns1:color "#400040"; rdfs:label "house" ; - ns1:group "showsliders"; + ns1:group "showsliders"; ns1:order "3"; ns1:lightLevel , , diff --git a/show/dance2014/sub/patio.n3 b/show/dance2014/sub/patio.n3 --- a/show/dance2014/sub/patio.n3 +++ b/show/dance2014/sub/patio.n3 @@ -6,10 +6,15 @@ a ns1:Submaster ; rdfs:label "patio" ; - ns1:color "#505050"; + ns1:color "#505050" ; ns1:lightLevel , . + a ns1:Submaster ; + rdfs:label "patio" ; + ns1:lightLevel , + . + a ns1:ChannelSetting ; ns1:channel ; ns1:level 6.1e-01 . @@ -18,3 +23,11 @@ ns1:channel ; ns1:level 1e+00 . + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 1e+00 . + diff --git a/show/dance2014/sub/sharlyn.n3 b/show/dance2014/sub/sharlyn.n3 --- a/show/dance2014/sub/sharlyn.n3 +++ b/show/dance2014/sub/sharlyn.n3 @@ -6,7 +6,7 @@ a ns1:Submaster ; rdfs:label "sharlyn" ; - ns1:group "showsliders"; + ns1:group "showsliders"; ns1:order "1"; ns1:lightLevel . a ns1:ChannelSetting ;