diff --git a/show/dance2014/patch-source.n3 b/show/dance2014/patch-source.n3 --- a/show/dance2014/patch-source.n3 +++ b/show/dance2014/patch-source.n3 @@ -57,25 +57,25 @@ [ :name "strobespeed"; :output dmx:c47 ] . [ :name "strobebright"; :output dmx:c48 ] . -[ :name "b11-x"; :output dmx:c54 ] . +#[ :name "b11-x"; :output dmx:c54 ] . [ :name "b12-low"; :output dmx:c53 ] . -[ :name "b13-x"; :output dmx:c52 ] . +#[ :name "b13-x"; :output dmx:c52 ] . [ :name "b14-yel"; :output dmx:c51 ] . [ :name "b15-red"; :output dmx:c50 ] . -[ :name "b16-x"; :output dmx:c49 ] . +#[ :name "b16-x"; :output dmx:c49 ] . [ :name "b21-edge"; :output dmx:c55 ] . [ :name "b22-c"; :output dmx:c56 ] . [ :name "b23-up"; :output dmx:c57 ] . [ :name "b24-up"; :output dmx:c58 ] . -[ :name "b25-x"; :output dmx:c59 ] . +#[ :name "b25-x"; :output dmx:c59 ] . [ :name "b26-edge"; :output dmx:c60 ] . -[ :name "b31-x"; :output dmx:c61 ] . +#[ :name "b31-x"; :output dmx:c61 ] . [ :name "b32-red"; :output dmx:c62 ] . -[ :name "b33-x"; :output dmx:c63 ] . +#[ :name "b33-x"; :output dmx:c63 ] . [ :name "b34-yel"; :output dmx:c64 ] . -[ :name "b35-x"; :output dmx:c65 ] . +#[ :name "b35-x"; :output dmx:c65 ] . [ :name "b36-low"; :output dmx:c66 ] . [ :name "house-side"; :output dmx:c68 ] . @@ -84,13 +84,13 @@ [ :name "house3"; :output dmx:c71 ] . [ :name "house2"; :output dmx:c72 ] . -[ :name "rgb1-r"; :output dmx:c73 ] . -[ :name "rgb1-g"; :output dmx:c74 ] . -[ :name "rgb1-b"; :output dmx:c75 ] . +#[ :name "rgb1-r"; :output dmx:c73 ] . +#[ :name "rgb1-g"; :output dmx:c74 ] . +#[ :name "rgb1-b"; :output dmx:c75 ] . -[ :name "rgb2-r"; :output dmx:c80 ] . -[ :name "rgb2-g"; :output dmx:c81 ] . -[ :name "rgb2-b"; :output dmx:c82 ] . +#[ :name "rgb2-r"; :output dmx:c80 ] . +#[ :name "rgb2-g"; :output dmx:c81 ] . +#[ :name "rgb2-b"; :output dmx:c82 ] . [ :name "rgb3-mode"; :output dmx:c87 ] . [ :name "rgb3-r"; :output dmx:c88 ] . diff --git a/show/dance2014/song12.n3 b/show/dance2014/song12.n3 --- a/show/dance2014/song12.n3 +++ b/show/dance2014/song12.n3 @@ -4,13 +4,22 @@ @prefix xml: . @prefix xsd: . - ns1:curve ; - ns1:effect . + ns1:curve , + ; + ns1:effect , + . a ns1:Curve ; rdfs:label "sub song12" . + a ns1:Curve ; + rdfs:label "sub full" . + a ns1:Effect ; rdfs:label "sub song12" ; ns1:code "out = * " . + a ns1:Effect ; + rdfs:label "sub full" ; + ns1:code "out = * " . + diff --git a/show/dance2014/song12/curve-1.n3 b/show/dance2014/song12/curve-1.n3 --- a/show/dance2014/song12/curve-1.n3 +++ b/show/dance2014/song12/curve-1.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 2.896 0 7.616 1 111 1 114.9 0" . + ns1:points "0 0 2.896 0 7.616 1 111.3 1 114.9 0" . diff --git a/show/dance2014/song12/curve-2.n3 b/show/dance2014/song12/curve-2.n3 new file mode 100644 --- /dev/null +++ b/show/dance2014/song12/curve-2.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 104.3 0 108.8 1 111.2 1 114.9 0.007634" . + diff --git a/show/dance2014/sub/blue.n3 b/show/dance2014/sub/blue.n3 --- a/show/dance2014/sub/blue.n3 +++ b/show/dance2014/sub/blue.n3 @@ -6,17 +6,24 @@ a ns1:Submaster ; rdfs:label "blue" ; - ns1:lightLevel , + ns1:lightLevel , + , , , + , , , , - . + , + . + + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 4.05e-01 . a ns1:ChannelSetting ; ns1:channel ; - ns1:level 1 . + ns1:level 0e+00 . a ns1:ChannelSetting ; ns1:channel ; @@ -26,6 +33,10 @@ ns1:channel ; ns1:level 1e+00 . + a ns1:ChannelSetting ; + ns1:channel ; + ns1:level 3.8e-01 . + a ns1:ChannelSetting ; ns1:channel ; ns1:level 1e+00 . @@ -36,9 +47,13 @@ a ns1:ChannelSetting ; ns1:channel ; - ns1:level 4.8e-01 . + ns1:level 5.8e-01 . a ns1:ChannelSetting ; ns1:channel ; + ns1:level 0e+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 @@ -13,14 +13,6 @@ , . - 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+00 .