diff --git a/show/dance2010/curves/song3-blueright b/show/dance2010/curves/song3-blueright --- a/show/dance2010/curves/song3-blueright +++ b/show/dance2010/curves/song3-blueright @@ -1,6 +1,6 @@ -0 0 -93.8987464425 0 -127.936473824 0 +0.0 0.0 +93.8987464425 0.0 +127.936473824 0.0 128.009861092 0.265957446809 128.642127996 0.276595744681 128.772941838 0.489361702128 @@ -17,6 +17,6 @@ 271.162177 1.0 271.243261 0.0 280.348009 0.0 280.437562 1.0 -305.973776848 0 -317.613878503 0 -347.927006803 0 +305.973776848 0.0 +317.613878503 0.0 +347.927006803 0.0 diff --git a/show/dance2010/curves/song3-ch1 b/show/dance2010/curves/song3-ch1 --- a/show/dance2010/curves/song3-ch1 +++ b/show/dance2010/curves/song3-ch1 @@ -63,9 +63,9 @@ 156.120344 0.00787401574803 159.709894 0.0 161.699308 0.0314960629921 168.156478 0.173228346457 -203.727648268 1 -204.656474765 0 -228.104305214 0 +203.727648268 1.0 +204.656474765 0.0 +228.104305214 0.0 228.294322 0.574803149606 232.735763983 0.0 233.046896 0.937007874016 diff --git a/show/dance2010/curves/song3-leftred b/show/dance2010/curves/song3-leftred --- a/show/dance2010/curves/song3-leftred +++ b/show/dance2010/curves/song3-leftred @@ -1,2 +1,2 @@ -0 0 -347.927006803 0 +0.0 0.0 +347.927006803 0.0 diff --git a/show/dance2010/curves/song3-redleft b/show/dance2010/curves/song3-redleft --- a/show/dance2010/curves/song3-redleft +++ b/show/dance2010/curves/song3-redleft @@ -1,4 +1,4 @@ -0 0 +0.0 0.0 132.769418 0.0 133.029129 1.0 133.868011 1.0 @@ -11,5 +11,5 @@ 271.682453 0.0 271.772392 1.0 275.445757 1.0 281.38858 1.0 -306.082848265 0 -347.927006803 0 +306.082848265 0.0 +347.927006803 0.0 diff --git a/show/dance2010/curves/song6-chcol b/show/dance2010/curves/song6-chcol --- a/show/dance2010/curves/song6-chcol +++ b/show/dance2010/curves/song6-chcol @@ -1,40 +1,40 @@ 0.0 0.0 -26.5465808893 0 -30.3366888613 0.340425531915 -35.0367392483 0 +26.5465808893 0.0 +31.2082725139 0.712765957447 +35.0367392483 0.0 39.512082 0.0 -39.876786 0.5 +40.2322357234 0.840425531915 40.689827 0.0 42.852203 0.0 -43.34321 0.5 -44.17169 0.0 +43.6097972925 0.989361702128 +44.3938460771 0 46.193483 0.0 -46.490016 0.5 -47.22747 0.0 +46.5788784308 1 +47.4940572925 0 49.441006 0.0 49.665637 0.5 -50.294901 0.5 -50.381083 0.0 +50.0727449229 0.968085106383 +50.6921015079 0 52.63624 0.0 -52.909661 0.5 -53.624134 0.0 +53.1762482925 1 +53.8907212925 0 55.9812398784 0.0106382978723 -56.6142432975 0.468085106383 -57.6270487681 0 +56.7475369438 1 +57.6270487681 0.0 97.4408472935 0.0 113.197118621 0.393617021277 136.521831483 0.36170212766 139.178211459 0.234042553191 146.825365934 0.521276595745 161.63778448 0.925531914894 -173.393981953 1 +173.393981953 1.0 182.673813426 0.81914893617 186.722304588 0.36170212766 190.420313426 0.0 -258.499172249 0 +258.499172249 0.0 264.8396623 0.531914893617 281.029844444 0.734042553191 284.220028117 0.63829787234 285.695488066 0.585106382979 -287.888739342 0 +287.888739342 0.0 297.085056689 0.0 diff --git a/show/dance2010/curves/song6-full b/show/dance2010/curves/song6-full --- a/show/dance2010/curves/song6-full +++ b/show/dance2010/curves/song6-full @@ -2,5 +2,5 @@ 0.0 0.0 292.743245323 0.0 294.317672669 0.446808510638 298.388158044 0.446808510638 -300.108216855 0 -301.592756618 0 +300.108216855 0.0 +301.592756618 0.0 diff --git a/show/dance2010/curves/song6-song06center b/show/dance2010/curves/song6-song06center --- a/show/dance2010/curves/song6-song06center +++ b/show/dance2010/curves/song6-song06center @@ -1,6 +1,6 @@ 0.0 0.0 283.876328947 0.0 286.578762839 1.0 -298.516518471 1 -300.997997192 0 -301.591191128 0 +298.516518471 1.0 +300.997997192 0.0 +301.591191128 0.0 diff --git a/show/dance2010/curves/song6-song06color b/show/dance2010/curves/song6-song06color --- a/show/dance2010/curves/song6-song06color +++ b/show/dance2010/curves/song6-song06color @@ -1,6 +1,6 @@ 0.0 0.0 145.859409579 0.0 -150.197983792 1 +150.197983792 1.0 167.190945749 0.627659574468 182.656152702 0.627659574468 190.249489968 1.0 diff --git a/show/dance2010/curves/song7-bbluec b/show/dance2010/curves/song7-bbluec new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-bbluec @@ -0,0 +1,6 @@ +0 0 +107.070539533 0 +286.586873084 0 +287.497672352 1 +309.467165104 1 +344.968911565 0 diff --git a/show/dance2010/curves/song7-blue b/show/dance2010/curves/song7-blue new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-blue @@ -0,0 +1,7 @@ +0 0 +35.4818659525 0 +36.7589910181 0.414893617021 +45.6988664772 1 +55.6937582948 1 +55.9158670019 0 +344.968911565 0 diff --git a/show/dance2010/curves/song7-bredc b/show/dance2010/curves/song7-bredc --- a/show/dance2010/curves/song7-bredc +++ b/show/dance2010/curves/song7-bredc @@ -1,6 +1,12 @@ 0.0 0.0 -278.366002896 0.031914893617 +257.23692748 0 +258.116900256 0.925531914894 +265.189681446 0.936170212766 +267.827478582 0 +278.302246947 0 284.953103754 0.468085106383 -307.398040008 0.531914893617 +287.060488704 0.478723404255 +287.424808411 0 +308.748752315 0 313.497207469 0.0 344.968911565 0.0 diff --git a/show/dance2010/curves/song7-chcolor b/show/dance2010/curves/song7-chcolor --- a/show/dance2010/curves/song7-chcolor +++ b/show/dance2010/curves/song7-chcolor @@ -1,5 +1,8 @@ 0.0 0.0 -136.621351115 0.989361702128 +66.4841169703 0.489361702128 +68.9057238799 0 +143.407657246 0 +143.735548095 1 227.864896323 0.553191489362 232.941518 0.5 233.047917 1.0 diff --git a/show/dance2010/curves/song7-chcolorslow b/show/dance2010/curves/song7-chcolorslow new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-chcolorslow @@ -0,0 +1,11 @@ +0 0 +64.9430943916 0 +74.1892298642 1 +144.023423566 0.606382978723 +144.774979968 0 +265.422968516 0 +268.22823026 1 +281.562331538 1 +286.813241857 0.946808510638 +287.213993535 0 +344.968911565 0 diff --git a/show/dance2010/curves/song7-chscoop b/show/dance2010/curves/song7-chscoop --- a/show/dance2010/curves/song7-chscoop +++ b/show/dance2010/curves/song7-chscoop @@ -1,9 +1,14 @@ 0.0 0.0 -197.369059021 0.904255319149 +200.948925084 0 208.34756045 0.0 239.07706 0.0 -239.1786 0.5 -251.615485 0.0 -254.596512 1.0 -278.366002896 1.0 +241.997612458 0 +247.66791519 0 +247.920404793 1 +264.803625014 0.978723404255 +267.499590846 0 +278.293138955 0 +288.125910658 0 +292.088000091 0 +308.386595258 0 344.968911565 0.0 diff --git a/show/dance2010/curves/song7-chscoop2 b/show/dance2010/curves/song7-chscoop2 --- a/show/dance2010/curves/song7-chscoop2 +++ b/show/dance2010/curves/song7-chscoop2 @@ -1,5 +1,8 @@ 0.0 0.0 -252.017599467 0.031914893617 +249.73191369 0 +253.746600279 0.68085106383 262.31870119 1.0 +265.095080779 0.925531914894 +267.936774494 0 293.491938198 0.0 344.968911565 0.0 diff --git a/show/dance2010/curves/song7-cyc b/show/dance2010/curves/song7-cyc new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-cyc @@ -0,0 +1,17 @@ +0 0 +32.8529456341 0 +36.3610325449 0 +39.8988469848 0 +40.5434227525 0.946808510638 +68.5626691494 0.542553191489 +71.687269957 0.468085106383 +73.9191276767 0 +86.5960795247 0 +101.538019253 0 +204.209060088 0 +212.501813797 0 +225.358796292 0 +285.638066278 0 +286.430866183 1 +312.416311833 0.744680851064 +344.968911565 0 diff --git a/show/dance2010/curves/song7-down b/show/dance2010/curves/song7-down new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-down @@ -0,0 +1,6 @@ +0 0 +101.941581871 0 +102.897759821 1 +111.058060333 1 +111.185017884 0 +344.968911565 0 diff --git a/show/dance2010/curves/song7-song07bk b/show/dance2010/curves/song7-song07bk --- a/show/dance2010/curves/song7-song07bk +++ b/show/dance2010/curves/song7-song07bk @@ -1,7 +1,32 @@ 0.0 0.0 4.9373078443 0.0 25.3918689135 1.0 +33.9724764011 0.989361702128 +36.3174206981 0.457446808511 +36.3216534495 1 +36.5502220272 0.978723404255 +36.5756185358 0.5 +36.6602735646 0.489361702128 +36.6941355761 1 +37.1004797142 1 +37.4779000508 0.542553191489 +37.6920949101 0.372340425532 +38.1837113532 0.36170212766 +38.1895313865 1 +38.5523134577 1 +38.5664226291 0.404255319149 +38.7935802897 0.0957446808511 +38.796402124 1 +39.0644763817 1 +39.0983383933 0.404255319149 +39.3043322966 0.127659574468 +39.3142087166 1 +39.7586476177 1 +40.4528188536 0.478723404255 +41.761156463 0.425380334422 52.1943972112 0.0 -213.958794514 0.063829787234 +214.371806095 0.148936170213 226.401096133 1.0 +247.99905292 1 +248.006195688 0 339.968911565 0.0 diff --git a/show/dance2010/readme b/show/dance2010/readme --- a/show/dance2010/readme +++ b/show/dance2010/readme @@ -86,6 +86,8 @@ for 2011: AttributeError: 'NoneType' object has no attribute 'split' - CC subterms that are just curve(t) should not appear as rows; they should be described in their curverow - all machines should have this control panel: set audio output to house or local; what's the song time; scrub around in this song; switches for emergency lights; make a checkpoint (if we dont have complete history yet) +- hardest thing is seeing an area on stage and getting light onto it. lightsim could help + #3: 306 horns- strobe. 255 light the sides. r first diff --git a/show/dance2010/subterms/song17.n3 b/show/dance2010/subterms/song17.n3 --- a/show/dance2010/subterms/song17.n3 +++ b/show/dance2010/subterms/song17.n3 @@ -1,15 +1,15 @@ - . - "full". - "full(t)". - . - . . . - . + . + "patios(t)". "patios". - "patios(t)". . - . + . + "song17(t)". "song17". - "song17(t)". . + . + "full(t)". + "full". + . + . diff --git a/show/dance2010/subterms/song3.n3 b/show/dance2010/subterms/song3.n3 --- a/show/dance2010/subterms/song3.n3 +++ b/show/dance2010/subterms/song3.n3 @@ -1,60 +1,65 @@ - "ch1(t)*chase(t,names=back,random=1,ontime=.3,offset=-.1)". - . - . - "ch1". - "bluered(t)". - . - . - "bluered". - "blueright(t)". - . - . - "blueright". - "bredc(t)". - . - . - "bredc". - "cyc(t)". - . - . - "cyc". - "down(t)". - . - . - "down". + "full". "full(t)". + . . - . - "full". - "leftred(t)". - . - . - "leftred". - "redblue(t)". - . - . + "blueright". + "blueright(t)". + . + . + "up". + "up(t)". + . + . + "bredc". + "bredc(t)". + . + . + "cyc". + "cyc(t)". + . + . "redblue". - "redleft(t)". - . - . - "redleft". - "strobe(t)". - . - . - "strobe". - "up(t)". - . - . - "up". - . - . + "redblue(t)". + . + . + "chscoop". + "chscoop(t)*chase(t,names=scoop,random=1,ontime=.3,offset=-.1)". + . + . + "bluered". + "bluered(t)". + . + . + "leftred". + "leftred(t)". + . + . + . . + . . . - . + . + . + . . - . - . + . + . . - . - . + . + "down". + "down(t)". + . + . + "strobe". + "strobe(t)". + . + . + "redleft". + "redleft(t)". + . + . + "ch1". + "ch1(t)*chase(t,names=back,random=1,ontime=.3,offset=-.1)". + . + . diff --git a/show/dance2010/subterms/song6.n3 b/show/dance2010/subterms/song6.n3 --- a/show/dance2010/subterms/song6.n3 +++ b/show/dance2010/subterms/song6.n3 @@ -1,25 +1,25 @@ - "chcol(t)*chase(t, names=back, ontime=2.5, offset=-1.4 )". - . + . + . + "song06open". + "song06open(t)". . + . "chcol". - "full(t)". - . - . - "full". - "song06center(t)". - . - . - "song06center". - "song06color(t)". - . - . - "song06color". - "song06open(t)". - . - . - "song06open". + "chcol(t)*chase(t, names=back, ontime=2.5, offset=-1.4 )". . . - . . . + . + . + . + "full". + "full(t)". + . + . + "song06color". + "song06color(t)". + . + . + "song06center". + "song06center(t)". diff --git a/show/dance2010/subterms/song7.n3 b/show/dance2010/subterms/song7.n3 --- a/show/dance2010/subterms/song7.n3 +++ b/show/dance2010/subterms/song7.n3 @@ -1,30 +1,60 @@ - . - "chscoop2(t)*chase(t+.08, names=scoop, ontime=.15,offset=-.05,random=2)". + . + "bredc". + . + "bredc(t)". + . + "cyc". + . + "cyc(t)*min(1, 3*(music(t+.1)**2))". + . + "song07bk". + . + "song07bk(t)". . "chscoop2". - . - "full(t)". + . + "chscoop2(t)*chase(t+.08, names=scoop*4, ontime=.15,offset=-.05,random=2)". + . + "chscoop1". + . + "chscoop(t)*chase(t, names=scoop*4, ontime=.15,offset=-.05,random=1)". + . + "green". + . + "blue(t)". + . + "bbluec". + . + "bbluec(t)". + . + "blue". + . + "blue(t)". + . + "chcolor". + . + "chcolor(t)*chase(t, names=colors, ontime=.2,offset=0)". + . + . + . + . + . + . + . + . + . + . + . + . + . + "down". + . + "down(t)". + . + "chcolorslow". + . + "chcolorslow(t)*chase(t, names=colors, ontime=.8, offset=-.2, offval=.4)". . "full". - . - . - . - . - . - . - . - "bredc(t)". - . - "bredc". - . - "chcolor(t)*chase(t, names=colors, ontime=.2,offset=0)". - . - "chcolor". - . - "chscoop(t)*chase(t, names=scoop, ontime=.15,offset=-.05,random=1)". - . - "chscoop1". - . - "song07bk(t)". - . - "song07bk". + . + "full(t)".