diff --git a/show/dance2012/curves/song11-bwarm b/show/dance2012/curves/song11-bwarm --- a/show/dance2012/curves/song11-bwarm +++ b/show/dance2012/curves/song11-bwarm @@ -1,4 +1,4 @@ -0 0 +0.0 0 90.6020010074 0 94.912851407 1 190.228510626 1 diff --git a/show/dance2012/curves/song11-centertight b/show/dance2012/curves/song11-centertight --- a/show/dance2012/curves/song11-centertight +++ b/show/dance2012/curves/song11-centertight @@ -1,4 +1,4 @@ -0 0 +0.0 0 9.18779064088 0 11.3291488866 0 194.311564626 0 diff --git a/show/dance2012/curves/song11-cyc b/show/dance2012/curves/song11-cyc --- a/show/dance2012/curves/song11-cyc +++ b/show/dance2012/curves/song11-cyc @@ -1,4 +1,4 @@ -0 0 +0.0 0 3.94807008729 0 5.58439502663 1 17.2342615799 1.0 diff --git a/show/dance2012/curves/song11-full b/show/dance2012/curves/song11-full --- a/show/dance2012/curves/song11-full +++ b/show/dance2012/curves/song11-full @@ -1,4 +1,4 @@ -0 0 +0.0 0 183.304299783 0 186.843906649 0.9076086956521738 190.409979693 0.9076086956521738 diff --git a/show/dance2012/curves/song11-song11 b/show/dance2012/curves/song11-song11 --- a/show/dance2012/curves/song11-song11 +++ b/show/dance2012/curves/song11-song11 @@ -1,10 +1,10 @@ -0 0 -17.2887874964 0 -18.546337456 1 +0.0 0 +14.7636209646 0 +19.8182731906 1 92.0083783047 0.9606662336687176 -93.7323344378 0.7801724137931034 -109.844744135 0.773159498430208 -177.933981361 0.7907283546078651 +93.7323344378 0.6166564734642686 +110.665423258 0.6163134606015503 +177.933981361 0.625 180.610650094 1 190.001674293 1 194.311564626 0 diff --git a/show/dance2012/curves/song15-full b/show/dance2012/curves/song15-full new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song15-full @@ -0,0 +1,4 @@ +0 0 +192.933731101 0 +193.433731101 0.6025641025641026 +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,2 +1,11 @@ -0 0 +0.0 0 +48.2479519787 0 +52.0918822188 1 +52.2980700477 0 +76.4580470866 0.0 +78.4871971495 1 +78.5788361846 0 +125.593227931 0.0 +128.486403182 1 +128.64349867 0 203.993401361 0 diff --git a/show/dance2012/curves/song16-centertighter b/show/dance2012/curves/song16-centertighter --- a/show/dance2012/curves/song16-centertighter +++ b/show/dance2012/curves/song16-centertighter @@ -1,4 +1,4 @@ -0 0 +0.0 0 73.5328667602 0.0 75.1012010559 0.43243243243243246 79.1799383865 0.4299727875828492 @@ -6,7 +6,7 @@ 82.1927911125 0.6578607556513028 93.7401496152 0.648644579161142 94.5743776577 0 102.629918046 0 -314.632958556 0.07526881720430106 +314.530243645 0 314.920266279 0.3838826554464704 377.220032122 0.3327305448007818 378.542215735 0 @@ -16,5 +16,8 @@ 452.75109796 0.3365821989835578 466.231143884 0.4036727840386769 472.390597991 0.39604476322492527 472.75213179 0 +530.848476544 0 +531.623502239 0.04442674454614141 +531.724470681 0.6720430107526881 792.187777778 0 800.271133787 0 diff --git a/show/dance2012/curves/song16-chasefronts b/show/dance2012/curves/song16-chasefronts --- a/show/dance2012/curves/song16-chasefronts +++ b/show/dance2012/curves/song16-chasefronts @@ -1,3 +1,7 @@ 0.0 0 +472.882385352 0 +473.335107311 0.7419354838709677 +487.35364504 0.7291902663505083 +488.373997612 0.05434782608695652 615.555960312 0 800.271133787 0 diff --git a/show/dance2012/curves/song16-chasestrips b/show/dance2012/curves/song16-chasestrips --- a/show/dance2012/curves/song16-chasestrips +++ b/show/dance2012/curves/song16-chasestrips @@ -1,4 +1,4 @@ -0 0 +0.0 0 394.52402384 0.0 395.352742914 1 401.892089786 1 diff --git a/show/dance2012/curves/song16-cycmusic b/show/dance2012/curves/song16-cycmusic --- a/show/dance2012/curves/song16-cycmusic +++ b/show/dance2012/curves/song16-cycmusic @@ -1,4 +1,4 @@ -0 0 -473.153198385 0.0 -475.09859454 1 +0.0 0 +473.054766782 0.0 +473.425257281 1 800.271133787 0 diff --git a/show/dance2012/curves/song16-full b/show/dance2012/curves/song16-full --- a/show/dance2012/curves/song16-full +++ b/show/dance2012/curves/song16-full @@ -1,4 +1,4 @@ -0 0 +0.0 0 782.912371846 0 789.771546147 1 796.352819022 1 diff --git a/show/dance2012/curves/song16-mids b/show/dance2012/curves/song16-mids --- a/show/dance2012/curves/song16-mids +++ b/show/dance2012/curves/song16-mids @@ -1,4 +1,4 @@ -0 0 +0.0 0 295.932285244 0 296.070662375 0.5380952380952381 314.559632398 0.5183633510968736 diff --git a/show/dance2012/curves/song16-song16blue b/show/dance2012/curves/song16-song16blue --- a/show/dance2012/curves/song16-song16blue +++ b/show/dance2012/curves/song16-song16blue @@ -1,4 +1,4 @@ -0 0 +0.0 0 105.867384858 0 112.804259873 1 146.735408106 1 diff --git a/show/dance2012/curves/song16-song16goodgirl b/show/dance2012/curves/song16-song16goodgirl --- a/show/dance2012/curves/song16-song16goodgirl +++ b/show/dance2012/curves/song16-song16goodgirl @@ -1,4 +1,4 @@ -0 0 +0.0 0 146.915019344 0.0 148.560143792 0.28790723507883287 155.849545435 0.46195652173913054 diff --git a/show/dance2012/curves/song16-song16purple b/show/dance2012/curves/song16-song16purple --- a/show/dance2012/curves/song16-song16purple +++ b/show/dance2012/curves/song16-song16purple @@ -1,7 +1,9 @@ -0 0 +0.0 0 93.2742886749 0 94.5331057026 1 105.94721796 1 114.234018618 0 +472.687168858 0.0 +473.310056348 0.6032608695652174 792.187777778 0 800.271133787 0 diff --git a/show/dance2012/curves/song16-song16red b/show/dance2012/curves/song16-song16red --- a/show/dance2012/curves/song16-song16red +++ b/show/dance2012/curves/song16-song16red @@ -1,4 +1,4 @@ -0 0 +0.0 0 3.92083573932 0.0 6.52096891381 1 93.5410255644 1 diff --git a/show/dance2012/curves/song4-full b/show/dance2012/curves/song4-full --- a/show/dance2012/curves/song4-full +++ b/show/dance2012/curves/song4-full @@ -1,4 +1,4 @@ -0 0 +0.0 0 190.373419337 0 195.266497515 0.7119565217391304 200.900068661 0.718327655535145 diff --git a/show/dance2012/curves/song4-song4 b/show/dance2012/curves/song4-song4 --- a/show/dance2012/curves/song4-song4 +++ b/show/dance2012/curves/song4-song4 @@ -1,4 +1,4 @@ -0 0 +0.0 0 3.29738411186 0 3.79738411186 1 200.501193607 1 diff --git a/show/dance2012/subterms/song10.n3 b/show/dance2012/subterms/song10.n3 --- a/show/dance2012/subterms/song10.n3 +++ b/show/dance2012/subterms/song10.n3 @@ -1,31 +1,31 @@ - . - "blacklight" . - "blacklight(t)" . - . - . - "full" . - "full(t)" . - . - . - "edges" . - "edges(t)" . - . + "red(t)" . + "red" . + . + . + . . + . . . - . . - . - . - "red" . - "red(t)" . - . + "blacklight(t)" . + "blacklight" . + . + . + "blue(t)" . + "blue" . + . + . + "full(t)" . + "full" . + . + . + "edges(t)" . + "edges" . + . + . + "song10(t)" . + "song10" . . - "song10" . - "song10(t)" . . - . - "blue" . - "blue(t)" . - . diff --git a/show/dance2012/subterms/song11.n3 b/show/dance2012/subterms/song11.n3 --- a/show/dance2012/subterms/song11.n3 +++ b/show/dance2012/subterms/song11.n3 @@ -1,26 +1,26 @@ - . - . - "centertight(t)" . - "centertight" . + "full" . + "full(t)" . + . + . + "bwarm" . + "bwarm(t)" . + . + . + "song11" . + "song11(t)" . . . - "song11(t)" . - "song11" . + . + . . + . . - . - . - . + "centertight" . + "centertight(t)" . + . + . + "cyc" . + "cyc(t)" . . . - "cyc(t)" . - "cyc" . - . - . - "full(t)" . - "full" . - . - . - "bwarm(t)" . - "bwarm" . 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,41 +1,46 @@ - . - "center" . - . - "center(t)" . + . + . + "strobe(t)*chan(\"strobebright\")" . + "strobe" . + . . - "chasecolors" . - . "chase(t, names=colors, ontime=.3) * chasecolors(t)" . - . - "stroberate" . - . - "chan('strobespeed')*.97" . - . - "strobe" . - . - "strobe(t)*chan(\"strobebright\")" . - . + "chasecolors" . + . + . + "backctr(t)" . + "backctr" . + . + . + "full(t)" . + "full" . + . + . + "front(t)" . + "front" . + . . - . - . + . + . . + . + . . - . - . - . - "front" . - . - "front(t)" . - . - "song15start" . + . + . + . + "chan('green')*(0 < timewarp(t) < 25) + chan('orange') * .5 * (.25 < timewarp(t) < .5) + chan('blue') * (.5 < timewarp(t) < .75) + chan('red') * (.75 < timewarp(t) < 1) " . + "timewarp" . + . + . + "center(t)" . + "center" . . + . "song15start(t)" . - . - "backctr" . - . - "backctr(t)" . - . - "timewarp" . - . - "chan('green')*(0 < timewarp(t) < 25) + chan('orange') * .5 * (.25 < timewarp(t) < .5) + chan('blue') * " . + "song15start" . + . + . + "chan('strobespeed')*.97" . + "stroberate" . diff --git a/show/dance2012/subterms/song16.n3 b/show/dance2012/subterms/song16.n3 --- a/show/dance2012/subterms/song16.n3 +++ b/show/dance2012/subterms/song16.n3 @@ -1,66 +1,66 @@ - "song16red" . - . - "song16red(t)" . - . - "mids" . - . + "centertighter(t)" . + . + . + "centertighter" . + "chasestrips(t)*(chase(t, names=colors, ontime=.3,offset=.15)+chase(t+.9, names=colors, ontime=.3,offset=.15)+chase(t+1.8, names=colors, ontime=.3,offset=.15))" . + . + . + "chasestrips" . + "song16blue(t)" . + . + . + "song16blue" . "mids(t)" . . - "front" . - . + . + "mids" . + "song16purple(t)" . + . + . + "song16purple" . "front(t)" . . - "full" . - . - "full(t)" . - . - "chasecolorsfast" . - . - "chasecolorsfast(t)*(chase(t, names=backcolors,ontime=.40,offset=.1)+chase(t+1, names=backcolors,ontime=.40,offset=.1))" . - . - . - . - . - . - . - . - . + . + "front" . . . + . + . . + . + . . - . + . . - "song16blue" . - . - "song16blue(t)" . - . - "song16goodgirl" . - . + . + . + . + "song16red(t)" . + . + . + "song16red" . + "cycmusic(t)*chan('cyc-mid')*((music(t+.15)-.2)*5)**2" . + . + . + "cycmusic" . "song16goodgirl(t)" . . - "chasestrips" . - . - "chasestrips(t)*(chase(t, names=colors, ontime=.3,offset=.15)+chase(t+.9, names=colors, ontime=.3,offset=.15)+chase(t+1.8, names=colors, ontime=.3,offset=.15))" . - . - "song16purple" . - . - "song16purple(t)" . - . - "cycmusic" . - . - "cycmusic(t)*chan('cyc-mid')*((music(t+.15)-.2)*5)**2" . - . - "centertighter" . - . - "centertighter(t)" . - . - "chasescoop" . - . + . + "song16goodgirl" . + "chasefronts(t)*(chase(t, names=fronts, ontime=.5, offset=.4)+chase(t+15.67, names=fronts, ontime=.5, offset=.4))" . + . + . + "chasefronts" . + "chasecolorsfast(t)*(chase(t, names=backcolors,ontime=.40,offset=.1)+chase(t+1, names=backcolors,ontime=.40,offset=.1))" . + . + . + "chasecolorsfast" . + "full(t)" . + . + . + "full" . "chasescoop(t)*(chase(t, names=scoop, ontime=.2, offset=.1)+chase(t+123.45, names=scoop, ontime=.2, offset=.1))" . . - "chasefronts" . - . - "chasefronts(t)*(chase(t, names=fronts, ontime=.5, offset=.4)+chase(t+15.67, names=fronts, ontime=.5, offset=.4))" . - . + . + "chasescoop" . diff --git a/show/dance2012/subterms/song4.n3 b/show/dance2012/subterms/song4.n3 --- a/show/dance2012/subterms/song4.n3 +++ b/show/dance2012/subterms/song4.n3 @@ -1,16 +1,16 @@ - . - . - . - "cyc" . - "cyc(t)" . - . - . + . + "full(t)" . + . "full" . - "full(t)" . - . - . + . + . + . + . + "song4(t)" . + . "song4" . - "song4(t)" . - . - . + . + "cyc(t)" . + . + "cyc" .