Mercurial > code > home > repos > light9

changeset 338:f1c629f14f30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
curve/subs/subterms checkpoint
author Drew Perttula <drewp@bigasterisk.com>
date Sat, 17 Jun 2006 17:41:53 +0000
parents 5dd79b80d53e
children bca1bf1d284b
files show/dance2006/curves/04-steppin-finish show/dance2006/curves/04-steppin-song show/dance2006/curves/07-chicago-blue show/dance2006/curves/07-chicago-cool show/dance2006/curves/07-chicago-cool2 show/dance2006/curves/07-chicago-cyc show/dance2006/curves/07-chicago-event show/dance2006/curves/07-chicago-finish show/dance2006/curves/07-chicago-hot show/dance2006/curves/07-chicago-red show/dance2006/curves/09-prettywoman-black show/dance2006/curves/09-prettywoman-blinks show/dance2006/curves/09-prettywoman-blue show/dance2006/curves/09-prettywoman-song show/dance2006/curves/12-mack-finish show/dance2006/curves/12-mack-start show/dance2006/curves/14-grease-events show/dance2006/curves/14-grease-finish show/dance2006/curves/14-grease-song show/dance2006/curves/15-gypsy-blue show/dance2006/curves/15-gypsy-finish show/dance2006/curves/15-gypsy-red show/dance2006/curves/15-gypsy-song show/dance2006/curves/16-mix-back show/dance2006/curves/16-mix-backchase show/dance2006/curves/16-mix-black show/dance2006/curves/16-mix-blue show/dance2006/curves/16-mix-can show/dance2006/curves/16-mix-ch1 show/dance2006/curves/16-mix-ch2 show/dance2006/curves/16-mix-events show/dance2006/curves/16-mix-finish show/dance2006/curves/16-mix-greem show/dance2006/curves/16-mix-hot show/dance2006/curves/16-mix-left show/dance2006/curves/16-mix-right show/dance2006/curves/16-mix-scoop show/dance2006/curves/16-mix-shar show/dance2006/curves/16-mix-strobedim show/dance2006/curves/16-mix-stroberate show/dance2006/curves/17-entertainment-1 show/dance2006/curves/17-entertainment-finish show/dance2006/curves/17-entertainment-song show/dance2006/curves/17-entertainment-stages show/dance2006/subs/song16-blue show/dance2006/subterms/07-chicago show/dance2006/subterms/09-prettywoman show/dance2006/subterms/15-gypsy show/dance2006/subterms/16-mix
diffstat 49 files changed, 345 insertions(+), 119 deletions(-) [+]
line wrap: on
line diff
--- a/show/dance2006/curves/04-steppin-finish	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/04-steppin-finish	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
 -4.0 0.0
-128.423860495 0
-130.486235492 1
-138.929561967 1
+128.423860495 0.0
+130.486235492 1.0
+139.630128021 1
 141.593718312 0.0
 143.855056689 0.0
--- a/show/dance2006/curves/04-steppin-song	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/04-steppin-song	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
 -4.0 0.0
 -1.36219478368 0.0
 2.37392949254 1.0
-139.037422754 0.991071428571
+139.737988808 1
 141.986994551 0.0
 143.855056689 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/07-chicago-blue	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,5 @@
+-4 0
+332.469656429 0
+332.61135122 1
+362.194632214 0
+379.76 0
--- a/show/dance2006/curves/07-chicago-cool	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/07-chicago-cool	Sat Jun 17 17:41:53 2006 +0000
@@ -1,8 +1,8 @@
--4 0
--0.66479696564 0
+-4.0 0.0
+-0.66479696564 0.0
 18.0608088983 0.0943921232877
-18.1835398368 1
+18.1835398368 1.0
 204.675296837 0.984375
-221.099607602 0
-347.6494894 0
-379.76 0
+221.099607602 0.0
+347.6494894 0.0
+379.76 0.0
--- a/show/dance2006/curves/07-chicago-cool2	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/07-chicago-cool2	Sat Jun 17 17:41:53 2006 +0000
@@ -1,10 +1,13 @@
--4 0
-17.9760142209 0
-25.2182905828 1
-205.795241633 1
+-4.0 0.0
+17.9760142209 0.0
+25.2182905828 1.0
+205.795241633 1.0
 220.639362293 0.375
 303.868824047 0.40625
 309.185080317 0.890625
