diff --git a/show/dance2011/config.n3 b/show/dance2011/config.n3 --- a/show/dance2011/config.n3 +++ b/show/dance2011/config.n3 @@ -128,18 +128,14 @@ 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 diff --git a/show/dance2011/curves/song16-alle b/show/dance2011/curves/song16-alle --- a/show/dance2011/curves/song16-alle +++ b/show/dance2011/curves/song16-alle @@ -1,12 +1,12 @@ 0.0 0.0 -106.493755188 0.0 -106.577877286 1.0 -153.960892918 1.0 -185.679493149 1.0 -186.746081348 0.0 -344.268573975 0 +105.986627645 0.0 +106.7469198 0.744680851064 +154.129935432 0.744680851064 +185.848535663 0.744680851064 +187.084166377 0.0 +344.268573975 0.0 347.143822579 0.978723404255 -358.589045152 1 +358.589045152 1.0 368.632522664 0.978723404255 -372.138506924 0 +372.138506924 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-colorchase1 b/show/dance2011/curves/song16-colorchase1 --- a/show/dance2011/curves/song16-colorchase1 +++ b/show/dance2011/curves/song16-colorchase1 @@ -1,16 +1,23 @@ 0.0 0.0 49.0645898027 0.0 96.4176241472 0.0 +250.214054054 0 +256.143696705 0.382978723404 +269.188910537 0.372340425532 +275.32225516 0.351063829787 +276.071582054 0.765957446809 +288.810139253 0.787234042553 +291.379260033 0 358.856127743 0.0 -373.837943678 0 -375.856024823 1 +373.837943678 0.0 +375.856024823 1.0 408.676397137 0.914893617021 519.960046736 0.946808510638 -525.307930216 0 -566.67538184 0 +525.307930216 0.0 +566.67538184 0.0 570.357068 0.0 571.081766 1.0 587.720272 1.0 587.828573 0.0 -591.189016711 0 +591.189016711 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-cycmusic b/show/dance2011/curves/song16-cycmusic --- a/show/dance2011/curves/song16-cycmusic +++ b/show/dance2011/curves/song16-cycmusic @@ -2,13 +2,17 @@ 0.0 0.0 185.421083465 0.0 185.701130162 1.0 192.04885528 1.0 -193.729135458 0.0 -210.397336262 0 +193.729395303 0.372340425532 +210.397596107 0.372340425532 215.441030557 0.81914893617 235.7521238 0.86170212766 243.794771459 0.712765957447 -318.447894472 0.712765957447 -322.741850426 0 +257.610246183 0.712765957447 +260.377412754 0.287234042553 +288.246733213 0.276595744681 +295.757613905 0.297872340426 +316.273692167 0.287234042553 +322.741850426 0.0 556.742601 0.0 -559.007086668 0 +559.007086668 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-pool1 b/show/dance2011/curves/song16-pool1 --- a/show/dance2011/curves/song16-pool1 +++ b/show/dance2011/curves/song16-pool1 @@ -1,22 +1,17 @@ 0.0 0.0 -101.257613282 0 +101.257613282 0.0 319.914864785 0.0 320.018718917 1.0 321.506464165 1.0 321.895614925 0.287234042553 322.653744794 0.287234042553 -322.713227121 1.0 -323.062803228 1.0 -323.412379334 1.0 -323.808389848 0.0 -324.933597691 0 -324.971547264 1 -327.036758024 1.0 -327.293993273 0.691489361702 +322.757748606 0.755319148936 +327.081279509 0.755319148936 +327.360775501 0.627659574468 338.568519727 0.670212765957 -341.494211288 0 -525.353197 0.0 -525.518925 1.0 +341.494211288 0.0 +521.966078019 0 +522.689684439 1 538.99681 1.0 539.136446 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-pool2 b/show/dance2011/curves/song16-pool2 --- a/show/dance2011/curves/song16-pool2 +++ b/show/dance2011/curves/song16-pool2 @@ -1,19 +1,15 @@ 0.0 0.0 -117.240990005 0 +117.240990005 0.0 320.851283789 0.0 320.963411974 1.0 322.66732067 1.0 -323.142216513 1.0 -325.239409174 1.0 -325.463665545 0.425531914894 -326.159783848 0.372340425532 -326.660798815 0.393617021277 -326.81909743 0.893617021277 -338.719848601 0.893617021277 -341.645540162 0 -529.843549 0.0 -530.026777 1.0 +323.810038792 0.787234042553 +327.797493243 0.787234042553 +338.552893031 0.787234042554 +341.645540162 0.0 +529.604458248 0 +530.465110045 1 539.555219 1.0 -544.329832 1.0 +539.747259261 0 544.392349 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-pool3 b/show/dance2011/curves/song16-pool3 --- a/show/dance2011/curves/song16-pool3 +++ b/show/dance2011/curves/song16-pool3 @@ -3,14 +3,13 @@ 318.861558151 0.0 318.980282112 1.0 319.870711817 1.0 320.579757694 0.287234042553 -322.769555192 0.297872340426 -323.102641859 0.287234042553 -326.650905152 0.36170212766 -326.828991093 0.81914893617 +322.635990736 0.297872340426 +322.790991462 0.808510638298 +327.196453192 0.808510638298 338.820734517 0.776595744681 -342.301298616 0 -527.13413 0.0 -527.28288 1.0 +342.301298616 0.0 +525.858979325 0 +526.446062369 1 540.176681 1.0 540.251022 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-sharps b/show/dance2011/curves/song16-sharps --- a/show/dance2011/curves/song16-sharps +++ b/show/dance2011/curves/song16-sharps @@ -1,5 +1,5 @@ 0.0 0.0 198.852184488 0.0 -296.120183479 0.063829787234 +296.120183479 0 395.500711185 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-song16a b/show/dance2011/curves/song16-song16a --- a/show/dance2011/curves/song16-song16a +++ b/show/dance2011/curves/song16-song16a @@ -5,5 +5,8 @@ 89.1195530089 0.0 231.934778046 0.0 238.758574527 0.914893617021 251.951247725 0.914893617021 -258.320124441 0.0 +255.216212732 0 +284.439235648 0 +285.874876153 0 +289.037352234 0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-song16b b/show/dance2011/curves/song16-song16b --- a/show/dance2011/curves/song16-song16b +++ b/show/dance2011/curves/song16-song16b @@ -1,7 +1,7 @@ 0.0 0.0 75.9085594305 0.0 84.2087539277 1.0 -182.866630877 1 +182.866630877 1.0 183.807534437 0.63829787234 192.142204178 0.63829787234 193.729135458 1.0 diff --git a/show/dance2011/curves/song16-song16c b/show/dance2011/curves/song16-song16c --- a/show/dance2011/curves/song16-song16c +++ b/show/dance2011/curves/song16-song16c @@ -1,19 +1,22 @@ 0.0 0.0 197.289238435 5.20417042793e-18 200.218909461 1.0 -237.513257922 1.0 -238.702404625 0.436170212766 -254.502920942 0.436170212766 -256.927672971 1.0 -277.358920964 1.0 -288.350189781 1.0 +233.911549053 1 +239.1709196 0.0957446808511 +251.984652952 0.0638297872341 +253.238117544 0.170212765957 +274.837318564 0.170212765957 +276.506376672 0.425531914894 +288.488999155 0.436170212766 +289.397027928 0.106382978723 +290.010984916 0 298.414298798 0.0 347.70385762 0.0 350.686495246 1.0 370.570746084 1.0 373.056277438 0.0 -420.862928022 0 +420.862928022 0.0 421.286653416 0.18085106383 431.346162217 0.191489361702 -437.513866163 0 +437.513866163 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-song16d_big b/show/dance2011/curves/song16-song16d_big --- a/show/dance2011/curves/song16-song16d_big +++ b/show/dance2011/curves/song16-song16d_big @@ -1,6 +1,7 @@ 0.0 0.0 -284.594925222 0.0 -287.599136869 1.0 +251.008257959 0 +251.634240071 1 +290.366303439 1 317.137494107 1.0 319.065123327 0.0 332.486992642 0.0 diff --git a/show/dance2011/curves/song16-song16e_wide b/show/dance2011/curves/song16-song16e_wide --- a/show/dance2011/curves/song16-song16e_wide +++ b/show/dance2011/curves/song16-song16e_wide @@ -1,5 +1,5 @@ 0.0 0.0 -355.126618737 0 +355.126618737 0.0 356.164907929 0.627659574468 362.599698162 0.63829787234 373.204455654 0.648936170213 @@ -11,8 +11,8 @@ 432.822111723 0.0 437.985246792 0.521276595745 455.876871733 0.521276595745 465.995894071 0.521276595745 -476.613015686 0 -484.792131596 0 +476.613015686 0.0 +484.792131596 0.0 490.769177838 0.478723404255 513.625287092 0.425531914894 519.742340817 0.0 diff --git a/show/dance2011/curves/song16-song16f_blue b/show/dance2011/curves/song16-song16f_blue --- a/show/dance2011/curves/song16-song16f_blue +++ b/show/dance2011/curves/song16-song16f_blue @@ -1,4 +1,9 @@ 0.0 0.0 +250.29689679 0 +253.415449591 0.446808510638 +271.46857399 0.425531914894 +288.773689103 0.457446808511 +290.88200649 0 516.827756565 0.0 530.933317607 1.0 649.669438935 1.0 diff --git a/show/dance2011/curves/song16-strobe b/show/dance2011/curves/song16-strobe --- a/show/dance2011/curves/song16-strobe +++ b/show/dance2011/curves/song16-strobe @@ -1,6 +1,6 @@ -0 0 -597.971945343 0 +0.0 0.0 +597.971945343 0.0 599.359841276 0.808510638298 619.231987582 0.797872340426 -619.421246118 0 -664.654036281 0 +619.421246118 0.0 +664.654036281 0.0 diff --git a/show/dance2011/curves/song16-stroberate b/show/dance2011/curves/song16-stroberate --- a/show/dance2011/curves/song16-stroberate +++ b/show/dance2011/curves/song16-stroberate @@ -1,5 +1,6 @@ -0 0 +0.0 0.0 +575.653152453 0.0 598.413548595 0.553191489362 606.993268905 0.670212765957 619.547418476 0.712765957447 -664.654036281 0 +664.654036281 0.0 diff --git a/show/dance2011/curves/song7-bow b/show/dance2011/curves/song7-bow --- a/show/dance2011/curves/song7-bow +++ b/show/dance2011/curves/song7-bow @@ -1,6 +1,6 @@ -0 0 -293.026866329 0 +0.0 0.0 +293.026866329 0.0 295.721409825 0.436170212766 299.275381588 0.734042553191 303.867315291 0.946808510638 -307.640884354 0 +307.640884354 0.0 diff --git a/show/dance2011/curves/song7-centerpool b/show/dance2011/curves/song7-centerpool --- a/show/dance2011/curves/song7-centerpool +++ b/show/dance2011/curves/song7-centerpool @@ -1,14 +1,16 @@ -0 0 -5.69656376851 0 +0.0 0.0 +5.69656376851 0.0 6.54258809057 0.340425531915 20.4236538191 0.340425531915 -22.1094356164 0 +22.1094356164 0.0 31.975203944 0.0106382978723 32.2958048802 0.308510638298 33.8224760049 0.31914893617 -36.0056157133 0 -237.064944047 0.063829787234 +36.0056157133 0.0 +236.118009587 0 243.898163701 0.382978723404 260.012323482 0.414893617021 -270.825713593 0 -307.640884354 0 +270.825713593 0.0 +276.74560758 0 +280.332973841 0 +307.640884354 0.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,17 +1,18 @@ 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 +3.00901690415 0.0 +6.78387473071 0.989361702128 +19.8856236599 0.989361702128 +55.6323995247 0.489361702128 +104.872991444 0.457446808511 +143.374232182 0.691489361702 +158.466202093 0.425531914894 214.952514905 0.372340425532 238.288804283 0.36170212766 -244.816058878 0 -257.462614656 0 +244.816058878 0.0 +257.462614656 0.0 262.460043955 0.468085106383 -266.784604037 1 -291.730701279 1 -299.747872398 0 +266.784604037 1.0 +288.819969177 1 +291.423948359 0.414893617021 +299.747872398 0.0 307.640884354 0.0 diff --git a/show/dance2011/curves/song7-cross b/show/dance2011/curves/song7-cross --- a/show/dance2011/curves/song7-cross +++ b/show/dance2011/curves/song7-cross @@ -1,11 +1,11 @@ -0 0 -89.962687358 0 -92.1880267245 0 -95.5744127171 0 -97.8965059691 0 -185.971176858 0 +0.0 0.0 +89.962687358 0.0 +92.1880267245 0.0 +95.5744127171 0.0 +97.8965059691 0.0 +185.971176858 0.0 190.360415945 0.36170212766 204.054841897 0.372340425532 211.428763563 0.287234042553 -214.062307016 0 -307.640884354 0 +214.062307016 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,18 +1,18 @@ 0.0 0.0 -37.2537561402 0 -38.1521795898 1 +37.2537561402 0.0 +38.1521795898 1.0 140.157714396 0.936170212766 -141.357389271 0 -151.494641966 0 +141.357389271 0.0 +151.494641966 0.0 151.614609454 0.914893617021 214.424376047 0.957446808511 226.571569764 0.468085106383 250.262756353 0.457446808511 -250.359816799 0 -251.93942708 0 +250.359816799 0.0 +251.93942708 0.0 252.001192819 0.468085106383 272.3529142 0.521276595745 -279.288122207 1 -294.869387473 1 -298.942463015 0 +279.288122207 1.0 +294.869387473 1.0 +298.942463015 0.0 307.640884354 0.0 diff --git a/show/dance2011/curves/song7-song07top b/show/dance2011/curves/song7-song07top --- a/show/dance2011/curves/song7-song07top +++ b/show/dance2011/curves/song7-song07top @@ -1,32 +1,37 @@ -0 0 -3.56753921653 0 +0.0 0.0 +3.56753921653 0.0 11.0891034006 0.702127659574 22.5277542893 0.744680851064 -22.5552424272 0 -23.7181573047 0 +22.5552424272 0.0 +23.7181573047 0.0 23.8652531534 0.797872340426 -31.2297027531 0.851063829787 -31.3249737235 0 -32.2755922687 0 +30.9205954201 0.829787234042 +31.0004110238 0.0106382978723 +32.2755922687 0.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 +140.423234593 0.0 +152.154463147 0.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 +191.228585147 0.18085106383 +199.414737434 0.191489361702 +208.805283302 0.531914893617 250.192994247 0.574468085106 -250.227793618 0 -251.254871499 0 +250.227793618 0.0 +251.254871499 0.0 251.276187685 0.574468085106 +253.36145089 0.617021276596 +253.394169243 0.0106382978723 +254.494009272 0.0106382978723 +254.561962775 0.617021276596 272.556890906 0.553191489362 -291.118771161 0.393617021277 +274.2587422 0.670212765957 +290.926643724 0.691489361703 297.368402806 0.734042553191 303.570489947 0.712765957447 -307.640884354 0 +307.640884354 0.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,20 +1,24 @@ 0.0 0.0 -22.5172761135 0 +22.5172761135 0.0 22.61165697 0.755319148936 23.8463282736 0.797872340426 -23.9037657109 0 -31.269722458 0 -31.3234802666 1 -32.335024523 1 -32.3505546687 0 +23.9037657109 0.0 +30.9915258583 0 +31.0298283002 1 +32.335024523 1.0 +32.3505546687 0.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 +155.740979148 0.0 +250.232137246 0.0 +250.336433218 1.0 +251.192819961 1.0 +251.239619309 0.0 +253.268329423 0 +253.313631758 0.957446808511 +254.604748314 0.957446808511 +254.83125999 0 307.640884354 0.0 diff --git a/show/dance2011/readme.dmcc b/show/dance2011/readme.dmcc --- a/show/dance2011/readme.dmcc +++ b/show/dance2011/readme.dmcc @@ -7,7 +7,6 @@ 7 / gymnastics WRONG? 84 - three groups? no obvious groups!! 140 - strobe for ribbons until 153? - looks weird with stage and cyc on - 8 intro - light up half right half first, then left half when they raise their hands 250 end of "shut em down" light up when groups sit down 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,100 +1,100 @@ - . - . - "strobe1". - "chan(\"strobebright\")*strobe(t)". - . - . - "song16c". - "song16c(t)". - . - . - "song16b". - "song16b(t)". - . - . - "chase3". - "chase3(t)*chase(t, names=scoop, ontime=.25, offset=-0.25/2)". - . - . - "pool1". - "pool1(t)". - . - . - "b-sharp". - "sharps(t)". + . + . + "colorchase1(t)*chase(t, names=back, ontime=.5, offset=-.3)". + "chase2". + . + . + "bow(t)". + "bow". + . + . + "chase(t+.08,names=frontsrand, ontime=.25, offset=.25)*alle(t)". + "chase1". . . + "pool2(t)". "pool2". - "pool2(t)". - . - . - "bow". - "bow(t)". - . - . - "chase2". - "colorchase1(t)*chase(t, names=back, ontime=.5, offset=-.3)". - . - . - "chase1". - "chase(t+.08,names=frontsrand, ontime=.25, offset=.25)*alle(t)". - . - . - "down". - "topline(t)*(.2+ncos(t*2+.8)*.8)". - . - . - "stack1". - "stack1(t)". . . + "". "sharps". - "". + . + . + "topline(t)*(.2+ncos(t*2+.8)*.8)". + "down". + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . . . + "song16f_blue(t)". "song16f_blue". - "song16f_blue(t)". - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . + . + . + "sharps(t)". + "b-sharp". . . + "song16e_wide(t)". "song16e_wide". - "song16e_wide(t)". + . + . + "song16d_big(t)". + "song16d_big". + . + . + "song16c(t)". + "song16c". + . + . + "chase3(t)*chase(t, names=scoop, ontime=.25, offset=-0.25/2)". + "chase3". . . + "chan(\"strobespeed\")*(.9+.1*stroberate(t))". "stroberate". - "chan(\"strobespeed\")*(.9+.1*stroberate(t))". + . + . + "pool1(t)". + "pool1". . . + "song16a(t)". "song16a". - "song16a(t)". - . - . - "song16d_big". - "song16d_big(t)". + . + . + "song16b(t)". + "song16b". + . + . + "chan(\"strobebright\")*strobe(t)". + "strobe1". + . + . + "pool3(t)". + "pool3". + . + . + "stack1(t)". + "stack1". . . + "cycmusic(t)*((music(t+.1)-.3)*5+within(180,193)*music(t+.1)*9)". "cyc". - "cycmusic(t)*(music(t+.1)-.3)*5". - . - . - "pool3". - "pool3(t)". 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,35 +1,35 @@ + . + . + "song07top(t)". + "song07top". . . "cycmusic(t)*(music(t+.1)>.3)". "cyc". + . + . + "chase1(t)*(chase(t, names=colors, ontime=.25,offset=-.03))". + "chase1". + . . + . . - . . - . - . . + . . . "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". + . + . + "cross(t)". + "f-cross".