diff --git a/show/dance2009/curves/song15-cyc b/show/dance2009/curves/song15-cyc --- a/show/dance2009/curves/song15-cyc +++ b/show/dance2009/curves/song15-cyc @@ -1,7 +1,7 @@ -4.0 0.0 113.533052078 0.0 115.461739073 0 -117.104365922 1.0 +119.051057723 1 123.312560635 1.0 125.96189357 0.806451612903 249.637648005 0.827956989247 diff --git a/show/dance2009/curves/song15-song15 b/show/dance2009/curves/song15-song15 --- a/show/dance2009/curves/song15-song15 +++ b/show/dance2009/curves/song15-song15 @@ -1,10 +1,10 @@ -4.0 0.0 --0.6000944848 0.0 -1.21163131558 0.440476190476 +1.24413985306 0 +2.5777308251 0.472391084093 6.78101062785 0.565476190476 10.4140480794 1.0 114.933613084 1.0 -116.485884023 0.5 +119.25223553 0.542553191489 201.263540739 0.504273504274 221.846453807 0.794871794872 251.019973201 0.793956043956 diff --git a/show/dance2009/curves/song16-backchase b/show/dance2009/curves/song16-backchase --- a/show/dance2009/curves/song16-backchase +++ b/show/dance2009/curves/song16-backchase @@ -1,6 +1,10 @@ --4 0 -313.98840226 0 -330.728318413 1 -435.817792044 1 -438.297779623 0 -452.247709751 0 +-4.0 0.0 +163.373784852 0 +171.398060543 0.657894736842 +287.337286689 0.736842105263 +288.063764323 0 +314.879988448 0 +403.838385826 0 +430.861177304 0 +438.297779623 0.0 +452.247709751 0.0 diff --git a/show/dance2009/curves/song16-beats1 b/show/dance2009/curves/song16-beats1 --- a/show/dance2009/curves/song16-beats1 +++ b/show/dance2009/curves/song16-beats1 @@ -1,6 +1,16 @@ -4.0 0.0 -16.1802505659 0.0 -16.2346810203 1.0 +15.9989386413 0 +16.0654565573 1 42.0744597758 1.0 44.5272787198 0.0 +95.9910253243 0.0789473684211 +114.578330599 0.763157894737 +115.197907441 0.684210526316 +122.632829551 0.947368421053 +127.946008301 0 +148.36083869 0 +291.777307548 0.815789473684 +301.690537028 0.736842105263 +303.859055977 0.289473684211 +307.886305453 0 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-beats2 b/show/dance2009/curves/song16-beats2 --- a/show/dance2009/curves/song16-beats2 +++ b/show/dance2009/curves/song16-beats2 @@ -1,4 +1,14 @@ -4.0 0.0 100.935271864 0.0 108.589554513 0.0 +430.691510897 0.394736842105 +430.793582795 0.973684210526 +430.804327206 1 +431.53494711 0.263157894737 +432.491199631 0.263157894737 +432.700715632 1 +433.517290819 0.210526315789 +434.419821288 0.131578947368 +434.613220675 1 +435.23102427 0.184210526316 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-bow b/show/dance2009/curves/song16-bow --- a/show/dance2009/curves/song16-bow +++ b/show/dance2009/curves/song16-bow @@ -1,5 +1,5 @@ -4.0 0.0 436.831581641 0.0 -438.57474807 0.466666666667 +442.698562499 0.41403508772 447.181632315 0.466666666667 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-bpurpleall b/show/dance2009/curves/song16-bpurpleall --- a/show/dance2009/curves/song16-bpurpleall +++ b/show/dance2009/curves/song16-bpurpleall @@ -7,4 +7,5 @@ 78.9631232844 0.0 80.1646251665 1.0 89.3845624593 0.975609756098 94.2833033547 0.0 +350.637107584 0 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-centercircle b/show/dance2009/curves/song16-centercircle --- a/show/dance2009/curves/song16-centercircle +++ b/show/dance2009/curves/song16-centercircle @@ -3,4 +3,16 @@ 44.1823093774 0.0 46.6906493946 0.71875 47.804716005 0.684210526316 48.3579391397 0.0 +430.261734483 0.016393442623 +430.659277666 0.393442622951 +432.1198611 0.40157480315 +432.325157994 0.409448818898 +432.494905944 0.527559055118 +432.587908968 0.637795275591 +434.403704673 0.295081967213 +434.665599675 0.754098360656 +434.762299368 1 +434.895261446 0.672131147541 +436.152357457 0.688524590164 +447.44278976 0.688524590164 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-chase1 b/show/dance2009/curves/song16-chase1 --- a/show/dance2009/curves/song16-chase1 +++ b/show/dance2009/curves/song16-chase1 @@ -3,4 +3,8 @@ 64.7654951899 0.0 64.8508011092 1.0 78.8731363416 1.0 79.7916621968 0.0 +165.75134802 0 +176.747577671 1 +363.386286351 1 +432.494905944 0.236220472441 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-green b/show/dance2009/curves/song16-green --- a/show/dance2009/curves/song16-green +++ b/show/dance2009/curves/song16-green @@ -42,5 +42,8 @@ 46.1883649667 0.868421052632 47.6786853378 0.0 92.8442982167 0.0 98.1206503895 1.0 -188.439031108 1.0 +127.709681972 1 +128.259591085 0 +154.276796398 0 +194.66542138 0 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-red b/show/dance2009/curves/song16-red --- a/show/dance2009/curves/song16-red +++ b/show/dance2009/curves/song16-red @@ -59,4 +59,40 @@ 64.527778358 1.0 65.157224408 0.950819672131 65.2115264295 0.0 66.3549926147 0.0 +291.597087365 0.263157894737 +292.785868948 0.605263157895 +293.314216319 0.710526315789 +293.84256369 0.842105263158 +296.748474228 0.789473684211 +297.80516897 0.789473684211 +298.861863711 0.789473684211 +299.918558452 0.736842105263 +301.767774249 0.289473684211 +302.29612162 0.5 +303.484903204 0.657894736842 +306.126640057 0.789473684211 +307.051247956 0.789473684211 +309.825071652 0.447368421053 +309.957158494 0.684210526316 +310.353419022 0.263157894737 +311.013853236 0.236842105263 +311.674287449 0.710526315789 +312.863069033 1 +316.165240099 0.210526315789 +318.014455897 0.657894736842 +320.259932222 0.973684210526 +323.033755918 0.0789473684211 +325.939666456 0.947368421053 +329.241837523 0.184210526316 +331.686756965 1 +333.732790173 0.105263157895 +333.996963859 0.289473684211 +334.921571757 0.657894736842 +336.902874397 0.894736842105 +339.280437565 0.105263157895 +339.808784936 0.368421052632 +341.790087576 0.894736842105 +342.318434946 0.894736842105 +352.686132715 0.973684210526 +438.70499549 1 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-strobe b/show/dance2009/curves/song16-strobe --- a/show/dance2009/curves/song16-strobe +++ b/show/dance2009/curves/song16-strobe @@ -1,6 +1,7 @@ -4.0 0.0 -81.5221337207 0.0 -81.5241496634 1.0 -87.0422889704 1.0 -87.0604324552 0.0 +127.952284274 0 +128.308716064 1 +153.682539777 0.973684210526 +154.179231878 0 +180.253475902 0 452.247709751 0.0 diff --git a/show/dance2009/curves/song17-bow b/show/dance2009/curves/song17-bow --- a/show/dance2009/curves/song17-bow +++ b/show/dance2009/curves/song17-bow @@ -1,7 +1,7 @@ -4.0 0.0 185.961898305 0.0 190.399050847 0.5 -216.628364093 0.504320502749 +208.870410654 0.488447486876 223.400753295 1.0 232.45765725 1.0 234.307992467 0.0 diff --git a/show/dance2009/curves/song17-cast1 b/show/dance2009/curves/song17-cast1 --- a/show/dance2009/curves/song17-cast1 +++ b/show/dance2009/curves/song17-cast1 @@ -2,5 +2,5 @@ -1.05586440678 0.0 3.86821845574 1.0 40.5340715631 1.0 -46.2351798456 0.0 +44.1917298713 0 237.4 0.0 diff --git a/show/dance2009/curves/song17-cast2 b/show/dance2009/curves/song17-cast2 --- a/show/dance2009/curves/song17-cast2 +++ b/show/dance2009/curves/song17-cast2 @@ -1,5 +1,5 @@ -4.0 0.0 -40.357559322 0.0 +38.6477338333 0 42.5183126177 1.0 86.0437966102 1.0 89.7201205273 0.0 diff --git a/show/dance2009/curves/song17-chase1 b/show/dance2009/curves/song17-chase1 --- a/show/dance2009/curves/song17-chase1 +++ b/show/dance2009/curves/song17-chase1 @@ -1,8 +1,8 @@ --4 0 -119.822826087 0 -123.939673913 0.967741935484 +-4.0 0.0 +119.822826087 0.0 +140.500397417 0.889616935484 187.050394949 0.967741935484 203.173583083 0.596774193548 215.384851482 0.612903225806 -218.570249597 0 -237.4 0 +218.570249597 0.0 +237.4 0.0 diff --git a/show/dance2009/curves/song17-patios b/show/dance2009/curves/song17-patios --- a/show/dance2009/curves/song17-patios +++ b/show/dance2009/curves/song17-patios @@ -1,6 +1,6 @@ -4.0 0.0 161.639728814 0.0 -171.17138983 1.0 +168.699640053 1 232.378531073 1.0 234.861875706 0.0 237.4 0.0 diff --git a/show/dance2009/subterms/song15.n3 b/show/dance2009/subterms/song15.n3 --- a/show/dance2009/subterms/song15.n3 +++ b/show/dance2009/subterms/song15.n3 @@ -1,31 +1,31 @@ - "song15(t)". + . + "scoop". + "scoop(t)". + . + . "song15". - . + "song15(t)". . - "bow(t)". - "bow". - . - . - "scoop(t)". - "scoop". - . - . - "cyc(t)". - "cyc". - . - . + . . . - . + . . . - . - "song15(t)". - "chase(t, names=back, ontime=.2, offset=.05)*within(264,361)". - "". + . + "bow". + "bow(t)". + . + . + "front". + "america(t)". + . + . + "cyc". + "cyc(t)". + . . + "". + "chase(t, names=back, ontime=.2, offset=.05)*within(264,361)". + "song15(t)". . - "america(t)". - "front". - . - . diff --git a/show/dance2009/subterms/song16.n3 b/show/dance2009/subterms/song16.n3 --- a/show/dance2009/subterms/song16.n3 +++ b/show/dance2009/subterms/song16.n3 @@ -1,55 +1,56 @@ - "red(t)". - . - "red". - . - "centercircle(t)". - . - "centercircle". - . - "chase1(t) * chase(t + 0.02, names=colors, ontime=0.3)". - . - "". - . "bpurpleall(t)". - . - "bpurpleall". . - "green(t)". - . - "green". - . - "srcross(t)". - . - "srcross". - . - "chase(t, names=back, ontime=.4, offset=.1) * backchase(t)". - . - "chase2". - . - "slcross(t)". - . - "slcross". - . - "blue(t)". - . - "blue". - . - "bow(t)". - . - "bow". - . - "beats1(t) * (smooth_music(t) > 0.5) + beats2(t)". - . - "cyc". - . + "bpurpleall". + . + . + . + . + . + . . . + . . + . . - . - . - . - . - . - . - . + "beats1(t) * (smooth_music(t) > 0.5) + beats2(t)". + . + "cyc". + . + "chase(t, names=back, ontime=.4, offset=.1) * backchase(t)". + "chase1(t) * chase(t + 0.02, names=colors, ontime=0.3)". + . + "". + . + "srcross(t)". + . + "srcross". + . + "bow(t)". + . + "bow". + . + "red(t)". + . + "red". + . + "centercircle(t)". + . + "centercircle". + . + "green(t)". + . + "green". + . + "blue(t)". + . + "blue". + . + "strobe(t)>0". + . + "strobe". + . + "slcross(t)". + . + "slcross". + . diff --git a/show/dance2009/subterms/song17.n3 b/show/dance2009/subterms/song17.n3 --- a/show/dance2009/subterms/song17.n3 +++ b/show/dance2009/subterms/song17.n3 @@ -1,35 +1,35 @@ + . + . + . + . + . + . + . + "bow(t)". + "bow". + . + . + "chase1(t) * chase(t, names=cycline, ontime=.2, offset=0) + chase1(t) * chase(t, names=back, ontime=.3, offset=0)". + "". + . + . + "bpurpleall(t)". + "bpurpleall". + . + . "patios(t)". "patios". + . . - . - "cast1(t)+song17(t)". - "song17". - . - . "cast3(t)". "song17c3". + . . - . - "chase1(t) * chase(t, names=cycline, ontime=.2, offset=0) + chase1(t) * chase(t, names=back, ontime=.3, offset=0)". - "". - . - . "cast2(t)". "song17c2". + . . - . - . - . - . - . - . - . - . - "bow(t)". - "bow". - . - . - "bpurpleall(t)". - "bpurpleall". - . - . + "cast1(t)+song17(t)". + "song17". + . + .