diff --git a/show/dance2009/config.n3 b/show/dance2009/config.n3 --- a/show/dance2009/config.n3 +++ b/show/dance2009/config.n3 @@ -78,15 +78,34 @@ sub:bblue, sub:bblueall, sub:bneutral, s sub:bred, sub:bredall . +chase:colors a :Chase; :channels ( +ch:oran1 ch:gree1 ch:blue1 ch:red1 +ch:oran2 ch:gree2 ch:blue2 ch:red2 +ch:oran3 ch:gree2 ch:blue2 ch:red2 +ch:oran4 ) . -chase:up a :Chase; :channels ( ch:b13 ch:b21 ch:b22 ch:b35 ) . - -chase:corners a :Chase; :channels (ch:b14 ch:b16 ch:cyc ch:b21 ch:b13) . +chase:colors1 a :Chase; :channels (ch:red1 ch:gree1 ch:oran1 ch:blue1) . +chase:colors2 a :Chase; :channels (ch:red2 ch:gree2 ch:oran2 ch:blue2) . +chase:colors3 a :Chase; :channels (ch:red3 ch:gree3 ch:oran3 ch:blue3) . +chase:colors4 a :Chase; :channels (ch:red4 ch:gree4 ch:oran4 ch:blue4) . -chase:colors a :Chase; :channels (ch:oran1 ch:gree1 ch:blue1 ch:red1 ch:oran2 ch:gree2 ch:blue2 ch:red2 ch:oran3 ch:gree2 ch:blue2 ch:red2 ch:oran4 ) . +chase:back a :Chase; :channels ( +ch:b15-p +ch:b13-b +ch:b12-r +ch:b21-p +ch:b22-b +ch:b23-b +ch:b24-b +ch:b25-r +ch:b33-r +ch:b34-b +ch:b35-p +) . -chase:rb a :Chase; :channels ( ch:b12 ch:b36 ch:b14 ch:b34 ch:b16 -ch:b32 ch:b22 ch:b26 ) . +chase:cycline a :Chase; :channels (ch:cyc-left ch:cyc-mid ch:cyc-right ) . +chase:cycpong a :Chase; :channels (ch:cyc-left ch:cyc-mid ch:cyc-right ch:cyc-mid) . + 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 @@ -1,5 +1,5 @@ --4 0 -115.170280081 0 +-4.0 0.0 +115.170280081 0.0 119.703799179 0.847457627119 126.740348023 0.847457627119 -131.746666667 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 @@ -1,5 +1,5 @@ --4 0 --0.92077740113 0 -8.53560225989 1 -126.925767232 1 -131.746666667 0 +-4.0 0.0 +-0.92077740113 0.0 +12.8002440678 1 +126.925767232 1.0 +131.746666667 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 @@ -1,5 +1,7 @@ --4 0 -251.370111727 0 -253.128005135 1 -371.598542335 1 -376.756507937 0 +-4.0 0.0 +251.370111727 0.0 +252.555637653 0.38202247191 +267.159142165 0.393258426966 +307.805285349 0.38202247191 +371.199332807 0.38202247191 +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 @@ -1,5 +1,5 @@ --4 0 -360.529889769 0 +-4.0 0.0 +360.529889769 0.0 362.042716239 0.661971830986 371.720660919 0.676056338028 -376.756507937 0 +376.756507937 0.0 diff --git a/show/dance2009/curves/song15-cyc b/show/dance2009/curves/song15-cyc new file mode 100644 --- /dev/null +++ b/show/dance2009/curves/song15-cyc @@ -0,0 +1,11 @@ +-4.0 0.0 +113.533052078 0.0 +116.930296046 0.0 +117.104365922 1.0 +123.312560635 1.0 +125.96189357 0.806451612903 +249.637648005 0.827956989247 +251.447008167 0 +305.739149894 0 +371.036842373 0 +376.756507937 0.0 diff --git a/show/dance2009/curves/song15-scoop b/show/dance2009/curves/song15-scoop --- a/show/dance2009/curves/song15-scoop +++ b/show/dance2009/curves/song15-scoop @@ -1,7 +1,7 @@ --4 0 +-4.0 0.0 112.695016543 0.00847457627119 118.394185422 0.694915254237 251.035359174 0.720338983051 -252.065695968 0 -289.318975471 0 -376.756507937 0 +252.065695968 0.0 +289.318975471 0.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,13 +1,15 @@ --4 0 --0.6000944848 0 +-4.0 0.0 +-0.6000944848 0.0 1.21163131558 0.440476190476 6.78101062785 0.565476190476 -10.4140480794 1 +10.4140480794 1.0 114.933613084 1.0 116.485884023 0.5 201.263540739 0.504273504274 221.846453807 0.794871794872 251.019973201 0.793956043956 -251.597784336 1 -371.898367332 1 -376.756507937 0 +254.173429917 0.788888888889 +263.780211404 0.8 +264.489917232 0.344444444444 +371.601176524 0.333333333333 +376.756507937 0.0 diff --git a/show/dance2009/curves/song16-backchase b/show/dance2009/curves/song16-backchase new file mode 100644 --- /dev/null +++ b/show/dance2009/curves/song16-backchase @@ -0,0 +1,6 @@ +-4 0 +313.98840226 0 +330.728318413 1 +435.817792044 1 +438.297779623 0 +452.247709751 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,5 @@ 46.1883649667 0.868421052632 47.6786853378 0.0 92.8442982167 0.0 98.1206503895 1.0 -188.439031108 1 +188.439031108 1.0 452.247709751 0.0 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,20 +1,20 @@ - . - . - "bow(t)". - "narrowfront". + "song12(t)". + . + . + "". + . + . + . + . + "song12(t)". . . - "song12(t)". "song12". - . - . - . - . + "bow(t)". + . + . + "narrowfront". + "0". . . - "0". "bow". - . - . - "song12(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,25 +1,35 @@ + "chase1". + "chase(t, names=back, ontime=.2, offset=.05)*within(264,361)". + . + . + "scoop". + "scoop(t)". + . + . + "cyc". + "cyc(t)". + . + . + "". "song15(t)". . . - "". + "bow". + "bow(t)". + . + . + "song15". "song15(t)". . . - "song15". - "america(t)*smooth_music(t+.03)". + "front". + "america(t)". . . - "front". + . + . + . . + . . . - . - . - "bow(t)". - . - . - "bow". - "scoop(t)". - . - . - "scoop". 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,50 +1,55 @@ + "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". + . + . + . . . . + . + . + . . - . . . - . - . - . - . - "blue". - "blue(t)". - . - . - "slcross". - "slcross(t)". - . - . - "bpurpleall". - "bpurpleall(t)". - . - . - "". - "chase1(t) * chase(t + 0.02, names=colors, ontime=0.3)". - . - . - "srcross". - "srcross(t)". - . - . - "bow". - "bow(t)". - . - . - "cyc". - "beats1(t) * (smooth_music(t) > 0.5) + beats2(t)". - . - . - "centercircle". - "centercircle(t)". - . - . - "red". - "red(t)". - . - . - "green". - "green(t)". - .