-374.875660429 1
-377.65216053 0
-379.76 0
+330.876238029 0.915254237288
+331.031756702 0
+333.292998895 0
+374.875660429 1.0
+377.65216053 0.0
+379.76 0.0
--- a/show/dance2006/curves/07-chicago-cyc	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/07-chicago-cyc	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
--4 0
--0.327278939587 0
-2.14327481922 1
-14.8168269178 1
-35.5553667156 0
-379.76 0
+-4.0 0.0
+-0.327278939587 0.0
+2.14327481922 1.0
+14.8168269178 1.0
+35.5553667156 0.0
+379.76 0.0
--- a/show/dance2006/curves/07-chicago-event	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/07-chicago-event	Sat Jun 17 17:41:53 2006 +0000
@@ -1,8 +1,8 @@
--4 0
+-4.0 0.0
 85.1884815797 0.602739726027
 87.111104249 0.369863013699
 88.3345914022 0.205479452055
 89.0337269184 0.109589041096
 89.7328624345 0.027397260274
 94.8015949264 0.438356164384
-379.76 0
+379.76 0.0
--- a/show/dance2006/curves/07-chicago-finish	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/07-chicago-finish	Sat Jun 17 17:41:53 2006 +0000
@@ -1,5 +1,6 @@
 -4.0 0.0
-334.489764326 0
+333.572204158 0
+334.499060601 0.150943396226
 343.660432677 0.4375
 360.074556762 0.426339285714
 364.634276628 1.0
--- a/show/dance2006/curves/07-chicago-hot	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/07-chicago-hot	Sat Jun 17 17:41:53 2006 +0000
@@ -1,8 +1,10 @@
--4 0
-89.5575159446 0
+-4.0 0.0
+89.5575159446 0.0
 99.0536002466 0.875
 205.795241633 0.859375
-212.26603379 1
-374.659418092 1
-377.588452513 0
-379.76 0
+212.26603379 1.0
+331.000652967 1
+331.109516038 0
+374.659418092 1.0
+377.588452513 0.0
+379.76 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/07-chicago-red	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,6 @@
+-4 0
+330.580752551 0
+331.047308569 1
+332.568151588 1
+332.623447116 0
+379.76 0
--- a/show/dance2006/curves/09-prettywoman-black	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/09-prettywoman-black	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
--4 0
-14.4988864098 0
-14.6393256979 1
-189.255769475 1
-189.778782631 0
-193.773333333 0
+-4.0 0.0
+14.4988864098 0.0
+14.6393256979 1.0
+189.255769475 1.0
+189.778782631 0.0
+193.773333333 0.0
--- a/show/dance2006/curves/09-prettywoman-blinks	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/09-prettywoman-blinks	Sat Jun 17 17:41:53 2006 +0000
@@ -1,18 +1,23 @@
 -4.0 0.0
 -0.476372645846 0.0258620689655
 0.0222949365021 1.0
-14.509525911 1
-14.5648407188 0.00961538461538
-43.974875502 0
+14.509525911 1.0
+15.8441810668 0
+43.974875502 0.0
+58.5450548318 0
+60.2623971383 0
 106.464455317 0.0
-110.097802869 0.376734693878
-115.41175692 0.376734693878
-118.63773678 0
-125.303340384 0
+112.739943396 0
+113.234556463 0
+113.799442562 0
+114.372312234 0
+115.020243501 0
+115.338911567 0
+125.303340384 0.0
 128.116746063 0.0
 136.828910387 0.0
-145.602080245 0.01
-146.072941051 1
-156.293669676 1.0
+146.623811003 0
+147.459575651 0.719298245614
+156.293669676 0.894736842105
 158.894032448 0.0
 193.773333333 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/09-prettywoman-blue	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,7 @@
+-4 0
+66.2504323976 0
+66.912555024 1
+96.7954954866 1
+105.280081648 0.913043478261
+109.634530929 0
+193.773333333 0
--- a/show/dance2006/curves/09-prettywoman-song	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/09-prettywoman-song	Sat Jun 17 17:41:53 2006 +0000
@@ -1,10 +1,14 @@
 -4.0 0.0
 -0.615237352534 0.0
 2.12969146908 1.0
-107.232939651 1
-109.650666344 0.0490721649485
-116.690517596 0.06
-120.957094113 0.7
+66.2070145205 1
+66.8148648004 0.5
+96.4546168812 0.491228070175
+107.265927903 0.631578947368
+109.650666344 0.0400631559395
+113.589418444 0.0410146989094
+114.356343896 0.456140350877
+115.48104426 0.70853485064
 138.094509789 0.71
 179.69495222 1.0
 187.148178311 0.0
--- a/show/dance2006/curves/12-mack-finish	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/12-mack-finish	Sat Jun 17 17:41:53 2006 +0000
@@ -1,7 +1,7 @@
 -4.0 0.0
