diff --git a/show/dance2011/.light9-window-geometry-subcomposer b/show/dance2011/.light9-window-geometry-subcomposer --- a/show/dance2011/.light9-window-geometry-subcomposer +++ b/show/dance2011/.light9-window-geometry-subcomposer @@ -1,1 +1,1 @@ -297x613+1911+221 \ No newline at end of file +297x613+1853+235 \ No newline at end of file diff --git a/show/dance2011/config.n3 b/show/dance2011/config.n3 --- a/show/dance2011/config.n3 +++ b/show/dance2011/config.n3 @@ -60,14 +60,15 @@ sub:house :group group:live; :order 3 . sub:scoop :group group:live; :order 4 . sub:front :group group:live; :order 5 . sub:curtain :group group:live; :order 6 . +sub:patio :group group:live; :order 7 . - :color "#81b5b1"; :group group:back; :order 0 . - :color "#3e6dca"; :group group:back; :order 1 . - :color "#003cb3"; :group group:back; :order 2 . - :color "#ffaa77"; :group group:back; :order 3 . - :color "#b4099d"; :group group:back; :order 4 . - :color "#c0341b"; :group group:back; :order 5 . - :color "#ff0000"; :group group:back; :order 6 . + :color "#81b5b1"; :xgroup group:back; :order 0 . + :color "#3e6dca"; :xgroup group:back; :order 1 . + :color "#003cb3"; :xgroup group:back; :order 2 . + :color "#ffaa77"; :xgroup group:back; :order 3 . + :color "#b4099d"; :xgroup group:back; :order 4 . + :color "#c0341b"; :xgroup group:back; :order 5 . + :color "#ff0000"; :xgroup group:back; :order 6 . chase:colors a :Chase; :channels ( ch:oran1 ch:gree1 ch:blue1 ch:red1 @@ -88,29 +89,31 @@ ch:blue2 ch:red2 chase:back a :Chase; rdfs:comment "back non-white, brightness order"; :channels ( -ch:b16-r-r -ch:b15-c-r +ch:b33-b-c ch:b14-b-c -ch:b12-p-r -ch:b21-c-l -ch:b24-w-l -ch:b25-w-r ch:b26-c-r ch:b31-r-l ch:b32-c-l -ch:b33-b-c +ch:b16-r-r +ch:b12-p-r ch:b35-p-l +ch:b21-c-l +ch:b25-w-r +ch:b15-c-r +ch:b24-w-l ) . chase:scoop a :Chase; :channels ( +ch:cyc-left ch:down-r +ch:cyc-mid ch:down-c +ch:cyc-right ch:down-l -ch:upleft -ch:upright -ch:cyc-right ch:cyc-mid -ch:cyc-left +ch:down-c +#ch:upleft +#ch:upright ) . chase:fronts a :Chase; :channels ( @@ -124,6 +127,25 @@ ch:front8-r ch:front10-r3 ) . +chase:frontsrand a :Chase; :channels ( +ch:front3-l3 +ch:front9-l +ch:front6-pool +ch:front5-l +ch:front10-r3 +ch:front3-l3 +ch:front4-r +ch:front6-pool +ch:front9-l +ch:front8-r +ch:front11-c +ch:front10-r3 +ch:front11-c +ch:front5-l +ch:front8-r +ch:front4-r +) . + chase:cycline a :Chase; :channels (ch:cyc-left ch:cyc-mid ch:cyc-right ) . chase:cycpong a :Chase; :channels (ch:cyc-left ch:cyc-mid ch:cyc-right ch:cyc-mid) . diff --git a/show/dance2011/curves/song1-song01 b/show/dance2011/curves/song1-song01 --- a/show/dance2011/curves/song1-song01 +++ b/show/dance2011/curves/song1-song01 @@ -1,5 +1,5 @@ 0.0 0.0 3.2972868808 0.0106382978723 -4.61189145419 1 -224.409465946 1 +4.61189145419 1.0 +224.409465946 1.0 228.482585034 0.0 diff --git a/show/dance2011/curves/song10-bow b/show/dance2011/curves/song10-bow --- a/show/dance2011/curves/song10-bow +++ b/show/dance2011/curves/song10-bow @@ -1,9 +1,9 @@ -0 0 +0.0 0.0 132.209583636 0.0212765957447 135.566142515 0.670212765957 140.295839118 0.68085106383 -144.110110572 0 +144.110110572 0.0 253.860752884 0.0212765957447 -257.08335601 1 -264.960830318 1 -268.302789116 0 +257.08335601 1.0 +264.960830318 1.0 +268.302789116 0.0 diff --git a/show/dance2011/curves/song10-cyc b/show/dance2011/curves/song10-cyc --- a/show/dance2011/curves/song10-cyc +++ b/show/dance2011/curves/song10-cyc @@ -1,8 +1,8 @@ -0 0 -142.501911527 0 +0.0 0.0 +142.501911527 0.0 144.172890925 0.446808510638 186.066731565 0.468085106383 253.741397213 0.702127659574 257.680134367 0.765957446809 264.24469629 0.765957446809 -268.302789116 0 +268.302789116 0.0 diff --git a/show/dance2011/curves/song10-song10 b/show/dance2011/curves/song10-song10 --- a/show/dance2011/curves/song10-song10 +++ b/show/dance2011/curves/song10-song10 @@ -2,7 +2,7 @@ 0.0 0.0 3.8257496281 0.0 4.88201666547 1.0 13.5742122557 1.0 -141.058693409 1 +141.058693409 1.0 145.025535721 0.851063829787 258.918951335 0.851063829787 264.583085075 1.0 diff --git a/show/dance2011/curves/song15-blacklight b/show/dance2011/curves/song15-blacklight --- a/show/dance2011/curves/song15-blacklight +++ b/show/dance2011/curves/song15-blacklight @@ -1,3 +1,3 @@ -0 0 -182.814301013 0 -206.374671202 0 +0.0 0.0 +182.814301013 0.0 +206.374671202 0.0 diff --git a/show/dance2011/curves/song15-bow b/show/dance2011/curves/song15-bow --- a/show/dance2011/curves/song15-bow +++ b/show/dance2011/curves/song15-bow @@ -1,5 +1,5 @@ 0.0 0.0 -196.096742038 0 -196.693592154 1 +196.096742038 0.0 +196.693592154 1.0 202.742579036 1.0 206.374671202 0.0 diff --git a/show/dance2011/curves/song15-centerpool b/show/dance2011/curves/song15-centerpool --- a/show/dance2011/curves/song15-centerpool +++ b/show/dance2011/curves/song15-centerpool @@ -1,5 +1,5 @@ -0 0 -126.743731368 0 -135.778159035 0 -141.453632825 0 -206.374671202 0 +0.0 0.0 +126.743731368 0.0 +135.778159035 0.0 +141.453632825 0.0 +206.374671202 0.0 diff --git a/show/dance2011/curves/song15-song15 b/show/dance2011/curves/song15-song15 --- a/show/dance2011/curves/song15-song15 +++ b/show/dance2011/curves/song15-song15 @@ -1,17 +1,17 @@ 0.0 0.0 -2.88363228039 0 -6.1999112512 1 -29.7930915048 1 -63.9816733184 1 +2.88363228039 0.0 +6.1999112512 1.0 +29.7930915048 1.0 +63.9816733184 1.0 75.7006628783 0.936170212766 -80.6926040702 0 +80.6926040702 0.0 101.148060194 0.0 -113.070905615 0 +113.070905615 0.0 121.94572642 0.457446808511 136.346359354 0.446808510638 -138.307310495 0 -142.408487572 0 -149.028015213 0 +138.307310495 0.0 +142.408487572 0.0 +149.028015213 0.0 155.144946849 0.712765957447 165.053052097 0.691489361702 169.251729855 0.734042553191 diff --git a/show/dance2011/curves/song15-song15dim b/show/dance2011/curves/song15-song15dim --- a/show/dance2011/curves/song15-song15dim +++ b/show/dance2011/curves/song15-song15dim @@ -4,8 +4,8 @@ 4.628399887 0.808510638298 8.48338569367 1.0 28.7492515174 0.0 47.8912500057 0.0 -76.1494317691 0 -81.0794054974 1 +76.1494317691 0.0 +81.0794054974 1.0 115.865392936 1.0 125.512658056 0.0 206.374671202 0.0 diff --git a/show/dance2011/curves/song15-strobe1 b/show/dance2011/curves/song15-strobe1 --- a/show/dance2011/curves/song15-strobe1 +++ b/show/dance2011/curves/song15-strobe1 @@ -1,10 +1,10 @@ -0 0 -40.6796226888 0 -133.390667309 0 -140.321490494 0 -140.631495365 1 -147.363029705 1 -150.96854491 1 -154.493141736 0 -180.511407686 0 -206.374671202 0 +0.0 0.0 +40.6796226888 0.0 +133.390667309 0.0 +140.321490494 0.0 +140.631495365 1.0 +147.363029705 1.0 +150.96854491 1.0 +154.493141736 0.0 +180.511407686 0.0 +206.374671202 0.0 diff --git a/show/dance2011/curves/song16-chase3 b/show/dance2011/curves/song16-chase3 new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song16-chase3 @@ -0,0 +1,5 @@ +0.0 0.0 +191.694211322 0.0 +276.701465748 0.0 +419.901605753 0.0 +664.654036281 0.0 diff --git a/show/dance2011/curves/song16-colorchase1 b/show/dance2011/curves/song16-colorchase1 new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song16-colorchase1 @@ -0,0 +1,5 @@ +0.0 0.0 +49.0645898027 0.0 +96.4176241472 0.0 +358.856127743 0 +664.654036281 0.0 diff --git a/show/dance2011/curves/song16-pool1 b/show/dance2011/curves/song16-pool1 new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song16-pool1 @@ -0,0 +1,15 @@ +0.0 0.0 +319.914864785 0 +320.018718917 1 +321.506464165 1 +321.895614925 0.287234042553 +322.653744794 0.287234042553 +322.713227121 1 +323.062803228 1 +323.412379334 1 +323.808389848 0 +325.311962706 0 +325.483452872 1 +327.036758024 1 +327.293993273 0.691489361702 +664.654036281 0.0 diff --git a/show/dance2011/curves/song16-pool2 b/show/dance2011/curves/song16-pool2 new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song16-pool2 @@ -0,0 +1,11 @@ +0.0 0.0 +320.851283789 0 +320.963411974 1 +322.66732067 1 +323.142216513 1 +325.239409174 1 +325.463665545 0.425531914894 +326.159783848 0.372340425532 +326.660798815 0.393617021277 +326.81909743 0.893617021277 +664.654036281 0.0 diff --git a/show/dance2011/curves/song16-pool3 b/show/dance2011/curves/song16-pool3 new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song16-pool3 @@ -0,0 +1,10 @@ +0.0 0.0 +318.861558151 0 +318.980282112 1 +319.870711817 1 +320.579757694 0.287234042553 +322.769555192 0.297872340426 +323.102641859 0.287234042553 +326.650905152 0.36170212766 +326.828991093 0.81914893617 +664.654036281 0.0 diff --git a/show/dance2011/curves/song16-thirds b/show/dance2011/curves/song16-thirds --- a/show/dance2011/curves/song16-thirds +++ b/show/dance2011/curves/song16-thirds @@ -6,7 +6,9 @@ 171.078659775 0.0 183.359226016 0.0 198.248375374 0.0 315.916783611 0.0 -319.893633778 0.978723404255 +320.027198234 0 +322.360645016 0 +322.820700364 1 332.818396823 1.0 334.641119816 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song17-sides b/show/dance2011/curves/song17-sides --- a/show/dance2011/curves/song17-sides +++ b/show/dance2011/curves/song17-sides @@ -1,5 +1,5 @@ 0.0 0.0 -134.127785219 0 -137.989621186 1 +134.127785219 0.0 +137.989621186 1.0 213.659342428 1.0 217.275283447 0.0 diff --git a/show/dance2011/curves/song17-song17 b/show/dance2011/curves/song17-song17 --- a/show/dance2011/curves/song17-song17 +++ b/show/dance2011/curves/song17-song17 @@ -8,8 +8,8 @@ 70.9899739275 0.0 83.304047411 0.0 85.4489125117 0.0 92.261058086 0.329787234043 -97.2410909447 0.45744680851 -109.279767358 0.45744680851 +97.2410909447 0.723404255319 +109.279767358 0.723404255319 121.598189274 1.0 213.615980992 1.0 217.275283447 0.0 diff --git a/show/dance2011/curves/song3-bow b/show/dance2011/curves/song3-bow --- a/show/dance2011/curves/song3-bow +++ b/show/dance2011/curves/song3-bow @@ -1,5 +1,5 @@ -0 0 -184.669522135 0 -190.168806656 1 -206.134471394 1 -208.972811791 0 +0.0 0.0 +184.669522135 0.0 +190.168806656 1.0 +206.134471394 1.0 +208.972811791 0.0 diff --git a/show/dance2011/curves/song3-song03 b/show/dance2011/curves/song3-song03 --- a/show/dance2011/curves/song3-song03 +++ b/show/dance2011/curves/song3-song03 @@ -1,7 +1,8 @@ -0 0 -3.01573667271 0 +0.0 0.0 +3.01573667271 0.0 12.0629466908 0.159574468085 23.9484971068 0.212765957447 -31.3991406512 1 -205.957075119 1 -208.972811791 0 +28.9747248947 0.382978723404 +35.2624373038 1 +205.957075119 1.0 +208.972811791 0.0 diff --git a/show/dance2011/curves/song7-bow b/show/dance2011/curves/song7-bow new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song7-bow @@ -0,0 +1,6 @@ +0 0 +293.026866329 0 +295.721409825 0.436170212766 +299.275381588 0.734042553191 +303.867315291 0.946808510638 +307.640884354 0 diff --git a/show/dance2011/curves/song7-centerpool b/show/dance2011/curves/song7-centerpool new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song7-centerpool @@ -0,0 +1,14 @@ +0 0 +5.69656376851 0 +6.54258809057 0.340425531915 +20.4236538191 0.340425531915 +22.1094356164 0 +31.975203944 0.0106382978723 +32.2958048802 0.308510638298 +33.8224760049 0.31914893617 +36.0056157133 0 +237.064944047 0.063829787234 +243.898163701 0.382978723404 +260.012323482 0.414893617021 +270.825713593 0 +307.640884354 0 diff --git a/show/dance2011/curves/song7-chase1 b/show/dance2011/curves/song7-chase1 --- a/show/dance2011/curves/song7-chase1 +++ b/show/dance2011/curves/song7-chase1 @@ -1,5 +1,17 @@ -0 0 -13.8412282434 0 -19.0643332409 1 -143.374232182 1 -307.640884354 0 +0.0 0.0 +3.00901690415 0 +6.07367388571 1 +22.8146703343 1 +22.9556772085 1 +23.8247323726 0.978723404255 +23.9893697959 1 +143.374232182 1.0 +214.952514905 0.372340425532 +238.288804283 0.36170212766 +244.816058878 0 +257.462614656 0 +262.460043955 0.468085106383 +266.784604037 1 +291.730701279 1 +299.747872398 0 +307.640884354 0.0 diff --git a/show/dance2011/curves/song7-cross b/show/dance2011/curves/song7-cross new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song7-cross @@ -0,0 +1,11 @@ +0 0 +89.962687358 0 +92.1880267245 0 +95.5744127171 0 +97.8965059691 0 +185.971176858 0 +190.360415945 0.36170212766 +204.054841897 0.372340425532 +211.428763563 0.287234042553 +214.062307016 0 +307.640884354 0 diff --git a/show/dance2011/curves/song7-cycchase b/show/dance2011/curves/song7-cycchase --- a/show/dance2011/curves/song7-cycchase +++ b/show/dance2011/curves/song7-cycchase @@ -1,2 +1,2 @@ -0 0 -307.640884354 0 +0.0 0.0 +307.640884354 0.0 diff --git a/show/dance2011/curves/song7-cycmusic b/show/dance2011/curves/song7-cycmusic --- a/show/dance2011/curves/song7-cycmusic +++ b/show/dance2011/curves/song7-cycmusic @@ -1,5 +1,18 @@ -0 0 -10.2987077166 0 -38.9121322315 1 -284.136911865 1 -307.640884354 0 +0.0 0.0 +37.2537561402 0 +38.1521795898 1 +140.157714396 0.936170212766 +141.357389271 0 +151.494641966 0 +151.614609454 0.914893617021 +214.424376047 0.957446808511 +226.571569764 0.468085106383 +250.262756353 0.457446808511 +250.359816799 0 +251.93942708 0 +252.001192819 0.468085106383 +272.3529142 0.521276595745 +279.288122207 1 +294.869387473 1 +298.942463015 0 +307.640884354 0.0 diff --git a/show/dance2011/curves/song7-song07top b/show/dance2011/curves/song7-song07top new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song7-song07top @@ -0,0 +1,32 @@ +0 0 +3.56753921653 0 +11.0891034006 0.702127659574 +22.5277542893 0.744680851064 +22.5552424272 0 +23.7181573047 0 +23.8652531534 0.797872340426 +31.2297027531 0.851063829787 +31.3249737235 0 +32.2755922687 0 +32.3748570578 0.872340425532 +36.8121431029 0.872340425532 +37.8696606579 0.595744680851 +112.140140189 0.595744680851 +139.437909471 0.521276595745 +140.423234593 0 +152.154463147 0 +152.704533109 0.510638297872 +161.082351464 0.723404255319 +184.320461184 0.723404255319 +190.658127471 0.244680851064 +198.844279758 0.255319148936 +206.23822376 0.510638297872 +250.192994247 0.574468085106 +250.227793618 0 +251.254871499 0 +251.276187685 0.574468085106 +272.556890906 0.553191489362 +291.118771161 0.393617021277 +297.368402806 0.734042553191 +303.570489947 0.712765957447 +307.640884354 0 diff --git a/show/dance2011/curves/song7-strobebright b/show/dance2011/curves/song7-strobebright --- a/show/dance2011/curves/song7-strobebright +++ b/show/dance2011/curves/song7-strobebright @@ -1,3 +1,20 @@ -0 0 -82.3896617325 0 -307.640884354 0 +0.0 0.0 +22.5172761135 0 +22.61165697 0.755319148936 +23.8463282736 0.797872340426 +23.9037657109 0 +31.269722458 0 +31.3234802666 1 +32.335024523 1 +32.3505546687 0 +82.3896617325 0.0 +140.084981 0.0 +140.33283 0.75 +151.130762 0.75 +151.924081 0.0 +155.740979148 0 +250.232137246 0 +250.336433218 1 +251.192819961 1 +251.239619309 0 +307.640884354 0.0 diff --git a/show/dance2011/readme b/show/dance2011/readme --- a/show/dance2011/readme +++ b/show/dance2011/readme @@ -35,6 +35,9 @@ vidref raise for musicScale race conditi video follows *mouse* as you move around in CC (music cursor does not move unless you ask) +ascoltami web ui should be able to set the pulseaudio routing of the +music to internal laptop or external usb + let us use chan name anywhere we can use sub name 8 - mix to mono @@ -45,3 +48,5 @@ 12 ending is super loud 13 start with a chase? +port vidref to store pics in mongodb gridfs + diff --git a/show/dance2011/readme.dmcc b/show/dance2011/readme.dmcc --- a/show/dance2011/readme.dmcc +++ b/show/dance2011/readme.dmcc @@ -1,3 +1,8 @@ + +6 / marching band + lights in the begining when they raise their batons? + + 8 250 end of "shut em down" light up when groups sit down 330 bumps with each row of choreo @@ -8,6 +13,7 @@ 14 watch bow -- it's probably fine (Lucille: It never hurts to double-check!) + 15 blacklight goes somewhere in this? when all in front, they roll up in pieces. @@ -18,18 +24,23 @@ 15 time probably not right for this partc:w 16 - 50 needs look change -- add more white light over existing look - 107 chase comes in + - chase1 phase could need tweaking to help with the beat sync + + 84 - three groups? + 140 - strobe for ribbons until 153? - looks weird with stage and cyc on 190 strobe at beginning? 205 tigher center circle + 260 needs cartwheel strobe 310 curve called thirds exists but neesd matching lights in sub 374 between songs: random color chase? + 520 second thirds curve usage 596-617 strobe speed follows pitch of obnoxious lyrics 656 light pop when choreo finishes vu meter stacking trick!!!!1111 17 + add edge3 and patios at the end, after the music watch when they go to aisles!!! definitely before 134 next year: @@ -39,3 +50,4 @@ backup inside jokes: was 8, now 10 you're wearing the shirt right now. we highly value your input...until you sign the deal. + diff --git a/show/dance2011/subs/patio b/show/dance2011/subs/patio new file mode 100644 --- /dev/null +++ b/show/dance2011/subs/patio @@ -0,0 +1,13 @@ +_:lUJCypsL110 "0.475"^^. +_:lUJCypsL110 . +_:lUJCypsL109 "0.45"^^. +_:lUJCypsL109 . +_:lUJCypsL112 "0.405"^^. +_:lUJCypsL112 . +_:lUJCypsL111 "1"^^. +_:lUJCypsL111 . + "patio". + _:lUJCypsL110. + _:lUJCypsL109. + _:lUJCypsL112. + _:lUJCypsL111. diff --git a/show/dance2011/subs/patios b/show/dance2011/subs/patios deleted file mode 100644 --- a/show/dance2011/subs/patios +++ /dev/null @@ -1,7 +0,0 @@ -_:ctBVxUFA108 . -_:ctBVxUFA108 "1"^^. -_:ctBVxUFA107 . -_:ctBVxUFA107 "1"^^. - "patios". - _:ctBVxUFA108. - _:ctBVxUFA107. diff --git a/show/dance2011/subs/pool1 b/show/dance2011/subs/pool1 new file mode 100644 --- /dev/null +++ b/show/dance2011/subs/pool1 @@ -0,0 +1,7 @@ + "pool1". + _:lUJCypsL96. + _:lUJCypsL95. +_:lUJCypsL96 "1"^^. +_:lUJCypsL96 . +_:lUJCypsL95 "1"^^. +_:lUJCypsL95 . diff --git a/show/dance2011/subs/pool2 b/show/dance2011/subs/pool2 new file mode 100644 --- /dev/null +++ b/show/dance2011/subs/pool2 @@ -0,0 +1,7 @@ + _:lUJCypsL99. + _:lUJCypsL100. + "pool2". +_:lUJCypsL99 . +_:lUJCypsL99 "1"^^. +_:lUJCypsL100 . +_:lUJCypsL100 "0.59"^^. diff --git a/show/dance2011/subs/pool3 b/show/dance2011/subs/pool3 new file mode 100644 --- /dev/null +++ b/show/dance2011/subs/pool3 @@ -0,0 +1,13 @@ + _:lUJCypsL106. + _:lUJCypsL104. + _:lUJCypsL105. + _:lUJCypsL103. + "pool3". +_:lUJCypsL106 "1"^^. +_:lUJCypsL106 . +_:lUJCypsL104 "0.765"^^. +_:lUJCypsL104 . +_:lUJCypsL105 "0.49"^^. +_:lUJCypsL105 . +_:lUJCypsL103 "0.21"^^. +_:lUJCypsL103 . diff --git a/show/dance2011/subs/song07top b/show/dance2011/subs/song07top new file mode 100644 --- /dev/null +++ b/show/dance2011/subs/song07top @@ -0,0 +1,28 @@ +_:hiPtWtpV1133 "0.44"^^. +_:hiPtWtpV1133 . +_:hiPtWtpV1130 "0.47"^^. +_:hiPtWtpV1130 . +_:hiPtWtpV1132 "0.47"^^. +_:hiPtWtpV1132 . +_:hiPtWtpV1128 "0.44"^^. +_:hiPtWtpV1128 . +_:hiPtWtpV1129 "1.0"^^. +_:hiPtWtpV1129 . + "song07top". + _:hiPtWtpV1133. + _:hiPtWtpV1130. + _:hiPtWtpV1132. + _:hiPtWtpV1128. + _:hiPtWtpV1129. + _:hiPtWtpV1135. + _:hiPtWtpV1131. + _:hiPtWtpV1134. + _:hiPtWtpV1127. +_:hiPtWtpV1135 "0.44"^^. +_:hiPtWtpV1135 . +_:hiPtWtpV1131 "0.69"^^. +_:hiPtWtpV1131 . +_:hiPtWtpV1134 "1.0"^^. +_:hiPtWtpV1134 . +_:hiPtWtpV1127 "0.69"^^. +_:hiPtWtpV1127 . diff --git a/show/dance2011/subterms/song1.n3 b/show/dance2011/subterms/song1.n3 --- a/show/dance2011/subterms/song1.n3 +++ b/show/dance2011/subterms/song1.n3 @@ -1,15 +1,20 @@ - "cyc(t)". - "cyc". - . + . + . + "chase1". + "0*chase1(t)*chase(t,names=frontsrand)". + . + . + "other1". + "other1(t)". . - "song01(t)". - "song01". - . + . + "cyc". + "cyc(t)". + . + . + . + . . - . - . - . - "other1(t)". - "other1". - . - . + . + "song01". + "song01(t)". diff --git a/show/dance2011/subterms/song10.n3 b/show/dance2011/subterms/song10.n3 --- a/show/dance2011/subterms/song10.n3 +++ b/show/dance2011/subterms/song10.n3 @@ -1,15 +1,15 @@ - "cyc". - . - "cyc(t)". - . "bow". + . . "bow(t)". - . + "cyc". + . + . + "cyc(t)". + . + . + . "song10". + . . "song10(t)". - . - . - . - . diff --git a/show/dance2011/subterms/song15.n3 b/show/dance2011/subterms/song15.n3 --- a/show/dance2011/subterms/song15.n3 +++ b/show/dance2011/subterms/song15.n3 @@ -1,35 +1,35 @@ - "song15". - . - "song15(t)". - . + "centerpool(t)". + "centerpool". + . + . + "bow(t)". + "bow". + . + . + "blacklight(t)". "blacklight". . - "blacklight(t)". . + "song15dim(t)". "song15dim". . - "song15dim(t)". . - "bow". - . - "bow(t)". - . + "blacklight(t)*.38". + "green". + . + . + "strobe1(t) * chan(\"strobebright\") + chan(\"strobespeed\")*.99". "strobe1". . - "strobe1(t) * chan(\"strobebright\") + chan(\"strobespeed\")*.99". . - "centerpool". - . - "centerpool(t)". - . - "green". - . - "blacklight(t)*.38". - . + "song15(t)". + "song15". + . + . + . . + . + . + . . . - . - . - . - . diff --git a/show/dance2011/subterms/song16.n3 b/show/dance2011/subterms/song16.n3 --- a/show/dance2011/subterms/song16.n3 +++ b/show/dance2011/subterms/song16.n3 @@ -1,60 +1,90 @@ - "song16c". - "song16c(t)". - . - . - "down". - "topline(t)*(.2+ncos(t*2+.8)*.8)". - . - . + "song16e_wide". + . + "song16e_wide(t)". + . + "chase1". + . + "chase(t+.08,names=frontsrand, ontime=.25, offset=.25)*alle(t)". + . + "song16a". + . + "song16a(t)". + . + "bow". + . + "bow(t)". + . + "stack1". + . + "stack1(t)". + . + "sharps". + . + "". + . "b-sharp". + . "sharps(t)". - . . - "song16f_blue". - "song16f_blue(t)". - . - . - "song16b". - "song16b(t)". - . - . - "chase1". - "chase(t,names=fronts, ontime=.2, offset=.1)*0". - . - . + "down". + . + "topline(t)*(.2+ncos(t*2+.8)*.8)". + . + "chase2". + . + "colorchase1(t)*chase(t, names=back, ontime=.5, offset=-.3)". + . + "chase3". + . + "chase3(t)*chase(t, names=scoop, ontime=.25, offset=-0.25/2)". + . + "song16c". + . + "song16c(t)". + . + "song16d_big". + . + "song16d_big(t)". + . + . + . + . + . + . + . + . + . + . + . . - . - . + . + . . . - . - . - . - . - . - . - . - "sharps". - "". - . - . - "song16e-wide". - "song16e_wide(t)". - . - . - "stack1". - "stack1(t)". - . - . - "bow". - "bow(t)". - . - . - "song16a". - "song16a(t)". - . - . - "song16d_big". - "song16d_big(t)". - . - . + . + . + . + "pool3". + . + "pool3(t)". + . + "song16f_blue". + . + "song16f_blue(t)". + . + "song16b". + . + "song16b(t)". + . + "cyc". + . + "cyc(t)". + . + "pool1". + . + "pool1(t)". + . + "pool2". + . + "pool2(t)". + . diff --git a/show/dance2011/subterms/song17.n3 b/show/dance2011/subterms/song17.n3 --- a/show/dance2011/subterms/song17.n3 +++ b/show/dance2011/subterms/song17.n3 @@ -1,25 +1,25 @@ - . - . - . - . - . + . + "sides(t)". + . + "house-sides". + . + "song17(t)". + . "song17". - . - . - "song17(t)". - "cyc". + . + "song17top(t)". + . + "song17top". + . + "bow(t)". + . + "bow". . + "(bow(t)>.25)*aft(150)". . - "(bow(t)>.25)*aft(200)". - "song17top". - . - . - "song17top(t)". - "house-sides". - . - . - "sides(t)". - "bow". - . - . - "bow(t)". + "cyc". + . + . + . + . + . diff --git a/show/dance2011/subterms/song3.n3 b/show/dance2011/subterms/song3.n3 --- a/show/dance2011/subterms/song3.n3 +++ b/show/dance2011/subterms/song3.n3 @@ -1,10 +1,10 @@ . . - "bow". . "bow(t)". + "bow". . - "song03". . "song03(t)". + "song03". . diff --git a/show/dance2011/subterms/song7.n3 b/show/dance2011/subterms/song7.n3 --- a/show/dance2011/subterms/song7.n3 +++ b/show/dance2011/subterms/song7.n3 @@ -1,15 +1,35 @@ - "chase1". - . - . - "chase1(t)*(chase(t, names=colors, ontime=.2,offset=.15))". - "strobebright". - . + . + . + "cycmusic(t)*(music(t+.1)>.3)". + "cyc". + . + . + . + . + . + . + . . - "chan(\"strobebright\")*strobebright(t)+chan(\"strobespeed\")*.967". - "cyc". - . - . - "cycmusic(t)*(music(t+.1)>.3)". - . - . - . + . + "chan(\"strobebright\")*strobebright(t)+chan(\"strobespeed\")*.973". + "strobebright". + . + . + "cross(t)". + "f-cross". + . + . + "centerpool(t)". + "centerpool". + . + . + "song07top(t)". + "song07top". + . + . + "chase1(t)*(chase(t, names=colors, ontime=.25,offset=-.03))". + "chase1". + . + . + "bow(t)". + "bow".