diff --git a/show/dance2023/effect/effect0.n3 b/show/dance2023/effect/effect0.n3 --- a/show/dance2023/effect/effect0.n3 +++ b/show/dance2023/effect/effect0.n3 @@ -4,8 +4,22 @@ @prefix xsd: . -effect:effect0 a :Effect; rdfs:label "effect0"; :publishAttr :strength; :setting effect:effect0_set0, effect:effect0_set1 . -effect:effect0_set0 :device ; - :deviceAttr :color; :value 0.675 . -effect:effect0_set1 :device ; - :deviceAttr :color; :value 0.404 . +effect:effect0 a :Effect; rdfs:label "effect0"; :effectFunction effect:scale; + :publishAttr :strength; :setting effect:effect0_set1, effect:effect0_set2, effect:effect0_set3, effect:effect0_set4, effect:effect0_set5, effect:effect0_set6, effect:effect0_set7, effect:effect0_set8 . +effect:effect0_set0 :value "#fb1100" . +effect:effect0_set1 :device ; + :deviceAttr :white; :value 0.624 . +effect:effect0_set2 :device ; + :deviceAttr :color; :value "#5e0300" . +effect:effect0_set3 :device ; + :deviceAttr :color; :value "#bbbc69" . +effect:effect0_set4 :device ; + :deviceAttr :color; :value "#969653" . +effect:effect0_set5 :device ; + :deviceAttr :color; :value "#2baa4b" . +effect:effect0_set6 :device ; + :deviceAttr :color; :value "#daff6a" . +effect:effect0_set7 :device ; + :deviceAttr :color; :value "#ffffff" . +effect:effect0_set8 :device ; + :deviceAttr :color; :value "#ffffff" . diff --git a/show/dance2023/fade.n3 b/show/dance2023/fade.n3 --- a/show/dance2023/fade.n3 +++ b/show/dance2023/fade.n3 @@ -4,22 +4,29 @@ @prefix show: . @prefix xsd: . -:fade_set0 :effectAttr :strength . + +show:fadePage1 a :FadePage; rdfs:label "live controls"; :fader show:fadePage1f0, show:fadePage1f1, show:fadePage1f2, show:fadePage1f3, show:fadePage1f4, show:fadePage1f5, show:fadePage1f6, show:fadePage1f7 . + +show:fadePage1f0 a :Fader; :column "1"; :effect effect:effect0; :setting show:fadeset0 . + +show:fadePage1f1 a :Fader; :column "2"; :effect effect:effect0; :setting show:fadeset1 . + +show:fadePage1f2 a :Fader; :column "2"; :effect effect:effect0; :setting show:fadeset2 . + +show:fadePage1f3 a :Fader; :column "3"; :effect effect:effect0; :setting show:fadeset3 . + +show:fadePage1f4 a :Fader; :column "4"; :effect effect:effect0; :setting show:fadeset4 . -show:fadePage1 a :FadePage; rdfs:label "live controls"; :fader show:fadePage1f0, show:fadePage1f1 . -show:fadePage1f2 :effect effect:effect0; :setting :fade_set2; :value 0.525 . -show:fadePage1f3 :setting :fade_set1; :value 0 . -show:fadePage1f4 :value 0 . -show:fadePage1f5 :value 0 . -show:fadePage1f6 :value 0 . -show:fadePage1f7 :value 0.286 . -:fade_set1 :effectAttr :strength . -:fade_set2 :effectAttr :strength . -:fs1 :effectAttr :strength . -:fs2 :effectAttr :strength . +show:fadePage1f5 a :Fader; :column "5"; :effect effect:effect0; :setting show:fadeset5 . + +show:fadePage1f6 a :Fader; :column "6"; :effect effect:effect0; :setting show:fadeset6 . -show:fadePage1f0 a :Fader; :column "1"; :effect effect:subyellow; :setting :fs1; - :value 0; rdfs:comment ":strength connects the fader to sub0" . - -show:fadePage1f1 a :Fader; :column "2"; :effect effect:submagenta; :setting :fs2; - :value 0 . +show:fadePage1f7 a :Fader; :column "7"; :effect effect:effect0; :setting show:fadeset7 . +show:fadeset0 :effectAttr :strength; :value 1 . +show:fadeset1 :effectAttr :strength; :value 0 . +show:fadeset2 :effectAttr :strength; :value 0 . +show:fadeset3 :effectAttr :strength; :value 0 . +show:fadeset4 :effectAttr :strength; :value 0 . +show:fadeset5 :effectAttr :strength; :value 0 . +show:fadeset6 :effectAttr :strength; :value 0 . +show:fadeset7 :effectAttr :strength; :value 0 . diff --git a/show/dance2023/theaterLightConfig.n3 b/show/dance2023/theaterLightConfig.n3 --- a/show/dance2023/theaterLightConfig.n3 +++ b/show/dance2023/theaterLightConfig.n3 @@ -14,23 +14,6 @@ 2) the effectAttrs listed under (?effect Outputs are always a DeviceSettings list which can affect arbitrary devices. """ . -########## submaster - -effect:subyellow - a :Effect; - :effectFunction effect:scale; - :input [ :effectAttr :strength ]; # also put the time here if the func needs it. - :setting - [ :device dev:plain1; :deviceAttr :brightness; :value 1.0 ], - [ :device dev:par2; :deviceAttr :color; :value "#ff8000" ] . - -effect:submagenta - a :Effect; - :effectFunction effect:scale; - :input [ :effectAttr :strength ]; # also put the time here if the func needs it. - :setting - [ :device dev:par2; :deviceAttr :color; :value "#ff00ff" ] . - ######## effectFunction effect:scale @@ -43,30 +26,19 @@ effect:scale :deviceAttr :valueRequired; :value :valueRequired ] ] . - -# show:fadePage1f1 a :Fader; :column "2"; :effectAttr :strength; :effect effect:effect2 . -# effect:effect2 a :Effect; -# :publishAttr :strength; -# :setting effect:effect2_set0, effect:effect2_set1, effect:effect2_set2, effect:effect2_set3 . -# effect:effect2_set0 :device dev:par6; :deviceAttr :color; :scaledValue 0.251 . -# effect:effect2_set1 :device dev:par2; :deviceAttr :color; :scaledValue 0.714 . -# effect:effect2_set2 :device dev:strip1; :deviceAttr :color; :scaledValue 0.651 . -# effect:effect2_set3 :device dev:strip2; :deviceAttr :color; :scaledValue 0.22 . - - -# dev:strip1 a :Bar612601d; :dmxUniverse dmxA:; :dmxBase 175 . +dev:strip1 a :Bar612601d; :dmxUniverse dmxA:; :dmxBase 175 . # dev:strip2 a :ChauvetColorStrip; :dmxUniverse dmxA:; :dmxBase 12 . -# dev:strip3 a :Bar612601d; :dmxUniverse dmxA:; :dmxBase 178 . +dev:strip3 a :Bar612601d; :dmxUniverse dmxA:; :dmxBase 178 . # dev:par90 a :LedPar90; :dmxUniverse dmxA:; :dmxBase 16 . dev:par1 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 84 . -# dev:par2 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 1 . -# dev:par3 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 188 . -# dev:par4 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 105 . -# dev:par5 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 147 . -# dev:par6 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 154 . -# dev:par7 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 161 . -# dev:par8 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 168 . +dev:par2 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 1 . +dev:par3 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 188 . +dev:par4 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 105 . +dev:par5 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 147 . +dev:par6 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 154 . +dev:par7 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 161 . +dev:par8 a :LedPar54; :dmxUniverse dmxA:; :dmxBase 168 . -dev:plain1 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 10 . +# dev:plain1 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 10 .