diff --git a/show/dance2009/curves/song10-bow b/show/dance2009/curves/song10-bow --- a/show/dance2009/curves/song10-bow +++ b/show/dance2009/curves/song10-bow @@ -2,4 +2,5 @@ 274.209011768 0.0 278.839009801 0.813008130081 287.69639734 0.837398373984 +289.676166819 0 291.923786848 0.0 diff --git a/show/dance2009/curves/song10-cyc1 b/show/dance2009/curves/song10-cyc1 --- a/show/dance2009/curves/song10-cyc1 +++ b/show/dance2009/curves/song10-cyc1 @@ -12,7 +12,8 @@ 142.65004697 0.244094488189 142.698860459 0.798042524097 146.400581167 0.66727761971 148.053548798 0.0 -270.95242736 0 -271.852976662 1 +270.95242736 0.0 +271.852976662 1.0 286.90075432 0.480037054192 +289.636268239 0 291.923786848 0.0 diff --git a/show/dance2009/curves/song10-cyc2 b/show/dance2009/curves/song10-cyc2 --- a/show/dance2009/curves/song10-cyc2 +++ b/show/dance2009/curves/song10-cyc2 @@ -16,9 +16,10 @@ 141.141194969 0.299212598425 141.143298755 0.83252456815 146.534823159 0.558536287616 147.903861033 0.00787401574803 -266.08053398 0 +266.08053398 0.0 267.140314097 0.559523809524 269.009234082 0.595238095238 269.958641621 0.940476190476 287.014563441 0.509613623878 +289.583070131 0 291.923786848 0.0 diff --git a/show/dance2009/curves/song10-cyc3 b/show/dance2009/curves/song10-cyc3 --- a/show/dance2009/curves/song10-cyc3 +++ b/show/dance2009/curves/song10-cyc3 @@ -6,12 +6,13 @@ 2.39650988239 1.0 7.88165605843 0.984251968504 8.53465215521 0.984251968504 13.5223369208 0.0 -137.701143923 0 -139.623357434 1 -140.771493005 1 +137.701143923 0.0 +139.623357434 1.0 +140.771493005 1.0 146.679043735 0.669840688519 148.139061124 0.0 -271.018227883 0 -271.870316911 1 +271.018227883 0.0 +271.870316911 1.0 287.033946321 0.416956601355 +289.436775337 0 291.923786848 0.0 diff --git a/show/dance2009/curves/song10-sides b/show/dance2009/curves/song10-sides --- a/show/dance2009/curves/song10-sides +++ b/show/dance2009/curves/song10-sides @@ -1,3 +1,4 @@ -4.0 0.0 139.133851785 0.00595238095238 +289.383577229 0 291.923786848 0.0 diff --git a/show/dance2009/curves/song10-song10 b/show/dance2009/curves/song10-song10 --- a/show/dance2009/curves/song10-song10 +++ b/show/dance2009/curves/song10-song10 @@ -2,4 +2,5 @@ -0.847167626507 0.0 1.4268249658 1.0 287.032751671 1.0 +289.303780069 0 291.923786848 0.0 diff --git a/show/dance2009/curves/song11-boost b/show/dance2009/curves/song11-boost --- a/show/dance2009/curves/song11-boost +++ b/show/dance2009/curves/song11-boost @@ -1,24 +1,39 @@ --4 0 +-4.0 0.0 30.072138885 0.0 -52.4704275431 0 -52.5528199353 1 -53.0791223585 1 -53.8072020687 0 -87.5899457074 0 +44.5576131865 0 +44.5636651297 0.954545454545 +44.6302365045 1 +45.1143919577 0.290909090909 +45.126495844 0 +47.3172992697 0.0181818181818 +47.3172992697 1 +47.4322861898 1 +47.8014547229 0.245454545455 +47.8014547229 0 +49.0421028557 0 +49.0511807705 1 +49.3053623834 1 +49.6140114848 0 +49.9408164157 0 +52.4704275431 0.0 +52.5528199353 1.0 +53.0791223585 1.0 +53.8072020687 0.0 +87.5899457074 0.0 87.697130765 0.251324266285 -87.746099575 0.621403006442 -87.8935735736 0.487544738726 -88.1330582643 0 -89.0569200624 0 -90.2701906035 0 -90.3527254719 0.643951324266 -90.8973043307 0.449892627058 -91.2109415491 0 -92.9766072075 0 +87.7279437455 0.922478275259 +87.9026514883 0.724103878511 +88.1330582643 0.0 +89.0569200624 0.0 +90.2701906035 0.0 +90.3254917277 0.859005087707 +90.888226416 0.557419508778 +91.2109415491 0.0 +92.9766072075 0.0 93.0161683927 0.454903364352 93.1518379776 0.866857551897 93.998059258 0.0302075876879 -95.8111828302 0 +95.8111828302 0.0 95.8962672099 0.303435934145 96.2405889775 0.716535433071 96.3329820945 0.937007874016 @@ -28,8 +43,9 @@ 97.2820379422 0.0866141732283 97.3886219995 0.0629921259843 97.4958688933 0.0314960629921 97.6018680105 0.0157480314961 -127.781999399 0 +127.781999399 0.0 128.062659688 0.668790264853 128.489983826 0.827344309234 141.719630952 0.803149606299 -146.692380952 0 +144.321047031 0.0 +146.692380952 0.0 diff --git a/show/dance2009/curves/song11-bow b/show/dance2009/curves/song11-bow --- a/show/dance2009/curves/song11-bow +++ b/show/dance2009/curves/song11-bow @@ -2,4 +2,5 @@ 129.086210809 0.0 131.700703498 0.459627329193 141.738609801 0.465838509317 +144.19995764 0.0 146.692380952 0.0 diff --git a/show/dance2009/curves/song11-exp b/show/dance2009/curves/song11-exp --- a/show/dance2009/curves/song11-exp +++ b/show/dance2009/curves/song11-exp @@ -1,7 +1,7 @@ -4.51421146086 0.510869565217 46.5681858212 0.5 46.8476878016 1.0 -54.2297408944 1 +54.2297408944 1.0 54.7046701878 0.259842519685 85.6085648544 0.271929824561 86.8405419702 0.5 diff --git a/show/dance2009/curves/song11-scoop b/show/dance2009/curves/song11-scoop new file mode 100644 --- /dev/null +++ b/show/dance2009/curves/song11-scoop @@ -0,0 +1,20 @@ +-4 0 +50.7921230876 0 +50.7961577163 1 +50.9414043523 0.978494623656 +50.9938545264 0 +51.1391011623 0 +51.1431357911 1 +51.3408326012 1 +51.3877784533 0 +51.5304601537 1 +51.5337898848 0.0 +51.7120184486 1 +51.7123209405 0.0 +51.7927110241 0 +51.9662000615 1 +51.9665459153 0.0 +52.0711004097 0 +52.2889703636 1 +52.290802063 0.0 +146.692380952 0 diff --git a/show/dance2009/curves/song11-song11 b/show/dance2009/curves/song11-song11 --- a/show/dance2009/curves/song11-song11 +++ b/show/dance2009/curves/song11-song11 @@ -4,4 +4,5 @@ 0.347799192897 0.478260869565 11.249082163 0.554347826087 14.848562389 1.0 141.447424052 1.0 +144.068777465 0.0 146.692380952 0.0 diff --git a/show/dance2009/curves/song12-blacklight b/show/dance2009/curves/song12-blacklight --- a/show/dance2009/curves/song12-blacklight +++ b/show/dance2009/curves/song12-blacklight @@ -2,6 +2,6 @@ 1.40626942266 0.0 2.31922189356 0.992592592593 60.2767032171 1.0 -126.990205263 1.0 -129.233690975 0 +126.832501561 1 +126.838301985 0 131.746666667 0.0 diff --git a/show/dance2009/curves/song12-bow b/show/dance2009/curves/song12-bow --- a/show/dance2009/curves/song12-bow +++ b/show/dance2009/curves/song12-bow @@ -2,5 +2,5 @@ 115.170280081 0.0 119.703799179 0.847457627119 126.740348023 0.847457627119 -129.151379486 0 +129.151379486 0.0 131.746666667 0.0 diff --git a/show/dance2009/curves/song12-song12 b/show/dance2009/curves/song12-song12 --- a/show/dance2009/curves/song12-song12 +++ b/show/dance2009/curves/song12-song12 @@ -4,9 +4,9 @@ 9.07078952235 1.0 74.6305034078 0.985815602837 78.7671888794 1.0 85.322887143 1.0 -85.6954737844 0.093257118662 -97.0310774175 0.100719805229 +86.2728699843 0.902780928186 +97.6084736174 0.910243614753 100.460686869 0.850746268657 126.925767232 0.865671641791 -129.194454792 0 +129.194454792 0.0 131.746666667 0.0 diff --git a/show/dance2009/curves/song13-bow b/show/dance2009/curves/song13-bow --- a/show/dance2009/curves/song13-bow +++ b/show/dance2009/curves/song13-bow @@ -4,4 +4,5 @@ 247.238212457 0.647887323944 248.347497932 0.595590936926 249.707662004 0.591549295775 263.989816777 0.605633802817 +266.089409171 0 268.64 0.0 diff --git a/show/dance2009/curves/song13-front b/show/dance2009/curves/song13-front --- a/show/dance2009/curves/song13-front +++ b/show/dance2009/curves/song13-front @@ -11,4 +11,5 @@ 244.367451216 0.319044703001 245.842201926 0.225352112676 247.573108429 0.112676056338 263.754789926 0.575933864054 +266.03298017 0 268.64 0.0 diff --git a/show/dance2009/curves/song13-song13 b/show/dance2009/curves/song13-song13 --- a/show/dance2009/curves/song13-song13 +++ b/show/dance2009/curves/song13-song13 @@ -14,4 +14,5 @@ 157.464999941 0.0 166.048189831 1.0 207.764043021 1.0 263.797452195 1.0 +265.99912277 0 268.64 0.0 diff --git a/show/dance2009/curves/song14-bneutral b/show/dance2009/curves/song14-bneutral --- a/show/dance2009/curves/song14-bneutral +++ b/show/dance2009/curves/song14-bneutral @@ -10,4 +10,5 @@ 315.978638925 0.0 324.2524555 0.162162162162 409.054168215 0.189189189189 451.495834196 1.0 +453.818397612 0 456.295782313 0.0 diff --git a/show/dance2009/curves/song14-bow b/show/dance2009/curves/song14-bow --- a/show/dance2009/curves/song14-bow +++ b/show/dance2009/curves/song14-bow @@ -2,4 +2,5 @@ 438.50435497 0.0 440.476311202 1.0 451.343981107 1.0 +453.789757326 0 456.295782313 0.0 diff --git a/show/dance2009/curves/song14-col1 b/show/dance2009/curves/song14-col1 --- a/show/dance2009/curves/song14-col1 +++ b/show/dance2009/curves/song14-col1 @@ -1,6 +1,7 @@ --4 0 +-4.0 0.0 319.151945022 0.032967032967 -323.303480807 1 -435.394946985 1 +323.303480807 1.0 +435.394946985 1.0 450.712682465 0.571428571429 -456.295782313 0 +453.746796898 0 +456.295782313 0.0 diff --git a/show/dance2009/curves/song14-front b/show/dance2009/curves/song14-front --- a/show/dance2009/curves/song14-front +++ b/show/dance2009/curves/song14-front @@ -13,4 +13,5 @@ 390.038052897 0.634146341463 402.60927388 0.658536585366 409.856213035 0.80487804878 451.710984072 0.817073170732 +453.632235755 0 456.295782313 0.0 diff --git a/show/dance2009/curves/song14-intro b/show/dance2009/curves/song14-intro --- a/show/dance2009/curves/song14-intro +++ b/show/dance2009/curves/song14-intro @@ -3,7 +3,7 @@ 0.583039976769 1.0 34.6797384794 1.0 57.9732932373 0.0 -203.958900532 0 +203.958900532 0.0 220.562153083 1.0 305.88482067 0.987804878049 311.356999216 0.512195121951 @@ -11,4 +11,5 @@ 317.864454783 0.512195121951 320.819168631 1.0 333.541506832 0.548780487805 451.119397202 0.59756097561 +453.574955184 0 456.295782313 0.0 diff --git a/show/dance2009/curves/song15-america b/show/dance2009/curves/song15-america --- a/show/dance2009/curves/song15-america +++ b/show/dance2009/curves/song15-america @@ -4,4 +4,5 @@ 252.555637653 0.38202247191 267.159142165 0.393258426966 307.805285349 0.38202247191 371.199332807 0.38202247191 +373.546077095 0 376.756507937 0.0 diff --git a/show/dance2009/curves/song15-bow b/show/dance2009/curves/song15-bow --- a/show/dance2009/curves/song15-bow +++ b/show/dance2009/curves/song15-bow @@ -2,4 +2,5 @@ 360.529889769 0.0 362.042716239 0.661971830986 371.720660919 0.676056338028 +373.620738278 0 376.756507937 0.0 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,5 +1,5 @@ -4.0 0.0 -0.0658790260955 0 +0.0658790260955 0.0 1.69403520488 0.472391084093 6.78101062785 0.565476190476 10.4140480794 1.0 @@ -12,4 +12,5 @@ 254.173429917 0.788888888889 263.780211404 0.8 264.489917232 0.344444444444 371.601176524 0.333333333333 +373.147884123 0 376.756507937 0.0 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 @@ -12,8 +12,8 @@ 288.063764323 0.0 314.879988448 0.0 356.456318136 0.0588235294118 365.705875373 0.921568627451 -423.557585682 1 -425.073080139 0 +423.557585682 1.0 +425.073080139 0.0 430.861177304 0.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 @@ -9,7 +9,7 @@ 103.964953904 0.960784313725 103.983997009 0.0 122.608153389 0.0 122.632829551 0.947368421053 -127.156360205 0 +127.156360205 0.0 148.36083869 0.0 161.472134554 0.0 161.550537796 1.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 @@ -27,4 +27,6 @@ 433.517290819 0.210526315789 434.419821288 0.131578947368 434.613220675 1.0 435.23102427 0.184210526316 +447.199769921 0.0909090909091 +449.388699582 0.0 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,11 +1,12 @@ -4.0 0.0 65.4747145237 0.0232558139535 -67.0623801825 0 -308.506724696 0 +67.0623801825 0.0 +308.506724696 0.0 342.610002146 0.0555555555556 366.145436525 0.0236220472441 424.139942871 0.166666666667 436.831581641 0.0 442.698562499 0.41403508772 447.181632315 0.466666666667 +449.589723734 0.0 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 @@ -10,11 +10,11 @@ 94.2833033547 0.0 118.005216756 0.0 118.025983719 1.0 118.489496573 1.0 -126.698421363 1 -126.895833387 0 -132.818194107 0 +126.698421363 1.0 +126.895833387 0.0 +132.818194107 0.0 142.565412792 0.288888888889 -144.959033583 1 +144.959033583 1.0 164.60826425 1.0 167.430780977 0.0 350.637107584 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 @@ -12,4 +12,5 @@ 434.762299368 1.0 434.895261446 0.672131147541 436.152357457 0.688524590164 447.44278976 0.688524590164 +449.411035599 0.0 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 @@ -10,8 +10,9 @@ 160.559721606 1.0 165.133921056 0.0 177.218894512 0.0 290.008125236 0.0 -333.618736897 0 +333.618736897 0.0 +337.041836784 0.838709677419 359.232775778 0.850785704353 428.026836705 0.796690307329 -438.066548105 0 +438.066548105 0.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 @@ -39,11 +39,13 @@ 291.139400857 1.0 292.638845829 0.0 294.520523647 1.0 295.853378768 0.0 -297.567186448 1 -299.563869282 0 -301.59970276 1 -304.066193319 0 -306.180328085 1 +297.567186448 1.0 +299.563869282 0.0 +301.59970276 1.0 +304.066193319 0.0 +306.180328085 1.0 352.686132715 0.973684210526 438.70499549 1.0 +447.199769921 0.545454545455 +449.299355514 0.0 452.247709751 0.0 diff --git a/show/dance2009/curves/song16-slcross b/show/dance2009/curves/song16-slcross --- a/show/dance2009/curves/song16-slcross +++ b/show/dance2009/curves/song16-slcross @@ -30,7 +30,7 @@ 60.0587918247 0.0229766361172 60.7456486672 0.016393442623 61.019263728 0.684393958952 61.755014691 0.983606557377 -62.7528578818 0 +62.7528578818 0.0 163.061025264 0.0 168.315267556 0.352941176471 288.960830801 0.294117647059 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,11 +1,11 @@ -4.0 0.0 -126.76781213 0 -126.87747889 1 +126.76781213 0.0 +126.87747889 1.0 153.682539777 0.973684210526 154.179231878 0.0 180.253475902 0.0 -288.170046521 0 +288.170046521 0.0 291.754011932 0.939393939394 -337.303526422 1 -337.743330519 0 +337.303526422 1.0 +337.743330519 0.0 452.247709751 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,7 @@ -4.0 0.0 -161.639728814 0.0 -168.699640053 1.0 +145.033537832 0 +159.656906728 0.406779661017 +206.831492843 0.406779661017 232.378531073 1.0 234.861875706 0.0 237.4 0.0 diff --git a/show/dance2009/curves/song17-song17 b/show/dance2009/curves/song17-song17 --- a/show/dance2009/curves/song17-song17 +++ b/show/dance2009/curves/song17-song17 @@ -5,4 +5,5 @@ 121.212338983 0.0 126.712220799 0.435483870968 207.416527329 0.451612903226 232.469830508 1.0 +234.799351419 0.0 237.4 0.0 diff --git a/show/dance2009/curves/song3-bow b/show/dance2009/curves/song3-bow --- a/show/dance2009/curves/song3-bow +++ b/show/dance2009/curves/song3-bow @@ -2,4 +2,5 @@ 139.465950284 0.0 143.569312585 0.582417582418 152.064520585 0.582417582418 +153.886410745 0 156.944195011 0.0 diff --git a/show/dance2009/curves/song3-chg b/show/dance2009/curves/song3-chg --- a/show/dance2009/curves/song3-chg +++ b/show/dance2009/curves/song3-chg @@ -1,6 +1,7 @@ -4.0 0.0 -76.8687376815 0 -83.6514851335 1 +76.8687376815 0.0 +83.6514851335 1.0 121.590953795 1.0 151.759540934 1.0 +153.994332543 0 156.944195011 0.0 diff --git a/show/dance2009/curves/song3-song3 b/show/dance2009/curves/song3-song3 --- a/show/dance2009/curves/song3-song3 +++ b/show/dance2009/curves/song3-song3 @@ -1,6 +1,7 @@ -4.0 0.0 --1.04746371498 0 +-1.04746371498 0.0 9.16325502133 1.0 128.507892294 1.0 151.89373198 1.0 +154.120241306 0 156.944195011 0.0 diff --git a/show/dance2009/curves/song4-add1 b/show/dance2009/curves/song4-add1 --- a/show/dance2009/curves/song4-add1 +++ b/show/dance2009/curves/song4-add1 @@ -4,4 +4,5 @@ 13.4290612541 0.542372881356 78.1725242938 0.533898305085 119.907132203 0.533898305085 135.532885876 0.532608695652 +137.818212069 0 140.873333333 0.0 diff --git a/show/dance2009/curves/song4-bow b/show/dance2009/curves/song4-bow --- a/show/dance2009/curves/song4-bow +++ b/show/dance2009/curves/song4-bow @@ -2,4 +2,5 @@ 122.478458757 0.0 126.038757062 0.790167865707 135.829577401 0.790167865707 +137.918379979 0 140.873333333 0.0 diff --git a/show/dance2009/curves/song4-song4 b/show/dance2009/curves/song4-song4 --- a/show/dance2009/curves/song4-song4 +++ b/show/dance2009/curves/song4-song4 @@ -2,4 +2,5 @@ -0.945215819209 0.0 0.53824180791 1.0 136.126268927 1.0 +137.889760576 0 140.873333333 0.0 diff --git a/show/dance2009/curves/song5-bow b/show/dance2009/curves/song5-bow --- a/show/dance2009/curves/song5-bow +++ b/show/dance2009/curves/song5-bow @@ -2,4 +2,5 @@ 235.416490008 0.0 238.428644347 0.836956521739 246.240188432 0.826086956522 +248.2576969 0 251.08553288 0.0 diff --git a/show/dance2009/curves/song5-part2 b/show/dance2009/curves/song5-part2 --- a/show/dance2009/curves/song5-part2 +++ b/show/dance2009/curves/song5-part2 @@ -1,5 +1,6 @@ -4.0 0.0 -110.481946992 0 -112.194542436 1 +110.481946992 0.0 +112.194542436 1.0 246.397865498 1.0 +248.280410442 0 251.08553288 0.0 diff --git a/show/dance2009/curves/song5-song5 b/show/dance2009/curves/song5-song5 --- a/show/dance2009/curves/song5-song5 +++ b/show/dance2009/curves/song5-song5 @@ -1,10 +1,11 @@ -4.0 0.0 -1.35403648103 0.0 -6.97530757229 1 +6.97530757229 1.0 89.7950514931 1.0 95.1771881164 0.577235772358 108.198486398 0.577235772358 114.101474953 0.577235772358 117.226586541 0.715447154472 246.224248188 0.715447154472 +248.291767213 0 251.08553288 0.0 diff --git a/show/dance2009/curves/song6-bow b/show/dance2009/curves/song6-bow --- a/show/dance2009/curves/song6-bow +++ b/show/dance2009/curves/song6-bow @@ -1,7 +1,8 @@ -4.0 0.0 -211.965919096 0 +211.965919096 0.0 213.87122904 0.412668665667 217.729562706 0.422413793103 222.153006365 0.620689655172 226.907007802 0.621814092954 +229.692559011 0 232.214172336 0.0 diff --git a/show/dance2009/curves/song6-song6 b/show/dance2009/curves/song6-song6 --- a/show/dance2009/curves/song6-song6 +++ b/show/dance2009/curves/song6-song6 @@ -13,4 +13,5 @@ 211.106940381 0.293103448276 215.466412483 0.301724137931 218.966968846 0.362068965517 227.550300473 1.0 +229.252617962 0 232.214172336 0.0 diff --git a/show/dance2009/curves/song7-bow b/show/dance2009/curves/song7-bow --- a/show/dance2009/curves/song7-bow +++ b/show/dance2009/curves/song7-bow @@ -7,4 +7,5 @@ 74.2115937499 0.0 322.010073556 0.0 328.987453481 0.591549295775 334.848512275 0.605633802817 +337.290151256 0 339.76521542 0.0 diff --git a/show/dance2009/curves/song7-song7 b/show/dance2009/curves/song7-song7 --- a/show/dance2009/curves/song7-song7 +++ b/show/dance2009/curves/song7-song7 @@ -15,4 +15,5 @@ 252.598059832 0.15994005994 256.685551768 0.928571428571 315.86085544 0.935531135531 335.557911096 1.0 +337.007907098 0 339.76521542 0.0 diff --git a/show/dance2009/curves/song8-bow b/show/dance2009/curves/song8-bow --- a/show/dance2009/curves/song8-bow +++ b/show/dance2009/curves/song8-bow @@ -2,4 +2,5 @@ 170.551771271 0.0 175.06912401 0.78813559322 183.532012687 0.779661016949 +185.958289415 0.0 188.449637188 0.0 diff --git a/show/dance2009/curves/song8-col1 b/show/dance2009/curves/song8-col1 --- a/show/dance2009/curves/song8-col1 +++ b/show/dance2009/curves/song8-col1 @@ -25,4 +25,6 @@ 8.49264298474 0.0157480314961 8.58233181792 0.629921259843 8.67580702423 1.0 9.31431482962 1.0 +183.348589476 1 +184.928353176 0.00909090909091 188.449637188 0.0 diff --git a/show/dance2009/curves/song8-col2 b/show/dance2009/curves/song8-col2 --- a/show/dance2009/curves/song8-col2 +++ b/show/dance2009/curves/song8-col2 @@ -23,14 +23,10 @@ 7.03574394226 0.992125984252 7.62346914532 0.0 7.93329297124 0.0393700787402 8.03109066931 0.521739130435 -8.05042987317 0.700787401575 -8.0772407587 0.55652173913 8.21569102686 0.869565217391 -8.26184111625 0.913043478261 8.49259156318 0.973913043478 -8.63104183134 0.904347826087 -8.66565439838 0.64347826087 8.71180448777 0.886956521739 9.1222918033 0.748031496063 -9.76324905348 0.322834645669 +10.0562879646 0 +183.345771018 0.0 188.449637188 0.0 diff --git a/show/dance2009/curves/song8-song8 b/show/dance2009/curves/song8-song8 --- a/show/dance2009/curves/song8-song8 +++ b/show/dance2009/curves/song8-song8 @@ -1,7 +1,8 @@ -4.0 0.0 -0.934278811638 0.0 -9.311791949 0.0 -9.64426032177 0.56829004329 -10.3815197328 1.0 +8.52456642969 0 +8.95994009911 0.604326079326 +9.21868988075 1 183.525433774 1.0 +185.882794028 0.0 188.449637188 0.0 diff --git a/show/dance2009/curves/song9-bow b/show/dance2009/curves/song9-bow --- a/show/dance2009/curves/song9-bow +++ b/show/dance2009/curves/song9-bow @@ -1,5 +1,6 @@ -4.0 0.0 -239.051904584 0 +239.051904584 0.0 246.434401117 0.717391304348 254.37757816 0.728260869565 +256.793527801 0.0 259.274875283 0.0 diff --git a/show/dance2009/curves/song9-song9 b/show/dance2009/curves/song9-song9 --- a/show/dance2009/curves/song9-song9 +++ b/show/dance2009/curves/song9-song9 @@ -1,6 +1,6 @@ -4.0 0.0 -0.921438302022 0 -8.33286266939 1 -166.811069836 1 -170.459936657 0 +0.921438302022 0.0 +8.33286266939 1.0 +166.811069836 1.0 +170.459936657 0.0 259.274875283 0.0 diff --git a/show/dance2009/curves/song9-song9b b/show/dance2009/curves/song9-song9b --- a/show/dance2009/curves/song9-song9b +++ b/show/dance2009/curves/song9-song9b @@ -1,5 +1,6 @@ -4.0 0.0 -161.780174275 0 -169.955607956 1 -254.040467595 1.0 +161.780174275 0.0 +169.955607956 1.0 +254.334358908 1 +256.108379615 0.00740740740741 259.274875283 0.0 diff --git a/show/dance2009/subs/curtain b/show/dance2009/subs/curtain new file mode 100644 --- /dev/null +++ b/show/dance2009/subs/curtain @@ -0,0 +1,52 @@ +_:sCfvkKgT155 . +_:sCfvkKgT155 "0.605"^^. +_:sCfvkKgT157 . +_:sCfvkKgT157 "0.87"^^. +_:sCfvkKgT168 . +_:sCfvkKgT168 "0.865"^^. +_:sCfvkKgT158 . +_:sCfvkKgT158 "0.595"^^. +_:sCfvkKgT162 . +_:sCfvkKgT162 "0.74"^^. + _:sCfvkKgT155. + _:sCfvkKgT157. + _:sCfvkKgT168. + _:sCfvkKgT158. + _:sCfvkKgT162. + _:sCfvkKgT160. + _:sCfvkKgT165. + _:sCfvkKgT166. + _:sCfvkKgT153. + _:sCfvkKgT154. + _:sCfvkKgT156. + _:sCfvkKgT167. + _:sCfvkKgT164. + _:sCfvkKgT163. + _:sCfvkKgT161. + _:sCfvkKgT159. + _:sCfvkKgT169. + "curtain". +_:sCfvkKgT165 . +_:sCfvkKgT165 "0.5"^^. +_:sCfvkKgT166 . +_:sCfvkKgT166 "1"^^. +_:sCfvkKgT153 . +_:sCfvkKgT153 "1"^^. +_:sCfvkKgT154 . +_:sCfvkKgT154 "0.455"^^. +_:sCfvkKgT156 . +_:sCfvkKgT156 "0.36"^^. +_:sCfvkKgT167 . +_:sCfvkKgT167 "1"^^. +_:sCfvkKgT164 . +_:sCfvkKgT164 "1"^^. +_:sCfvkKgT163 . +_:sCfvkKgT163 "1"^^. +_:sCfvkKgT161 . +_:sCfvkKgT161 "1"^^. +_:sCfvkKgT160 . +_:sCfvkKgT160 "0.415"^^. +_:sCfvkKgT159 . +_:sCfvkKgT159 "0.75"^^. +_:sCfvkKgT169 . +_:sCfvkKgT169 "0.475"^^. diff --git a/show/dance2009/subterms/song10.n3 b/show/dance2009/subterms/song10.n3 --- a/show/dance2009/subterms/song10.n3 +++ b/show/dance2009/subterms/song10.n3 @@ -1,30 +1,30 @@ + . + "bow(t)". + . + "bow". + . + "cyc1(t)". + . + "cyc1". + . + "song10(t)". + . + "". . "cyc2(t)". + . "cyc2". - . - . - . . . + . + . . - . + . + . + "cyc3(t)". + . + "cyc3". . "song10(t)". + . "song10". - . - . - "cyc3(t)". - "cyc3". - . - . - "cyc1(t)". - "cyc1". - . - . - "bow(t)". - "bow". - . - . - "song10(t)". - "". - . diff --git a/show/dance2009/subterms/song11.n3 b/show/dance2009/subterms/song11.n3 --- a/show/dance2009/subterms/song11.n3 +++ b/show/dance2009/subterms/song11.n3 @@ -1,25 +1,30 @@ . - "boost(t)". "cyc". . + "boost(t)". + . + "". + . + "song11(t)". + . + "bow". + . + "bow(t)". . - "smooth_music(t+.05)**(exp(t)*2) + boost(t)". "bredall". . - . - "song11(t)". - "song11". - . + "smooth_music(t+.05)**(exp(t)*2) + boost(t)". + . + "scoop". + . + "scoop(t)". . . . . + . . - . - "song11(t)". - "". - . - . - "bow(t)". - "bow". - . + . + "song11". + . + "song11(t)". diff --git a/show/dance2009/subterms/song12.n3 b/show/dance2009/subterms/song12.n3 --- a/show/dance2009/subterms/song12.n3 +++ b/show/dance2009/subterms/song12.n3 @@ -1,25 +1,25 @@ + . + . + . . - . . - . - . + "bow(t)+song12(t)*.4". + "narrowfront". + . + . + "song12(t)". + "". . - "". . - "song12(t)". - . - "song12". - . "song12(t)". - . - "narrowfront". - . - "bow(t)+song12(t)*.4". - . + "song12". + . + . + "blacklight(t)>0". + "blacklight". + . + . + "bow(t)*.5". "bow". + . . - "bow(t)*.5". - . - "blacklight". - . - "blacklight(t)>0". diff --git a/show/dance2009/subterms/song13.n3 b/show/dance2009/subterms/song13.n3 --- a/show/dance2009/subterms/song13.n3 +++ b/show/dance2009/subterms/song13.n3 @@ -1,25 +1,25 @@ - "blacklight(t)". - . - . - "bpurpleall". - "song13(t)". + . + . + . + . + . . . "song13". - "bow(t)". + "song13(t)". + . + . + "front". + "front(t)". + . + . + "". + "song13(t)". . . "bow". - . - . - . - . - . - "front(t)". - . - . - "front". - "song13(t)". - . - . - "". + "bow(t)". + . + . + "bpurpleall". + "blacklight(t)". diff --git a/show/dance2009/subterms/song14.n3 b/show/dance2009/subterms/song14.n3 --- a/show/dance2009/subterms/song14.n3 +++ b/show/dance2009/subterms/song14.n3 @@ -1,50 +1,50 @@ - . - "orange". - . - "col1(t)". - . - "". - . - "song14(t)". + . . + "bneutral(t)". "bredall". - . - "bneutral(t)". - . - "scoop". - . - "intro(t)*.8". + . + . + "bneutral(t)". + "bneutral". + . + . + . . . - . - . + . + . . - . - . . . - . + . . - "bblueall". - . "bneutral(t)". - . - "bneutral". - . - "bneutral(t)". + "bblueall". + . + . + "col1(t)". + "orange". + . + . + "song14(t)". + "". + . + . + "bow(t)". + "bow". + . . - "up". - . "intro(t)". - . - "front". + "up". + . + . + "intro(t)*.8". + "scoop". . + . "front(t)". + "front". + . . + "col1(t)". "red". - . - "col1(t)". - . - "bow". - . - "bow(t)". 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,35 +1,35 @@ - . - . - . - . - . + "song15". + "song15(t)". + . + . + "". + "song15(t)". + . + . + "front". + "america(t)". + . + . + "scoop". + "scoop(t)". + . + . + . . - . - "cyc". - "cyc(t)". - . - . + . + . + . + . + . "cs1". "chase(t, names=back, ontime=.2, offset=.05)*within(264,361)". . . - "scoop". - "scoop(t)". - . - . - "front". - "america(t)". - . - . "bow". "bow(t)". . . - "". - "song15(t)". - . - . - "song15". - "song15(t)". - . - . + "cyc". + "cyc(t)". + . + . 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,70 +1,70 @@ - "blue(t)". - . - . - "edges". - "srcross(t)". - . - . - "srcross". - "red(t)". - . - . - "red". - "blue(t)*.4*within(164,293)". - . - . - "edge". - "bpurpleall(t)". - . + . + "slcross". + . + "slcross(t)". + . + "blue". + . + "blue(t)". + . + "cyc". + . + "beats1(t) * (smooth_music(t+0.1) > 0.5) + beats2(t)". + . + "". + . + "blue(t)". + . + "bow". + . + "bow(t)". . "bpurpleall". - "bow(t)". - . - . - "bow". - "strobe(t)>0". - . - . - "strobe". - "chase(t, names=back, ontime=0.2) * backchase(t)". - . + . + "bpurpleall(t)". . "cs2". - "blue(t)". - . - . - "blue". - "centercircle(t)". - . - . - "centercircle". - "chase1(t) * chase(t + 0.02, names=colors, ontime=0.3)". - . - . - "cs1". - "green(t)". - . + . + "chase(t, names=back, ontime=0.2) * backchase(t)". + . + "edge". + . + "blue(t)*.4*within(164,293)". + . + "srcross". + . + "srcross(t)". + . + "red". + . + "red(t)". . "green". - "slcross(t)". - . - . - "slcross". - "beats1(t) * (smooth_music(t+0.1) > 0.5) + beats2(t)". - . - . - "cyc". - . + . + "green(t)". + . + "strobe". + . + "strobe(t)>0". + . + . + . + . + . + . + . + . . . - . - . - . + . . - . - . + . . - . - . - . - . + . + "cs1". + . + "chase1(t) * chase(t + 0.02, names=colors, ontime=0.3)". + . + "centercircle". + . + "centercircle(t)". 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,54 +1,35 @@ -#Processed by Id: cwm.py,v 1.197 2007/12/13 15:38:39 syosi Exp - # using base file:///home/drewp/projects/light9/show/dance2009/subterms/ - -# Notation3 generation by -# notation3.py,v 1.200 2007/12/11 21:18:08 syosi Exp - -# Base was: file:///home/drewp/projects/light9/show/dance2009/subterms/ - @prefix : . - - - , - , - , - , - , - , - . - - a ; - "chase1(t) * chase(t, names=cycline, ontime=.2, offset=0) + chase1(t) * chase(t, names=back, ontime=.3, offset=0)"; - ; - :label "cs1" . - - a ; - "bow(t)"; - ; - :label "bow" . - - a ; - "bpurpleall(t)"; - ; - :label "bpurpleall" . - - a ; - "patios(t)"; - ; - :label "patios" . - - a ; - "cast1(t)+song17(t)"; - ; - :label "song17" . - - a ; - "cast2(t)"; - ; - :label "song17c2" . - - a ; - "cast3(t)"; - ; - :label "song17c3" . - -#ENDS + . + . + . + . + . + . + . + . + "bow(t)". + . + "bow". + . + "cast1(t)+song17(t)". + . + "song17". + . + "cast2(t)". + . + "song17c2". + . + "cast3(t)". + . + "song17c3". + . + "chase1(t) * chase(t, names=cycline, ontime=.2, offset=0) + chase1(t) * chase(t, names=back, ontime=.3, offset=0)". + . + "cs1". + . + "bpurpleall(t)". + . + "bpurpleall". + . + "patios(t)". + . + "patios". diff --git a/show/dance2009/subterms/song3.n3 b/show/dance2009/subterms/song3.n3 --- a/show/dance2009/subterms/song3.n3 +++ b/show/dance2009/subterms/song3.n3 @@ -1,25 +1,25 @@ - . - . - "bow". - "bow(t)". - . - . - "cyc". - "chg(t)*.42". + . . - . "song3". "song3(t)". + . + . + "scoop". + "chg(t)*.7". + . + . + . + . + . + . + . + "bow". + "bow(t)". + . . - . "". "song3(t)". - . - . - "scoop". - "chg(t)*.7". - . - . - . - . - . + . + . + "cyc". + "chg(t)*.42". diff --git a/show/dance2009/subterms/song4.n3 b/show/dance2009/subterms/song4.n3 --- a/show/dance2009/subterms/song4.n3 +++ b/show/dance2009/subterms/song4.n3 @@ -1,20 +1,20 @@ - "bow". - . - . - "bow(t)". + . + . + . + . + "song4(t)". + "". + . + . + "add1(t)". "front". . . - "add1(t)". - "". - . - . - "song4(t)". + "song4(t)". "song4". . . - "song4(t)". - . - . - . - . + "bow(t)". + "bow". + . + . diff --git a/show/dance2009/subterms/song5.n3 b/show/dance2009/subterms/song5.n3 --- a/show/dance2009/subterms/song5.n3 +++ b/show/dance2009/subterms/song5.n3 @@ -1,20 +1,20 @@ + . + "song5(t)". + "song5". + . + . "part2(t)". - . "bblueall". . + . + "bow(t)". + "bow". + . + . "song5(t)". - . "". . - "song5(t)". - . - "song5". - . - . - . . . - "bow(t)". - . - "bow". - . + . + . diff --git a/show/dance2009/subterms/song6.n3 b/show/dance2009/subterms/song6.n3 --- a/show/dance2009/subterms/song6.n3 +++ b/show/dance2009/subterms/song6.n3 @@ -1,25 +1,25 @@ + "bow". + "bow(t)". . . - "bow(t)". - "bow". + "song6". + "song6(t)". . . - "song6(t)". - "song6". + "strobe". + "strobe(t)". . . - "strobe(t)". - "strobe". + "centercircle". + "centercircle(t)". . . - "centercircle(t)". - "centercircle". . . - . . . + . + "". + "song6(t)". . . - "song6(t)". - "". diff --git a/show/dance2009/subterms/song7.n3 b/show/dance2009/subterms/song7.n3 --- a/show/dance2009/subterms/song7.n3 +++ b/show/dance2009/subterms/song7.n3 @@ -1,31 +1,30 @@ - . - . - . - . - . - . - . + . + "". + "(t)". + . + . "cyc". "cyc(t)". - . - . + . + . + "bow". + "bow(t)". + . + . "orange". "kicks(t)". - . - . + . + . + . + . + . + . + . + . "song7". "song7(t)". - . - . + . + . "up". "run(t)". - . - . - "bow". - "bow(t)". - . - . - "". - "song7(t)". - "(t)". - . + . diff --git a/show/dance2009/subterms/song8.n3 b/show/dance2009/subterms/song8.n3 --- a/show/dance2009/subterms/song8.n3 +++ b/show/dance2009/subterms/song8.n3 @@ -1,30 +1,30 @@ - "col1(t)". - "orange". - . - . + "". "song8(t)". - "". + . . - . + "blue". + "col2(t)". + . + . + "bow". + "bow(t)". + . + . + "orange". + "col1(t)". + . + . + "green". "col2(t)". - "green". + . . - . + "song8". + "song8(t)". + . + . + . + . + . . - . . - . . - . - "col2(t)". - "blue". - . - . - "song8(t)". - "song8". - . - . - "bow(t)". - "bow". - . - . diff --git a/show/dance2009/subterms/song9.n3 b/show/dance2009/subterms/song9.n3 --- a/show/dance2009/subterms/song9.n3 +++ b/show/dance2009/subterms/song9.n3 @@ -1,20 +1,20 @@ - "". - "song9(t)". - . - . + . + . . - . - . . + "bow". + "bow(t)". + . + . "song9". "song9(t)". + . . - . - "bow". - "bow(t)". - . - . + "". + "song9(t)". + . + . "song9b". "song9b(t)". + . . - .