diff --git a/show/dance2012/curves/song7-song7fill b/show/dance2012/curves/song7-song7fill --- a/show/dance2012/curves/song7-song7fill +++ b/show/dance2012/curves/song7-song7fill @@ -11,8 +11,8 @@ 218.266102192 0.0 221.220553272 0.521551724137931 232.921181735 0.5165465042390089 242.378817496 0 -281.28857399 0.0 -281.35931799 0.75 +283.006688351 0 +285.244423437 0.782608695652174 294.055357088 0.7542578056762724 295.816167609 0.3260910076210405 309.550489677 0.32588686248239873 diff --git a/show/dance2012/subterms/song7.n3 b/show/dance2012/subterms/song7.n3 --- a/show/dance2012/subterms/song7.n3 +++ b/show/dance2012/subterms/song7.n3 @@ -1,36 +1,36 @@ + . + "cyc" . "cyc(t)" . . - . - "cyc" . - "chan('cyc-right')*cyc1(t)*3 + chan('cyc-mid')*(cyc1(t)-.33)*3 + chan('cyc-left')*(cyc1(t)-.66)*3 " . - . + . + "song7fill" . + "song7fill(t)" . + . + . + "center" . + "center(t)" . + . + . + "full" . + "full(t)" . + . . "cycroll" . - "center(t)" . - . - . - "center" . - "full(t)" . - . - . - "full" . + "chan('cyc-right')*cyc1(t)*3 + chan('cyc-mid')*(cyc1(t)-.33)*3 + chan('cyc-left')*(cyc1(t)-.66)*3 " . + . + . + "chase1" . + "chase1(t)*chase(t, names=backcolors, ontime=.6)" . + . + . + . + . + . + . + . + . + . + "song7chairsout" . "song7chairsout(t)" . . - . - "song7chairsout" . - "chase1(t)*chase(t, names=backcolors, ontime=.6)" . - . - . - "chase1" . - . - . - . - . - . - . - . - "song7fill(t)" . - . - . - "song7fill" .