diff --git a/show/dance2016/deviceClass.n3 b/show/dance2016/deviceClass.n3 --- a/show/dance2016/deviceClass.n3 +++ b/show/dance2016/deviceClass.n3 @@ -10,6 +10,7 @@ rdfs:comment "maybe make this a separate 'wide to narrow' type" . :focus a :DeviceAttr; :dataType :scalar . :iris a :DeviceAttr; :dataType :scalar . +:prism a :DeviceAttr; :dataType :scalar . :goboSpeed a :DeviceAttr; :dataType :scalar ; rdfs:comment "0=stopped, 1=rotate the fastest". :quantumGoboChoice a :DeviceAttr; :dataType :choice; @@ -107,7 +108,7 @@ :MacQuantum a :DeviceClass; :docs ; - :deviceAttr :color, :rx, :ry, :zoom, :focus, :iris, :quantumGoboChoice, :goboSpeed; + :deviceAttr :color, :rx, :ry, :zoom, :focus, :iris, :prism, :quantumGoboChoice, :goboSpeed; :attr [ :dmxOffset 0; :outputAttr :shutter ; rdfs:comment "use 30" ], [ :dmxOffset 1; :outputAttr :dimmerFadeHi ], diff --git a/show/dance2016/effect.n3 b/show/dance2016/effect.n3 --- a/show/dance2016/effect.n3 +++ b/show/dance2016/effect.n3 @@ -38,6 +38,16 @@ effect:usa a :Effect; :fc1p3 :time 0.15; :value 0 . +effect:centerSpot a :Effect; rdfs:label "center spot"; + :publishAttr :strength; + :setting effect:centerSpots0, effect:centerSpots1, effect:centerSpots2, effect:centerSpots3, effect:centerSpots4 . +effect:centerSpots0 :device dev:q2; :deviceAttr :color; :scaledValue "#f3d4d4" . +effect:centerSpots1 :device dev:q2; :deviceAttr :focus; :value 0.31 . +effect:centerSpots2 :device dev:q2; :deviceAttr :rx; :value 0.49 . +effect:centerSpots3 :device dev:q2; :deviceAttr :ry; :value 0.26 . +effect:centerSpots4 :device dev:q2; :deviceAttr :zoom; :value 0.42 . + + effect:Strobe a :Effect; rdfs:label "strobe"; :publishAttr :strength, :rate, :offset, :duty . diff --git a/show/dance2016/playlist.n3 b/show/dance2016/playlist.n3 --- a/show/dance2016/playlist.n3 +++ b/show/dance2016/playlist.n3 @@ -23,7 +23,7 @@ sh:song6 a :Song; rdfs:label "06 wester sh:song7 a :Song; rdfs:label "07 broadwaymelody"; :songFilename "07-broadwaymelody.wav" . sh:song8 a :Song; rdfs:label "08 mama"; :songFilename "08-mama.wav" . sh:song9 a :Song; rdfs:label "09 barbie"; :songFilename "09-barbie.wav" . -sh:song10 a :Song; rdfs:label "10 long"; :songFilename "10-long.wav" . +sh:song10 a :Song; rdfs:label "10 short"; :songFilename "10-short.wav" . sh:song11 a :Song; rdfs:label "11 itsthegirl"; :songFilename "11-itsthegirl.wav" . sh:song12 a :Song; rdfs:label "12 eleanor"; :songFilename "12-eleanor.wav" . sh:song13 a :Song; rdfs:label "13 california"; :songFilename "13-california.wav" . diff --git a/show/dance2016/song1.n3 b/show/dance2016/song1.n3 --- a/show/dance2016/song1.n3 +++ b/show/dance2016/song1.n3 @@ -7,11 +7,11 @@ @prefix xsd: . :a01 :effectAttr :chaseOffset; :value 0.12 . - :note song:n0, song:n1, song:n2, song:n25, song:n26, song:n27, song:n28 . :ao0 :effectAttr :chaseTempo; :value 100 . + :note song:n0, song:n1, song:n2, song:n3 . -song:n0 a :Note; :curve song:n0c0; :effectClass effect:WorkLight; - :originTime 161.162 . +song:n0 a :Note; :curve song:n0c0; :effectClass effect:Curtain; + :originTime 35.653 . song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 . song:n0c0p0 :time 0.000; :value 0.000 . @@ -19,56 +19,29 @@ song:n0c0p1 :time 1.000; :value 1.000 . song:n0c0p2 :time 2.000; :value 1.000 . song:n0c0p3 :time 3.000; :value 0.000 . -song:n1 a :Note; :attrOverride :ao0, :ao1; :curve song:n1c1; - :effectClass effect:RedStrip; :originTime 41.011 . - -song:n1c1 a :Curve; :attr :strength; :point song:n1c1p0, song:n1c1p1, song:n1c1p2, song:n1c1p3 . -song:n1c1p0 :time 0.00; :value 0 . -song:n1c1p1 :time 1; :value 1 . -song:n1c1p2 :time 2; :value 1 . -song:n1c1p3 :time 3; :value 0 . - -song:n2 a :Note; :curve song:n2c0; :effectClass effect:Strobe; - :originTime 47.087 . - -song:n25 a :Note; :curve song:n25c0; :effectClass effect:BlueStrip; - :originTime 71.234 . - -song:n25c0 a :Curve; :attr :strength; :point song:n25c0p0, song:n25c0p1, song:n25c0p2, song:n25c0p3 . -song:n25c0p0 :time 0.000; :value 0.000 . -song:n25c0p1 :time 1.000; :value 1.000 . -song:n25c0p2 :time 2.000; :value 1.000 . -song:n25c0p3 :time 3.000; :value 0.000 . - -song:n26 a :Note; :curve song:n26c0; :effectClass effect:usa; - :originTime 85.973 . +song:n1 a :Note; :curve song:n1c0; :effectClass effect:Curtain; + :originTime 39.152 . -song:n26c0 a :Curve; :attr :strength; :point song:n26c0p0, song:n26c0p1, song:n26c0p2, song:n26c0p3 . -song:n26c0p0 :time 0.000; :value 0.000 . -song:n26c0p1 :time 1.000; :value 1.000 . -song:n26c0p2 :time 2.000; :value 1.000 . -song:n26c0p3 :time 3.000; :value 0.000 . - -song:n27 a :Note; :curve song:n27c0; :effectClass effect:BlueStrip; - :originTime 92.911 . +song:n1c0 a :Curve; :attr :strength; :point song:n1c0p0, song:n1c0p1, song:n1c0p2, song:n1c0p3 . +song:n1c0p0 :time 0.000; :value 0.000 . +song:n1c0p1 :time 1.000; :value 1.000 . +song:n1c0p2 :time 2.000; :value 1.000 . +song:n1c0p3 :time 3.000; :value 0.000 . -song:n27c0 a :Curve; :attr :strength; :point song:n27c0p0, song:n27c0p1, song:n27c0p2, song:n27c0p3 . -song:n27c0p0 :time 0.000; :value 0.000 . -song:n27c0p1 :time 1.000; :value 1.000 . -song:n27c0p2 :time 2.000; :value 1.000 . -song:n27c0p3 :time 3.000; :value 0.000 . - -song:n28 a :Note; :curve song:n28c0; :effectClass effect:RedStrip; - :originTime 137.322 . - -song:n28c0 a :Curve; :attr :strength; :point song:n28c0p0, song:n28c0p1, song:n28c0p2, song:n28c0p3 . -song:n28c0p0 :time 0.000; :value 0.000 . -song:n28c0p1 :time 1.000; :value 1.000 . -song:n28c0p2 :time 2.000; :value 1.000 . -song:n28c0p3 :time 3.000; :value 0.000 . +song:n2 a :Note; :curve song:n2c0; :effectClass effect:Curtain; + :originTime 43.806 . song:n2c0 a :Curve; :attr :strength; :point song:n2c0p0, song:n2c0p1, song:n2c0p2, song:n2c0p3 . song:n2c0p0 :time 0.000; :value 0.000 . song:n2c0p1 :time 1.000; :value 1.000 . song:n2c0p2 :time 2.000; :value 1.000 . song:n2c0p3 :time 3.000; :value 0.000 . + +song:n3 a :Note; :curve song:n3c0; :effectClass effect:Curtain; + :originTime 32.297 . + +song:n3c0 a :Curve; :attr :strength; :point song:n3c0p0, song:n3c0p1, song:n3c0p2, song:n3c0p3 . +song:n3c0p0 :time 0.000; :value 0.000 . +song:n3c0p1 :time 1.000; :value 1.000 . +song:n3c0p2 :time 2.000; :value 1.000 . +song:n3c0p3 :time 3.000; :value 0.000 .