diff --git a/show/dance2012/curves/song1-song1 b/show/dance2012/curves/song1-song1 --- a/show/dance2012/curves/song1-song1 +++ b/show/dance2012/curves/song1-song1 @@ -1,7 +1,7 @@ 0.0 0 6.45101194785 0 14.1508176153 0.28500000000000003 -97.0427267463 0.2834604956244867 -99.5858561945 1 +101.218270367 0.2834604956244867 +106.235796035 1 233.830442774 1 238.005986395 0 diff --git a/show/dance2012/curves/song1-spot b/show/dance2012/curves/song1-spot --- a/show/dance2012/curves/song1-spot +++ b/show/dance2012/curves/song1-spot @@ -1,8 +1,8 @@ -0 0 +0.0 0 5.335416849 0.0 -17.0887988932 0.858695652173913 +18.0940223575 0.8206521739130433 36.3426944787 1 99.4312064307 1 -100.887014392 0 +114.341543837 0 194.626727666 0 238.005986395 0 diff --git a/show/dance2012/curves/song15-backctr b/show/dance2012/curves/song15-backctr --- a/show/dance2012/curves/song15-backctr +++ b/show/dance2012/curves/song15-backctr @@ -1,5 +1,29 @@ 0.0 0 118.284682401 0 121.192359918 0.5946969696969697 +125.731167912 0.5946969696969697 +125.870808347 0.0 +128.508460997 0.0 +128.640343629 0.5946969696969697 +131.277026555 0.5946969696969697 +131.408909187 0.0 +133.968983818 0.0 +134.108624253 0.5946969696969697 +153.304759155 0.5946969696969697 +153.470542157 0.0 +155.923175462 0.0 +155.970931882 0.5946969696969697 +158.737393092 0.5946969696969697 +158.930806595 0.0 +161.435971961 0.0 +161.721487132 0.5946969696969697 +181.387298782 0.5946969696969697 +181.418549659 0.0 +184.094405934 0.0 +184.094405934 0.5946969696969697 +186.84860642 0.5946969696969697 +186.92846977 0.0 +189.466735382 0.0 +189.473545725 0.5946969696969697 200.006406512 0.5946969696969697 203.993401361 0 diff --git a/show/dance2012/curves/song15-center b/show/dance2012/curves/song15-center --- a/show/dance2012/curves/song15-center +++ b/show/dance2012/curves/song15-center @@ -1,15 +1,49 @@ 0.0 0 35.7220413689 0.0 40.3612675207 0.4649122807017544 -48.1227665111 0.46491228070175433 -48.4688675098 0.9560584747960201 -51.3554971153 0.944263504013385 -52.3962547282 0.45907927518217034 +48.2958170104 0.0 +48.2958170104 0.46491228070175433 +51.0782589547 0.0 +51.0782589547 0.45907927518217034 +53.9096074874 0.0 +53.9096074874 0.4596948732165434 +56.4373579441 0.0 +56.4373579441 0.4602535467671794 +76.4170290558 0.4647605197874672 +76.4204769678 0.0 +79.170186757 0.0 +79.3046553234 0.46539947204284104 +81.8466284169 0.46596451998452415 +81.9500657758 0.0 +84.7204630367 0.0 +84.7204630367 0.46668879189935375 96.5761429638 0.46928614843150035 97.3778692968 0.0 119.647246364 0.0 121.710543281 0.46255653547334136 +125.76219912 0.4627597931602573 +125.878566148 0.0 +128.492945393 0.0 +128.624828026 0.4629034014411839 +131.308057762 0.4630380098806568 +131.478729404 0.0 +133.922437007 0.0 +134.077593045 0.46317694797358583 +153.332389656 0.4641428951262529 +153.461331991 0.0 +155.88190027 0.0 +155.908166301 0.46428936259913695 +158.728182925 0.4644270211841609 +158.949226928 0.0 +161.509653296 0.0 +161.693856631 0.4645717899924588 168.669007948 0.4649122807017544 +181.293546154 0.2220884722048934 +181.293546154 0.0 +183.996746946 0.0 +184.137375889 0.163909728497713 +186.834717142 0.11230862368904082 +186.912844332 0 192.705418648 0 200.130680618 0.70485347985348 203.993401361 0 diff --git a/show/dance2012/curves/song15-chasecolors b/show/dance2012/curves/song15-chasecolors --- a/show/dance2012/curves/song15-chasecolors +++ b/show/dance2012/curves/song15-chasecolors @@ -1,6 +1,46 @@ 0.0 0 30.6188926018 0 31.8118364695 1 +48.3094083157 0.0 +48.3094083157 1.0 +51.0800929027 0.0 +51.0800929027 1.0 +53.902496169 0.0 +53.902496169 1.0 +56.4377889331 0.0 +56.4377889331 1.0 +76.3394510367 1.0 +76.4584039994 0.0 +79.1236399455 0.0 +79.2943115876 1.0 +81.8052534734 1.0 +81.9759251155 0.0 +84.7124179088 0.0 +84.963253504 1 +125.607043082 1.0 +125.882445049 0 +128.489066492 0 +128.838167578 1 +131.33908897 1.0 +131.509760612 0.0 +133.875890196 0.0 +134.069835243 1.0 +153.277128655 1.0 +153.516592991 0.0 +156.012548191 0.0 +156.374814752 1.0 +158.709762592 1.0 +158.903176094 0.0 +161.472812628 0.0 +161.703066798 1.0 +181.32219279 1.0 +181.345630947 0.0 +184.035810541 0.0 +184.153001327 1.0 +186.831244822 1.0 +186.918052812 0.0 +189.466735382 0.0 +189.481060724 1.0 191.106468038 1 193.768338922 0 203.993401361 0 diff --git a/show/dance2012/curves/song15-timewarp b/show/dance2012/curves/song15-timewarp --- a/show/dance2012/curves/song15-timewarp +++ b/show/dance2012/curves/song15-timewarp @@ -1,11 +1,32 @@ 0.0 0 -48.3526823045 0 -51.1648248902 1 -51.1693098694 0 +48.3199271409 0 +51.0717312672 1 +51.0762162464 0 +53.810695513 0.0 +56.4392973946 0 +56.4392973946 1 76.4580470866 0.0 -78.4871971495 1 -78.5788361846 0 -125.593227931 0.0 -128.486403182 1 +79.1795809702 0.9948979591836735 +79.1839447338 0 +81.8660229217 0 +81.8776596246 1 +84.8450188563 0 +125.881236327 0 +128.637680319 1 128.64349867 0 +131.352665123 0.0 +133.988378323 1 +134.011651729 0 +153.295548988 0 +153.316271864 1 +155.91584144 0 +158.846977021 0.0 +158.853884646 1 +161.550160974 0.0 +181.449800535 0.0 +184.12956317 1 +184.133469529 0 +186.966448266 0.0 +186.966448266 0.9603960396039604 +189.644257721 0 203.993401361 0 diff --git a/show/dance2012/subterms/song1.n3 b/show/dance2012/subterms/song1.n3 --- a/show/dance2012/subterms/song1.n3 +++ b/show/dance2012/subterms/song1.n3 @@ -1,31 +1,31 @@ + . + "allcolor" . + . + "allcolor(t)" . + . + "spot" . + . + "chan(\"sharlyn\")*spot(t)" . + . + "fos" . . "fos(t)" . - "fos" . - . + . + "song1" . . "song1(t)" . - "song1" . - . + . + "full" . + . + "full(t)" . + . + . . . . . - . - . - . - "full(t)" . - "full" . - . + . + "back" . . "0" . - "back" . - . - . - "allcolor(t)" . - "allcolor" . - . - . - "chan(\"sharlyn\")" . - "spot" . - . diff --git a/show/dance2012/subterms/song15.n3 b/show/dance2012/subterms/song15.n3 --- a/show/dance2012/subterms/song15.n3 +++ b/show/dance2012/subterms/song15.n3 @@ -1,46 +1,46 @@ + . + "song15start" . + "song15start(t)" . + . + . + "center" . + "center(t)" . + . + . + "backctr" . + "backctr(t)" . + . + . + "timewarp" . + "getsub('green')*(0 < timewarp(t) < 25) + getsub('orange') * .5 * (.25 < timewarp(t) < .5) + getsub('blue') * (.5 < timewarp(t) < .75) + getsub('red') * (.75 < timewarp(t) < 1) " . + . + . "stroberate" . "chan('strobespeed')*.97" . . - . + . + "full" . + "full(t)" . + . + . + "strobe" . + "strobe(t)*chan(\"strobebright\")" . + . + . + . + . + . + . + . + . + . + . + . "chasecolors" . "chase(t, names=colors, ontime=.3) * chasecolors(t)" . . - . - "song15start" . - "song15start(t)" . - . - . - "timewarp" . - "getsub('green')*(0 < timewarp(t) < 25) + getsub('orange') * .5 * (.25 < timewarp(t) < .5) + getsub('blue') * (.5 < timewarp(t) < .75) + getsub('red') * (.75 < timewarp(t) < 1) " . - . - . + . "front" . "front(t)" . . - . - . - . - . - . - . - . - . - . - . - "full" . - "full(t)" . - . - . - "center" . - "center(t)" . - . - . - "strobe" . - "strobe(t)*chan(\"strobebright\")" . - . - . - "backctr" . - "backctr(t)" . - . - . diff --git a/show/dance2012/subterms/song17.n3 b/show/dance2012/subterms/song17.n3 --- a/show/dance2012/subterms/song17.n3 +++ b/show/dance2012/subterms/song17.n3 @@ -1,21 +1,21 @@ - . - "patio" . - "patio(t)" . - . + . + "cyc(t)" . + "cyc" . . - "cyc" . - "cyc(t)" . - . . . . . - . - "full" . - "full(t)" . - . + . + "song17(t)" . + "song17" . . - "song17" . - "song17(t)" . - . + . + "patio(t)" . + "patio" . + . + . + "full(t)" . + "full" . + .