-164.442367637 0
+164.442367637 0.0
 166.451666539 0.538978035735
-167.452909721 1
+167.452909721 1.0
 178.312558318 1.0
 180.092037902 0.0
 183.225396825 0.0
--- a/show/dance2006/curves/12-mack-start	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/12-mack-start	Sat Jun 17 17:41:53 2006 +0000
@@ -1,8 +1,8 @@
 -4.0 0.0
 -1.14597932524 0.0062893081761
 3.95127382525 1.0
-13.3689845095 1
-37.5207974756 0
-174.159535911 0
+13.3689845095 1.0
+37.5207974756 0.0
+174.159535911 0.0
 180.291550091 0.0
 183.225396825 0.0
--- a/show/dance2006/curves/14-grease-events	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/14-grease-events	Sat Jun 17 17:41:53 2006 +0000
@@ -1,2 +1,2 @@
--4 0
-194.573333333 0
+-4.0 0.0
+194.573333333 0.0
--- a/show/dance2006/curves/14-grease-finish	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/14-grease-finish	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
--4 0
-170.283996572 0
-173.356508708 1
-189.604369497 1
-192.468575726 0
-194.573333333 0
+-4.0 0.0
+170.283996572 0.0
+173.356508708 1.0
+189.604369497 1.0
+192.468575726 0.0
+194.573333333 0.0
--- a/show/dance2006/curves/14-grease-song	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/14-grease-song	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
--4.234344146 0
--0.255615970195 0
-0.751195916304 1
-190.355138705 1
-192.650843395 0
-194.573333333 0
+-4.234344146 0.0
+-0.691216997865 0
+0.751195916304 1.0
+190.355138705 1.0
+192.650843395 0.0
+194.573333333 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/15-gypsy-blue	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,10 @@
+-4 0
+32.5658122549 0
+35.447573195 1
+51.7089384999 1
+56.4432600443 0
+72.1900251813 0
+75.0717861214 1
+98.6404738102 0.991304347826
+102.860195187 0
+144.028208617 0
--- a/show/dance2006/curves/15-gypsy-finish	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/15-gypsy-finish	Sat Jun 17 17:41:53 2006 +0000
@@ -1,5 +1,6 @@
--4 0
+-4.0 0.0
 126.703925449 0.00446428571429
-132.41306422 1
-139.978936176 1
-144.028208617 0
+132.41306422 1.0
+139.978936176 1.0
+142.587328147 0
+144.028208617 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/15-gypsy-red	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,16 @@
+-4 0
+-0.57443855627 0
+6.52704376041 0.86072092159
+21.2446085617 0.852173913043
+31.2278518184 0.852173913043
+33.5950125907 0.373913043478
+52.8410588692 0.286956521739
+55.7228198093 0.582608695652
+72.8075453828 0.591304347826
+75.4834662557 0
+104.09523559 0.00869565217391
+112.946358477 0.617391304348
+126.84056301 0.939130434783
+138.985126972 0.921739130435
+142.587328147 0
+144.028208617 0
--- a/show/dance2006/curves/15-gypsy-song	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/15-gypsy-song	Sat Jun 17 17:41:53 2006 +0000
@@ -1,5 +1,13 @@
--4 0
--1.06266291633 0
-0.512271917133 1
-139.598704398 1
-144.028208617 0
+-4.0 0.0
+-1.06266291633 0.0
+0.615191950708 0.888888888889
+70.7491447113 0.939130434783
+72.9104654164 0.382608695652
+87.2163500833 0.373913043478
+96.1703930043 0.365217391304
+99.6696741459 0.730434782609
+121.282881197 0.713043478261
+129.104803748 0.913043478261
+139.598704398 1.0
+142.69024818 0
+144.028208617 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-back	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,6 @@
+-4 0
+203.397571593 0
+205.651192921 1
+226.168173016 1
+230.518326787 0
+443.436281179 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-backchase	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,2 @@
+-4.0 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-black	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,2 @@
+-4 0
+443.436281179 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-blue	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,14 @@
+-4.0 0.0
+98.5914516554 0.016393442623
+104.956802314 0.608695652174
+106.312977947 0.695652173913
+106.552303059 0.5
+107.126683327 0.260869565217
+107.206458364 0.195652173913
+107.5681052 0.0652173913043
+108.217828559 0.434782608696
+108.773594652 1
+111.072349445 1.0
+184.933662519 1.0
+189.34761424 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-can	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,7 @@
+-4.0 0.0
+226.504300882 0.0
+241.609387438 0.62962962963
+292.232574034 0.777777777778
+428.280443689 0.611111111111
+437.925067546 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-ch1	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,10 @@
+-4.30969356435 0
+0.0583282177205 0
+4.91019405921 0.45652173913
+14.9236193065 0.45652173913
+18.2270173263 0.760869565217
+45.8929757416 0.739130434783
+87.126848753 0.717391304348
+97.639248507 0
+106.857648415 0
+443.436281179 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-ch2	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,9 @@
+-4 0
+4.60050049486 0
+106.157622463 0
+107.988459568 0.761904761905
+160.813494851 0.761904761905
+188.88082845 0.619047619048
+193.259964636 0
+202.656861036 0
+443.436281179 0
--- a/show/dance2006/curves/16-mix-events	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/16-mix-events	Sat Jun 17 17:41:53 2006 +0000
@@ -1,4 +1,4 @@
--4 0
+-4.0 0.0
 18.2893026133 0.477272727273
 20.8233718096 0.6
 24.4434706614 0.5
