# HG changeset patch # User drewp@bigasterisk.com # Date 2019-06-10 01:38:49 # Node ID 51cedd7cf85c62d79557b5180cc22829e9388d07 # Parent 9cff56d44ac6bc6c7300de6cb1d16c8cc0535f3b checkpoint show data Ignore-this: 923190275e542181efe37815677c9504 diff --git a/show/dance2019/anim/cyctwinkle.png b/show/dance2019/anim/cyctwinkle.png new file mode 100644 index 0000000000000000000000000000000000000000..9fb38008971b65c9f83e6e855e1f1a1963dca8b3 GIT binary patch literal 984 zc$@*)11J26P)000sQ0ssI2oUOEi00009a7bBm001r{ z001r{0eGc9b^rhX2XskIMF-;s3IP@ZPpxQ#0000PbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAV*0}P*;Ht7XSbQQb|NXR7l6|)X_@vZ~z7Hwbj(7Gnryj92%K=u|gEoFe9Pp zqMN*nE`qLln4U!lr0zn}EGH_{D5!>$oWqsqT*mzC)_2hZd@tbd4bI_kAZTuGZfq8IQ*t$92117>4b3yCg}o*=%=r*XeY=y}jl0c>q8l5LjGXwA<|jL69UV%kt~% zYro(B`ud`2+F&r0%ViA1c6N3k2&&iXBuU0%v5$|B>+5R(KsueCOeT^fSuB=Xt@iu- zdwhJ1Ajsq6BhT~G=`@*4Zf*aY~)3i>fQ>|7Bf;c}v4~N6!@fe0-UDqW^ z0sttAQYaK&US1py$KKvvBog5`uGws=s#>j9CzHw9*;y);;y5mw&Hlv`1cBo?k|e*s zzuWD$uIsbe%;j=rG8sitZf|eRX7g+|!*QG-2w9eYetuY%B?#i^=x8(=jYcD%&ld;; zoK7c#AhImCS}jFUJRZ-&<>jT*=@dm#RaKg%gTbJpD7jpYVHga<*4Ebiem_mqf*@R7 zT@40FLRAHXDsbUDsh4ZZ?}N%LW30i;IhRJl^egZ*Fe# z`8~LJRXlA2rSEzBpC{Y=1(*?H#ax;fByjgTEeRCl@{>;00005(ej@)Wnk16ovB4k_-iRPv3y>Mm}+% zB1cab#}JR>Z?70~F&J>LIDY;wuC4U)h@XxUOPQAR#K#VT3=CGs@0K1qQ?g>6%aO7} qPpfBcJ630P`Qd-rPn`@5d%3r6+9NVG>B0}7VGN$GelF{r5}E+R?LOuJ diff --git a/show/dance2019/anim/streaks.png b/show/dance2019/anim/streaks.png new file mode 100644 index 0000000000000000000000000000000000000000..20747d521477398bb1928b1fae02e745a598b531 GIT binary patch literal 1146 zc$@)x1cm#FP)OT5& zqf5d5fNm4KsFu1ITAPv}PTk&%!HcBLvmLk6p3ij{UpUX_JkPTexw*L!1R!ni3vMls#peXA4`kFlE7Yc=fBuVjj{Nv-JSS-%uH-9h= z0Q`QUilXFlIfRfb%eHOTYBfhdnM|hHY-0Y(=jUfSold1v$z)Oxgw@s6mzS5{6VkTr zi7^S$G;L>Rhhdn_&CQjS6-80zIt~ELfv_ygdVYRBKR@qwyGKVy?RJ}{X-SecHa51m zw_jghF>h~8(=wS%GMVIgUKGVdB7sxDUd`y6@tB&X&969uhyws~AS{HCX_|_nTwPrm zhH-j&S}vF4@%Y->8pm;|R0^|Ka;o?6@Q`5`j^nnrwg!WNdjUIxq*pWg=1a_4t)}Zb zp*nw19PV)dU}1%Y5bAU~s;XXGTr``_LZNVfe=mxn*I~!0-jkD)<>h6TWp{UX4a0CL zU}uo@YDN;i#H>^*olb{Poih}NS80A12LKjaSO_6q*ITVtKA(Sof6wJ|cXxLO2M1n< z9jAKp`TWw-QY;qBX0z35)un*LUjvQCJU%{te0(%blTe*A5r;o%PK*P`8d!W`Ir`}L z`?4&zS}j?YZ*OnU&d$6JJ5KfHaygo&Baz7d{=Q2A|Hv9>G-fuNEtkudWf7`#syL>0 zPrju&F%Fz;VDW{85USVfu~r^k6WMW!dHC z$6o`@a6>;DGo4O9Jv~{LMW{{}abR{&zNI-H2Oc^Ae?nLYAw^Mmo{z`lwrxiuk%xx| zAH$BOX}w-glB8%fYMN#ylX1EEan?XH-_Vc7WLfs@?Tvhc{+&25yC;%(OXb5Cn>%`u)BriY_<*)HP5L8~V|h&c7hvpnoS0 z%20Do@Vh5?uK)lQsz2SFH z@LmA`h=dgy?q&>UVhXOQ#P6Qqy#fHtfv{#+^MR@}=#dlND*%AQKdEaa9}cE=MgRZ+ M07*qoM6N<$f*qU@_y7O^ diff --git a/show/dance2019/effect/song08dummy2.n3 b/show/dance2019/effect/song08dummy2.n3 --- a/show/dance2019/effect/song08dummy2.n3 +++ b/show/dance2019/effect/song08dummy2.n3 @@ -9,7 +9,7 @@ @prefix xsd: . -effect:song08dummy2 a :Effect; rdfs:label "song08dummy2"; :publishAttr :strength; +effect:song08dummy2 a :Effect; rdfs:label "song08part2"; :publishAttr :strength; :setting eff:set264481, eff:set402270, effect:song08dummy2_set10, effect:song08dummy2_set11, effect:song08dummy2_set12, effect:song08dummy2_set13, effect:song08dummy2_set14, effect:song08dummy2_set16, effect:song08dummy2_set17, effect:song08dummy2_set19, effect:song08dummy2_set20, effect:song08dummy2_set21, effect:song08dummy2_set22, effect:song08dummy2_set23, effect:song08dummy2_set24, effect:song08dummy2_set25, effect:song08dummy2_set26, effect:song08dummy2_set27, effect:song08dummy2_set29, effect:song08dummy2_set30, effect:song08dummy2_set31, effect:song08dummy2_set4, effect:song08dummy2_set5, effect:song08dummy2_set6, effect:song08dummy2_set7, effect:song08dummy2_set8, effect:song08dummy2_set9 . eff:set264481 :device dev:down7; :deviceAttr :brightness; :scaledValue 0.881 . eff:set402270 :device dev:down6; :deviceAttr :brightness; :scaledValue 0.87 . diff --git a/show/dance2019/effect/song08part1.n3 b/show/dance2019/effect/song08part1.n3 --- a/show/dance2019/effect/song08part1.n3 +++ b/show/dance2019/effect/song08part1.n3 @@ -11,8 +11,8 @@ effect:song08part1 a :Effect; rdfs:label "song08part1"; :publishAttr :strength; :setting eff:set1263146, eff:set1549182, eff:set1855440, eff:set2225014, eff:set2336615, eff:set2365289, eff:set2475209, eff:set2796202, eff:set3158087, eff:set3443153, eff:set4320394, eff:set4797672, eff:set6487600, eff:set6682716, eff:set7188084, eff:set7411466, eff:set7500021, eff:set8640233, eff:set9608704, eff:set9909743, eff:set9911956, eff:set9959813 . -eff:set1263146 :device dev:down7; :deviceAttr :brightness; :scaledValue 0.254 . -eff:set1549182 :device dev:down1; :deviceAttr :brightness; :scaledValue 0.254 . +eff:set1263146 :device dev:down7; :deviceAttr :brightness; :scaledValue 1 . +eff:set1549182 :device dev:down1; :deviceAttr :brightness; :scaledValue 0.56 . eff:set1855440 :device dev:strip2; :deviceAttr :color; :scaledValue "#0b0b0b" . eff:set2225014 :device dev:down6; :deviceAttr :brightness; :scaledValue 0.254 . eff:set2336615 :device dev:cycBlue4; :deviceAttr :brightness; :scaledValue 1 . diff --git a/show/dance2019/effect/song09d.n3 b/show/dance2019/effect/song09d.n3 --- a/show/dance2019/effect/song09d.n3 +++ b/show/dance2019/effect/song09d.n3 @@ -9,10 +9,30 @@ @prefix xsd: . -effect:song09d a :Effect; rdfs:label "song09d"; :publishAttr :strength; :setting eff:set17095, eff:set264481, eff:set402270, eff:set4135193, eff:set428404, eff:set8589750 . -eff:set17095 :device dev:down2; :deviceAttr :brightness; :scaledValue 0.3 . -eff:set264481 :device dev:down7; :deviceAttr :brightness; :scaledValue 0.3 . -eff:set402270 :device dev:down6; :deviceAttr :brightness; :scaledValue 0.3 . -eff:set4135193 :device dev:down3; :deviceAttr :brightness; :scaledValue 0.3 . -eff:set428404 :device dev:down4; :deviceAttr :brightness; :scaledValue 0.3 . -eff:set8589750 :device dev:down1; :deviceAttr :brightness; :scaledValue 0.3 . +effect:song09d a :Effect; rdfs:label "song09"; :publishAttr :strength; :setting eff:set17095, eff:set264481, eff:set402270, eff:set4135193, eff:set428404, eff:set8589750, effect:song09d_set0, effect:song09d_set1, effect:song09d_set10, effect:song09d_set11, effect:song09d_set12, effect:song09d_set13, effect:song09d_set14, effect:song09d_set15, effect:song09d_set18, effect:song09d_set19, effect:song09d_set2, effect:song09d_set22, effect:song09d_set23, effect:song09d_set3, effect:song09d_set4, effect:song09d_set5, effect:song09d_set6, effect:song09d_set7, effect:song09d_set8, effect:song09d_set9 . +eff:set17095 :device dev:down2; :deviceAttr :brightness; :scaledValue 0.39 . +eff:set264481 :device dev:down7; :deviceAttr :brightness; :scaledValue 0.333 . +eff:set402270 :device dev:down6; :deviceAttr :brightness; :scaledValue 0.437 . +eff:set4135193 :device dev:down3; :deviceAttr :brightness; :scaledValue 0.299 . +eff:set428404 :device dev:down4; :deviceAttr :brightness; :scaledValue 0.391 . +eff:set8589750 :device dev:down1; :deviceAttr :brightness; :scaledValue 0.31 . +effect:song09d_set0 :device dev:cycBlue1; :deviceAttr :brightness; :scaledValue 0.756 . +effect:song09d_set1 :device dev:cycBlue3; :deviceAttr :brightness; :scaledValue 0.772 . +effect:song09d_set10 :device dev:tree_down_L_high; :deviceAttr :brightness; :scaledValue 0.205 . +effect:song09d_set11 :device dev:tree_down_L_low; :deviceAttr :brightness; :scaledValue 0.297 . +effect:song09d_set12 :device dev:par1; :deviceAttr :color; :scaledValue "#2b00ff" . +effect:song09d_set13 :device dev:par4; :deviceAttr :color; :scaledValue "#ffff27" . +effect:song09d_set14 :device dev:par7; :deviceAttr :color; :scaledValue "#ffeb35" . +effect:song09d_set15 :device dev:par3; :deviceAttr :color; :scaledValue "#1900ff" . +effect:song09d_set18 :device dev:moat_right_red; :deviceAttr :brightness; :scaledValue 0.473 . +effect:song09d_set19 :device dev:moat_left_up_red; :deviceAttr :brightness; :scaledValue 0.518 . +effect:song09d_set2 :device dev:cycBlue4; :deviceAttr :brightness; :scaledValue 0.763 . +effect:song09d_set22 :device dev:cross_down_L; :deviceAttr :brightness; :scaledValue 0.313 . +effect:song09d_set23 :device dev:cross_down_R; :deviceAttr :brightness; :scaledValue 0.236 . +effect:song09d_set3 :device dev:cycBlue2; :deviceAttr :brightness; :scaledValue 0.822 . +effect:song09d_set4 :device dev:tree_up_R_low; :deviceAttr :brightness; :scaledValue 0.175 . +effect:song09d_set5 :device dev:tree_up_L_high; :deviceAttr :brightness; :scaledValue 0.283 . +effect:song09d_set6 :device dev:tree_down_R_low; :deviceAttr :brightness; :scaledValue 0.171 . +effect:song09d_set7 :device dev:tree_up_R_high; :deviceAttr :brightness; :scaledValue 0.611 . +effect:song09d_set8 :device dev:tree_up_L_low; :deviceAttr :brightness; :scaledValue 0.14 . +effect:song09d_set9 :device dev:tree_down_R_high; :deviceAttr :brightness; :scaledValue 0.409 . diff --git a/show/dance2019/effect/song11d2.n3 b/show/dance2019/effect/song11d2.n3 --- a/show/dance2019/effect/song11d2.n3 +++ b/show/dance2019/effect/song11d2.n3 @@ -12,18 +12,18 @@ effect:song11d2 a :Effect; rdfs:label "song11part2"; :publishAttr :strength; :setting eff:set1731397, eff:set3273766, eff:set3552374, eff:set4425252, eff:set5921567, eff:set8392520, effect:song11d2_set10, effect:song11d2_set11, effect:song11d2_set2, effect:song11d2_set3, effect:song11d2_set4, effect:song11d2_set5, effect:song11d2_set6, effect:song11d2_set7, effect:song11d2_set8, effect:song11d2_set9 . eff:set1731397 :device dev:down4; :deviceAttr :brightness; :scaledValue 0.628 . -eff:set3273766 :device dev:down1; :deviceAttr :brightness; :scaledValue 0.439 . +eff:set3273766 :device dev:down1; :deviceAttr :brightness; :scaledValue 0.763 . eff:set3552374 :device dev:down7; :deviceAttr :brightness; :scaledValue 0.3 . eff:set4425252 :device dev:down2; :deviceAttr :brightness; :scaledValue 0.3 . eff:set5921567 :device dev:down6; :deviceAttr :brightness; :scaledValue 0.3 . eff:set8392520 :device dev:down3; :deviceAttr :brightness; :scaledValue 0.3 . -effect:song11d2_set10 :device dev:down_CL_red; :deviceAttr :brightness; :scaledValue 0.693 . -effect:song11d2_set11 :device dev:down_L_blue; :deviceAttr :brightness; :scaledValue 0.772 . +effect:song11d2_set10 :device dev:down_CL_red; :deviceAttr :brightness; :scaledValue 0.79 . +effect:song11d2_set11 :device dev:down_L_blue; :deviceAttr :brightness; :scaledValue 0.58 . effect:song11d2_set2 :device dev:cycBlue1; :deviceAttr :brightness; :scaledValue 0.844 . effect:song11d2_set3 :device dev:cycRed2; :deviceAttr :brightness; :scaledValue 1 . effect:song11d2_set4 :device dev:cycRed3; :deviceAttr :brightness; :scaledValue 0.636 . effect:song11d2_set5 :device dev:cycBlue4; :deviceAttr :brightness; :scaledValue 1 . -effect:song11d2_set6 :device dev:cross_down_R; :deviceAttr :brightness; :scaledValue 0.378 . -effect:song11d2_set7 :device dev:cross_down_L; :deviceAttr :brightness; :scaledValue 0.571 . +effect:song11d2_set6 :device dev:cross_down_R; :deviceAttr :brightness; :scaledValue 0.209 . +effect:song11d2_set7 :device dev:cross_down_L; :deviceAttr :brightness; :scaledValue 0.306 . effect:song11d2_set8 :device dev:cross_up_L; :deviceAttr :brightness; :scaledValue 0.447 . effect:song11d2_set9 :device dev:cross_up_R; :deviceAttr :brightness; :scaledValue 0.742 . diff --git a/show/dance2019/song1.n3 b/show/dance2019/song1.n3 --- a/show/dance2019/song1.n3 +++ b/show/dance2019/song1.n3 @@ -8,7 +8,7 @@ @prefix xml: . @prefix xsd: . -show:song1 :note , . +show:song1 :note , , . a :Note; :curve ; :effectClass effect:effect2; :originTime 24.296; :setting . @@ -63,3 +63,15 @@ show:song1 :note :time -2.805; :value 1 . :time 13.245; :value 1 . :time 15.075; :value 0 . + + a :Note; :curve ; + :effectClass effect:cyc; :originTime 10.882; :setting . + + a :Curve; :attr :strength; + :point , , , . + :time -5.875; :value 0 . + :time 5.593; :value 1 . + :time 155.826; :value 1 . + :time 156.845; :value 0 . + :effectAttr :colorScale; + :value "#ffffff" . diff --git a/show/dance2019/song13.n3 b/show/dance2019/song13.n3 --- a/show/dance2019/song13.n3 +++ b/show/dance2019/song13.n3 @@ -7,7 +7,7 @@ @prefix xml: . @prefix xsd: . -show:song13 :note , , , . +show:song13 :note , , , , , . a :Note; :curve ; :effectClass effect:effect4; :originTime 34.1 . @@ -18,6 +18,12 @@ show:song13 :note a :Note; :curve ; :effectClass effect:effect2; :originTime 37.157 . + a :Note; :curve ; + :effectClass effect:image; :originTime 136.35 . + + a :Note; :curve ; + :effectClass effect:image; :originTime 152.75; :setting . + a :Curve; :attr :strength; :point , , , . :time 0; :value 0 . @@ -25,6 +31,21 @@ show:song13 :note :time 20.016; :value 1 . :time 30.024; :value 0 . + a :Note; :curve ; + :effectClass effect:image; :originTime 160.301; :setting , . + + a :Curve; :attr :strength; + :point , , , . + :time -10.429; + :value 0 . + :time -7.796; :value 1 . + :time 42.75; :value 1 . + :time 44.116; :value 0 . + :effectAttr :image; + :value "cyctwinkle.png" . + :effectAttr :colorScale; + :value "#00f2ff" . + a :Curve; :attr :strength; :point , , , . :time 0; :value 0 . @@ -77,6 +98,32 @@ show:song13 :note a :Curve; :attr :strength; :point , , , . :time -2.82; :value 0 . - :time 4.297; :value 1 . + :time -0.055; :value 1 . :time 51.255; :value 1 . :time 51.785; :value 0 . + + a :Curve; :attr :strength; + :point , , , . + :time 0; :value 0 . + :time 4.311; :value 1 . + :time 8.622; :value 1 . + :time 12.933; :value 0 . + + a :Note; :curve ; + :effectClass effect:image; :originTime 35.082; :setting . + + :effectAttr :image; + :value "cyctwinkle.png" . + a :Curve; :attr :strength; + :point , , , . + :time -30.683; :value 0 . + :time -24.022; :value 1 . + :time 96.461; :value 1 . + :time 96.486; :value 0 . + + a :Curve; :attr :strength; + :point , , , . + :time -3.266; :value 0 . + :time -0.767; :value 1 . + :time 50.035; :value 1 . + :time 50.56; :value 0 . diff --git a/show/dance2019/song14.n3 b/show/dance2019/song14.n3 --- a/show/dance2019/song14.n3 +++ b/show/dance2019/song14.n3 @@ -7,7 +7,7 @@ @prefix xml: . @prefix xsd: . -show:song14 :note , , . +show:song14 :note , , , . a :Note; :curve ; :effectClass effect:bow; :originTime 183.013 . @@ -34,8 +34,8 @@ show:song14 :note a :Curve; :attr :strength; :point , , , . - :time 0; :value 0 . - :time 1.494; :value 1 . + :time -4.336; :value 0 . + :time -1.438; :value 1 . :time 2.987; :value 1 . :time 3.685; :value 0 . @@ -47,6 +47,16 @@ show:song14 :note :time -0.118; :value 0 . :time -0.061; :value 1 . :time 159.801; :value 1 . - :time 159.98; :value 0 . + :time 160.422; :value 0 . :effectAttr :image; :value "shining.png" . + + a :Note; :curve ; + :effectClass effect:effect8; :originTime 175.175 . + + a :Curve; :attr :strength; + :point , , , . + :time -1.952; :value 0 . + :time -0.281; :value 1 . + :time 6.188; :value 1 . + :time 6.897; :value 0 . diff --git a/show/dance2019/song8.n3 b/show/dance2019/song8.n3 --- a/show/dance2019/song8.n3 +++ b/show/dance2019/song8.n3 @@ -16,8 +16,8 @@ show:song8 :note , , , . :time -135.776; :value 0 . :time -129.356; :value 1 . - :time 0; :value 1 . - :time 5.625; :value 0 . + :time -9.695; :value 1 . + :time 3.903; :value 0 . a :Note; :curve ; :effectClass effect:song08dummy2; :originTime 145.161 . @@ -25,7 +25,7 @@ show:song8 :note a :Curve; :attr :strength; :point , , , . :time -3.69; :value 0 . - :time 1.258; :value 1 . + :time 3.189; :value 1 . :time 136.523; :value 1 . :time 137.794; :value 0 . diff --git a/show/dance2019/todo.txt b/show/dance2019/todo.txt --- a/show/dance2019/todo.txt +++ b/show/dance2019/todo.txt @@ -1,11 +1,17 @@ done: + 1 2 3 4 + 5? 6 7 + 8 + 9 10 + 11 except for motion bounce (optional) 12 + 13 but image poorly tested 14 15 @@ -47,11 +53,10 @@ song07: real-ish timing for song07 and b song08: SM: yellow and blue. lots of kids. let the lights go lower between the songs - made a partial look for part 1; nothing for part 2 yet. song09: real-ish timing but dummy look keep it dark, light sides. - + there's a look now, but it's not dark enough song10: real timing, real looks song10busy could add something animated during bass things