diff --git a/show/dance2016/effect.n3 b/show/dance2016/effect.n3 --- a/show/dance2016/effect.n3 +++ b/show/dance2016/effect.n3 @@ -15,18 +15,12 @@ effect:RedStrip a :Effect; rdfs:label "r effect:Strobe a :Effect; rdfs:label "strobe"; :publishAttr :duty, :offset, :rate, :strength . -effect:blacklight a :Effect; rdfs:label "blacklight"; - :publishAttr :strength; :setting effect:blacklight_set0, effect:blacklight_set1, effect:blacklight_set10, effect:blacklight_set11, effect:blacklight_set12, effect:blacklight_set13, effect:blacklight_set14, effect:blacklight_set15, effect:blacklight_set2, effect:blacklight_set3, effect:blacklight_set4, effect:blacklight_set5, effect:blacklight_set6, effect:blacklight_set7, effect:blacklight_set8, effect:blacklight_set9 . - -effect:down a :Effect; rdfs:label "down"; :publishAttr :strength; - :setting effect:down_set0, effect:down_set1, effect:down_set2, effect:down_set3 . - effect:usa a :mockupEffect; rdfs:label "USA"; :chaseOffset 0; :chaseTempo 120; :code "chase()"; :devices dev:colorStrip, dev:moving1; :fadeShape :fadeCurve1; :palette "#0000ff", "#ff0000", "#ffffff"; :publishAttr :strength . -:live :controls effect:Curtain, effect:WorkLight, effect:centerSpot, effect:uv1 . + :ds1 :attr :red; :device dev:colorStrip; :value "strength" . :ds2 :attr :red; :device dev:moving1; :value "strength" . :ds3 :attr :blue; :device dev:colorStrip; :value "strength" . @@ -38,38 +32,6 @@ effect:Curtain a :Effect; rdfs:label "cu effect:WorkLight a :Effect; rdfs:label "work light"; :deviceSetting :ds4; :group "main"; :order 1; :publishAttr :strength . -effect:blacklight_set0 :device dev:down2; :deviceAttr :uv; - :scaledValue 0.988 . -effect:blacklight_set1 :device dev:down3; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set10 :device dev:upCenter; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set11 :device dev:lip1; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set12 :device dev:lip2; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set13 :device dev:lip3; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set14 :device dev:lip4; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set15 :device dev:lip5; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set2 :device dev:down4; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set3 :device dev:down5Edge; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set4 :device dev:backlight1; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set5 :device dev:backlight2; :deviceAttr :uv; - :scaledValue 0.999 . -effect:blacklight_set6 :device dev:backlight3; :deviceAttr :uv; - :scaledValue 0.996 . -effect:blacklight_set7 :device dev:backlight4; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set8 :device dev:backlight5; :deviceAttr :uv; - :scaledValue 1.000 . -effect:blacklight_set9 :device dev:hexLow3; :deviceAttr :uv; - :scaledValue 0.008 . effect:centerSpot a :Effect; rdfs:label "center spot"; :group "main"; :order 3; :publishAttr :strength; @@ -84,23 +46,8 @@ effect:centerSpots3 :device dev:q2; :dev :value 0.26 . effect:centerSpots4 :device dev:q2; :deviceAttr :zoom; :value 0.42 . -effect:down_set0 :device dev:down3; :deviceAttr :color; - :scaledValue "#ffffff" . -effect:down_set1 :device dev:down2; :deviceAttr :color; - :scaledValue "#ffffff" . -effect:down_set2 :device dev:down4; :deviceAttr :color; - :scaledValue "#ffffff" . -effect:down_set3 :device dev:down2; :deviceAttr :uv; - :scaledValue 0.003 . -effect:uv1 a :Effect; rdfs:label "uv1"; :publishAttr :strength; - :setting effect:uv1_set0, effect:uv1_set1 . -effect:uv1_set0 :device dev:down2; :deviceAttr :uv; - :scaledValue 0.315 . -effect:uv1_set1 :device dev:down3; :deviceAttr :uv; - :scaledValue 0.397 . - :fadeCurve1 a :Curve; :point :fc1p0, :fc1p1, :fc1p2, :fc1p3 . :fc1p0 :time 0.00; :value 0 . :fc1p1 :time 0.02; :value 1 .