@@ -17,16 +17,23 @@
 103.384524578 0.422727272727
 153.961749371 0.908045977011
 181.010214852 0.896551724138
+184.222767818 0.91724137931
+187.93909059 0.965517241379
+191.345719798 0.848275862069
+192.274800491 0.993103448276
+192.89418762 0.579310344828
+193.513574748 0.8
+204.662543065 0.875862068966
 214.631204655 0.965517241379
-218.928624405 0
-221.203728978 1
-230.808541283 1
-231.978662494 0
-233.650264222 1
+218.928624405 0.0
+221.203728978 1.0
+230.808541283 1.0
+231.978662494 0.0
+233.650264222 1.0
 242.342593212 0.925287356322
 287.810160233 0.885057471264
 316.394549795 0.701149425287
 319.069112561 0.637931034483
 319.737753252 0.436781609195
 323.916757574 0.540229885057
-443.436281179 0
+443.436281179 0.0
--- a/show/dance2006/curves/16-mix-finish	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/16-mix-finish	Sat Jun 17 17:41:53 2006 +0000
@@ -1,7 +1,7 @@
--4 0
-414.017943412 0
+-4.0 0.0
+414.017943412 0.0
 425.598673952 0.632183908046
-427.009216136 1
-438.965770636 1
-441.383293781 0
-443.436281179 0
+427.009216136 1.0
+438.965770636 1.0
+441.383293781 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-greem	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,2 @@
+-4 0
+443.436281179 0
--- a/show/dance2006/curves/16-mix-hot	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/16-mix-hot	Sat Jun 17 17:41:53 2006 +0000
@@ -1,13 +1,48 @@
--4 0
--1.07351212976 0
+-4.0 0.0
+-1.07351212976 0.0
 4.07512759414 0.385906040268
 9.22376731804 0.38255033557
 10.5759353263 0.372483221477
 15.6205621265 0.362416107383
 18.0648658338 0.714765100671
-214.136872774 0.745454545455
+92.4470096666 0.725806451613
+103.775824583 0.161290322581
+105.275902463 0.108695652174
+105.674777649 0.0869565217391
+106.29702294 0.326086956522
+107.014998275 0.826086956522
+107.302188409 1
+107.667380802 0.717391304348
+108.473108678 0
+117.455446891 0.0
+124.81911882 0.0645161290323
+127.699326003 0.225806451613
+129.427450312 0.387096774194
+132.307657494 0.5
+139.220154732 0.370967741935
+140.756265229 0.241935483871
+142.484389538 0.129032258065
+145.236587512 0.177419354839
+146.260661177 0.112903225806
+147.284734842 0.161290322581
+148.820845339 0.548387096774
+150.356955836 0.709677419355
+150.868992669 0.370967741935
+152.405103166 0.129032258065
+152.917139998 0.129032258065
+154.581259704 0.354838709677
+156.885425449 0.354838709677
+161.877784565 0.322580645161
+163.605908875 0.177419354839
+166.102088433 0.0967741935484
+174.166668543 0.387096774194
+179.159027659 0.387096774194
+186.700316333 0.0
+206.925200875 0.0
+219.540191478 0.182432432432
+235.942965989 0.883333333333
 272.598584502 0.586206896552
 297.50545026 0.816091954023
 426.864511409 0.862068965517
-439.408491193 0
-443.436281179 0
+439.408491193 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-left	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,6 @@
+-4 0
+201.464169917 0
+201.597091282 1
+202.370451952 1
+202.654420323 0
+443.436281179 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-right	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,6 @@
+-4 0
+202.630252802 0
+202.81755109 1
+203.615079281 1
+204.056136538 0
+443.436281179 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-scoop	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,2 @@
+-4.0 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-shar	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,10 @@
+-4.0 0.0
+1.193871287 0.0
+8.62651683141 0.71875
+25.040275742 0.734375
+30.6147599003 0.015625
+81.502222374 0.016393442623
+85.5345124291 0.16393442623
+92.4470096666 0.147540983607
+96.6713135339 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-strobedim	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,6 @@
+-4.0 0.0
+184.829860993 0.0
+193.996841195 1.0
+225.849904762 1.0
+230.718310407 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/16-mix-stroberate	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,2 @@
+-4.0 0.0
+443.436281179 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/curves/17-entertainment-1	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,2 @@
+-4.0 0.0
+132.249909297 0.0
--- a/show/dance2006/curves/17-entertainment-finish	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/17-entertainment-finish	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
--4 0
-110.583642242 0
-116.294833976 1
-127.082640585 1
-129.983563371 0
-132.249909297 0
+-4.0 0.0
+107.07656583 0
+116.294833976 1.0
+127.082640585 1.0
+129.983563371 0.0
+132.249909297 0.0
--- a/show/dance2006/curves/17-entertainment-song	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/17-entertainment-song	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
--4 0
--0.786275351832 0
-0.654113392442 1
-127.082640585 1
-130.164871045 0
-132.249909297 0
+-4.0 0.0
+-0.278670476183 0
+0.654113392442 1.0
+127.082640585 1.0
+130.164871045 0.0
+132.249909297 0.0
--- a/show/dance2006/curves/17-entertainment-stages	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/curves/17-entertainment-stages	Sat Jun 17 17:41:53 2006 +0000
@@ -1,6 +1,6 @@
--4 0
-95.8977206391 0
-101.69956621 1
+-4.0 0.0
+94.3811470557 0
+101.69956621 1.0
 127.626563607 0.986013986014
-130.164871045 0
-132.249909297 0
+130.164871045 0.0
+132.249909297 0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2006/subs/song16-blue	Sat Jun 17 17:41:53 2006 +0000
@@ -0,0 +1,11 @@
+blue-r : 0.77
+blue-xl : 1.0
+blue-xr : 0.61
+blue1 : 0.63
+blue2 : 0.63
+blue3 : 0.63
+blue4 : 0.63
+gree1 : 0.144
+gree2 : 0.216
+gree3 : 0.648
+gree4 : 0.576
--- a/show/dance2006/subterms/07-chicago	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/subterms/07-chicago	Sat Jun 17 17:41:53 2006 +0000
@@ -4,3 +4,5 @@
 song07-cool2 cool2(t)
 cyc cyc(t)
 hottest hot(t)
+redstage red(t)
+deepblues blue(t)
--- a/show/dance2006/subterms/09-prettywoman	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/subterms/09-prettywoman	Sat Jun 17 17:41:53 2006 +0000
@@ -1,7 +1,9 @@
-song09 song(t)
+song09 song(t) - (blinks(t) * .5)
 song(t) 
-scoop-l blinks(t) * smooth_music(t)
-scoop-r blinks(t) * (smooth_music(t))
+scoop-l blinks(t) * smooth_music(t+.1)**.6
+scoop-r blinks(t) * smooth_music(t+.1)**.6
 finish finish(t)
 blacklight black(t)>0
-cyc blinks(t) * (smooth_music(t)>.6) * .8
+cyc blinks(t) * max(0, (smooth_music(t+.1)-(.4+.1*within(108,115)))*2)**.2 * aft(7.75) 
+zip_orange blinks(t) * smooth_music(t+.1)**.6
+deepblues blue(t)
--- a/show/dance2006/subterms/15-gypsy	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/subterms/15-gypsy	Sat Jun 17 17:41:53 2006 +0000
@@ -1,2 +1,4 @@
 song15 song(t)
 finish finish(t)
+hottest red(t)
+deepblues blue(t)
--- a/show/dance2006/subterms/16-mix	Sat Jun 17 03:48:36 2006 +0000
+++ b/show/dance2006/subterms/16-mix	Sat Jun 17 17:41:53 2006 +0000
@@ -1,2 +1,15 @@
 hottest hot(t)
 finish finish(t)
+strobedim strobedim(t)
+stroberate .97
+song16-blue blue(t)
+scoop-wide scoop(t)
+shar shar(t)
+scoop-l left(t)
+scoop-r right(t)
+lo-fill can(t)
+ch1 chase(t,names=back_colors, ontime=.6, offset=0) * ch1(t)
+blacklight black(t) > 0
+ch2 chase(t, names=zips, ontime=.3, offset=0) * ch2(t)
+zip_green greem(t)
+cyc back(t) * max(bef(208), smooth_music(t+.15)**.5)