diff --git a/show/dance2011/booth-code b/show/dance2011/booth-code new file mode 100644 --- /dev/null +++ b/show/dance2011/booth-code @@ -0,0 +1,2 @@ +29668 + diff --git a/show/dance2011/curves/song16-alle b/show/dance2011/curves/song16-alle --- a/show/dance2011/curves/song16-alle +++ b/show/dance2011/curves/song16-alle @@ -2,8 +2,8 @@ 0.0 0.0 105.986627645 0.0 106.7469198 0.744680851064 154.129935432 0.744680851064 -185.848535663 0.744680851064 -187.084166377 0.0 +183.37044777 0.765957446809 +184.498335532 0 344.268573975 0.0 347.143822579 0.978723404255 358.589045152 1.0 diff --git a/show/dance2011/curves/song16-bow b/show/dance2011/curves/song16-bow --- a/show/dance2011/curves/song16-bow +++ b/show/dance2011/curves/song16-bow @@ -1,5 +1,5 @@ 0.0 0.0 -649.842159974 0 +649.842159974 0.0 652.576660216 0.329787234043 655.107939482 0.372340425532 657.069587351 1.0 diff --git a/show/dance2011/curves/song16-colorchase1 b/show/dance2011/curves/song16-colorchase1 --- a/show/dance2011/curves/song16-colorchase1 +++ b/show/dance2011/curves/song16-colorchase1 @@ -10,9 +10,22 @@ 288.810139253 0.787234042553 291.379260033 0.0 358.856127743 0.0 373.837943678 0.0 -375.856024823 1.0 -408.676397137 0.914893617021 -519.960046736 0.946808510638 +380.664345232 0 +381.543919336 0.563829787234 +404.040302381 0.563829787234 +404.929005715 0.563829787234 +405.175071728 0 +421.203112807 0.0 +421.417727807 1.0 +469.237088807 1.0 +469.335261807 0.0 +481.609045807 0.0 +488.02768384 0 +489.660540807 0.0 +497.112602355 0 +497.393431892 1 +513.448779515 1 +515.570796877 0 525.307930216 0.0 566.67538184 0.0 570.357068 0.0 diff --git a/show/dance2011/curves/song16-cycmusic b/show/dance2011/curves/song16-cycmusic --- a/show/dance2011/curves/song16-cycmusic +++ b/show/dance2011/curves/song16-cycmusic @@ -13,6 +13,10 @@ 288.246733213 0.276595744681 295.757613905 0.297872340426 316.273692167 0.287234042553 322.741850426 0.0 +489.240706514 0 +489.664987294 0.148936170213 +513.885708327 0.159574468085 +515.741936737 0 556.742601 0.0 559.007086668 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-sharps b/show/dance2011/curves/song16-sharps --- a/show/dance2011/curves/song16-sharps +++ b/show/dance2011/curves/song16-sharps @@ -2,4 +2,15 @@ 0.0 0.0 198.852184488 0.0 296.120183479 0.0 395.500711185 0.0 +441.429376452 0 +447.470639235 0.510638297872 +468.424871072 0.521276595745 +468.928309638 0 +474.252856015 0 +487.156391509 0 +492.040126632 0.776595744681 +513.27338614 0.723404255319 +522.266296049 0.457446808511 +527.26235711 0 +536.255267019 0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-song16b b/show/dance2011/curves/song16-song16b --- a/show/dance2011/curves/song16-song16b +++ b/show/dance2011/curves/song16-song16b @@ -7,8 +7,12 @@ 192.142204178 0.63829787234 193.729135458 1.0 197.079281833 1.0 199.900638169 0.0 -534.158631819 0 -540.018395918 1 +465.468592712 0 +470.288617333 0.925531914894 +477.862941737 1 +495.352745361 0.914893617021 +534.158631819 0.0 +540.018395918 1.0 543.308088045 0.914893617021 -556.46685655 0 +556.46685655 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-song16d_big b/show/dance2011/curves/song16-song16d_big --- a/show/dance2011/curves/song16-song16d_big +++ b/show/dance2011/curves/song16-song16d_big @@ -2,11 +2,11 @@ 0.0 0.0 251.008257959 0.0 251.634240071 1.0 290.366303439 1.0 -317.137494107 1.0 -319.065123327 0.0 +318.382523773 1 +320.374000668 0 332.486992642 0.0 336.132438629 1.0 347.70385762 1.0 350.686495246 0.0 -553.279967303 0 +553.279967303 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-song16e_wide b/show/dance2011/curves/song16-song16e_wide --- a/show/dance2011/curves/song16-song16e_wide +++ b/show/dance2011/curves/song16-song16e_wide @@ -4,16 +4,19 @@ 356.164907929 0.627659574468 362.599698162 0.63829787234 373.204455654 0.648936170213 404.374697853 0.457446808511 -408.19843055 0.202127659574 -420.417530517 0.191489361702 -420.695426909 0.18085106383 -432.822111723 0.0 -437.985246792 0.521276595745 -455.876871733 0.521276595745 -465.995894071 0.521276595745 -476.613015686 0.0 -484.792131596 0.0 -490.769177838 0.478723404255 +405.479862298 1 +417.396899126 1 +417.976858657 1 +424.513840659 0.18085106383 +433.124174862 0.170212765957 +438.891436209 0.68085106383 +466.902083488 0.68085106383 +469.176406271 0 +473.180632105 0 +473.425458753 1 +475.180049726 0.351063829787 +484.504007092 0.340425531915 +487.271935095 0.478723404255 513.625287092 0.425531914894 519.742340817 0.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song16-song16f_blue b/show/dance2011/curves/song16-song16f_blue --- a/show/dance2011/curves/song16-song16f_blue +++ b/show/dance2011/curves/song16-song16f_blue @@ -4,11 +4,14 @@ 253.415449591 0.446808510638 271.46857399 0.425531914894 288.773689103 0.457446808511 290.88200649 0.0 +473.318347095 0 +476.761221824 0 +483.509256293 0.0106382978723 516.827756565 0.0 530.933317607 1.0 -596.088729618 1 -603.137499462 0.478723404255 -611.788262452 0.5 -619.798228184 1 +596.088729618 1.0 +601.352617039 0.180851063829 +616.250468509 0.191489361702 +619.798228184 1.0 649.669438935 1.0 664.654036281 0.0 diff --git a/show/dance2011/curves/song7-centerpool b/show/dance2011/curves/song7-centerpool --- a/show/dance2011/curves/song7-centerpool +++ b/show/dance2011/curves/song7-centerpool @@ -7,10 +7,10 @@ 31.975203944 0.0106382978723 32.2958048802 0.308510638298 33.8224760049 0.31914893617 36.0056157133 0.0 -236.118009587 0 +236.118009587 0.0 243.898163701 0.382978723404 260.012323482 0.414893617021 270.825713593 0.0 -276.74560758 0 -280.332973841 0 +276.74560758 0.0 +280.332973841 0.0 307.640884354 0.0 diff --git a/show/dance2011/curves/song7-chase1 b/show/dance2011/curves/song7-chase1 --- a/show/dance2011/curves/song7-chase1 +++ b/show/dance2011/curves/song7-chase1 @@ -12,7 +12,7 @@ 244.816058878 0.0 257.462614656 0.0 262.460043955 0.468085106383 266.784604037 1.0 -288.819969177 1 +288.819969177 1.0 291.423948359 0.414893617021 299.747872398 0.0 307.640884354 0.0 diff --git a/show/dance2011/curves/song7-edges b/show/dance2011/curves/song7-edges new file mode 100644 --- /dev/null +++ b/show/dance2011/curves/song7-edges @@ -0,0 +1,9 @@ +0 0 +186.638403946 0 +201.015517283 0.170212765957 +237.662485767 0.202127659574 +249.017471198 0 +277.463032856 0 +285.035568858 0.202127659574 +295.493690637 0.202127659574 +307.640884354 0 diff --git a/show/dance2011/curves/song7-song07top b/show/dance2011/curves/song7-song07top --- a/show/dance2011/curves/song7-song07top +++ b/show/dance2011/curves/song7-song07top @@ -21,13 +21,6 @@ 184.320461184 0.723404255319 191.228585147 0.18085106383 199.414737434 0.191489361702 208.805283302 0.531914893617 -250.192994247 0.574468085106 -250.227793618 0.0 -251.254871499 0.0 -251.276187685 0.574468085106 -253.36145089 0.617021276596 -253.394169243 0.0106382978723 -254.494009272 0.0106382978723 254.561962775 0.617021276596 272.556890906 0.553191489362 274.2587422 0.670212765957 diff --git a/show/dance2011/curves/song7-strobebright b/show/dance2011/curves/song7-strobebright --- a/show/dance2011/curves/song7-strobebright +++ b/show/dance2011/curves/song7-strobebright @@ -3,8 +3,8 @@ 22.5172761135 0.0 22.61165697 0.755319148936 23.8463282736 0.797872340426 23.9037657109 0.0 -30.9915258583 0 -31.0298283002 1 +30.9915258583 0.0 +31.0298283002 1.0 32.335024523 1.0 32.3505546687 0.0 82.3896617325 0.0 @@ -13,12 +13,4 @@ 140.33283 0.75 151.130762 0.75 151.924081 0.0 155.740979148 0.0 -250.232137246 0.0 -250.336433218 1.0 -251.192819961 1.0 -251.239619309 0.0 -253.268329423 0 -253.313631758 0.957446808511 -254.604748314 0.957446808511 -254.83125999 0 307.640884354 0.0 diff --git a/show/dance2011/readme b/show/dance2011/readme --- a/show/dance2011/readme +++ b/show/dance2011/readme @@ -88,6 +88,6 @@ 16 the color and back chases that last u extreme and long, when the theater is all dark. we should have been stricter about dark theater during the day - +CC bug: new subterms don't make the subterm area scroll right. - +vidref segfaults sometimes for no reason, and usually at exit. diff --git a/show/dance2011/readme.dmcc b/show/dance2011/readme.dmcc --- a/show/dance2011/readme.dmcc +++ b/show/dance2011/readme.dmcc @@ -65,3 +65,15 @@ backup inside jokes: you're wearing the shirt right now. we highly value your input...until you sign the deal. + + +new stuff: + +16: at 187, blinks continue oddly after music stops +16: 319, brief very dark spot +16: 490 jump needs something + +17: 200 front center dull + +17: edges in 220 + diff --git a/show/dance2011/subterms/song16.n3 b/show/dance2011/subterms/song16.n3 --- a/show/dance2011/subterms/song16.n3 +++ b/show/dance2011/subterms/song16.n3 @@ -1,100 +1,100 @@ - . - . - "pool3(t)". - "pool3". + . + . + "pool2(t)". + "pool2". + . + . + "song16b(t)". + "song16b". . . "chan(\"strobespeed\")*(.9+.1*stroberate(t))". "stroberate". - . - . - "colorchase1(t)*chase(t, names=back, ontime=.5, offset=-.3)". - "chase2". - . - . - "song16a(t)". - "song16a". + . + . + "". + "sharps". + . + . + "bow(t)". + "bow". + . + . + "song16c(t)". + "song16c". + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + . + "sharps(t)". + "b-sharp". + . + . + "song16d_big(t)". + "song16d_big". + . + . + "stack1(t)". + "stack1". + . + . + "topline(t)*(.2+ncos(t*2+.8)*.8)". + "down". + . + . + "cycmusic(t)*((music(t+.1)-.3)*5+within(180,193)*music(t+.1)*9)". + "cyc". + . + . + "chan(\"strobebright\")*strobe(t)". + "strobe1". . . "pool1(t)". "pool1". - . - . - "song16d_big(t)". - "song16d_big". - . - . - "song16b(t)". - "song16b". - . - . - "chase3(t)*chase(t, names=scoop, ontime=.25, offset=-0.25/2)". - "chase3". - . - . - "topline(t)*(.2+ncos(t*2+.8)*.8)". - "down". - . - . - "pool2(t)". - "pool2". - . - . - "stack1(t)". - "stack1". . . "song16e_wide(t)". "song16e_wide". - . - . - "". - "sharps". + . + . + "pool3(t)". + "pool3". + . + . + "song16a(t)". + "song16a". + . + . + "colorchase1(t)*chase(t, names=back, ontime=.5, offset=-.3)". + "chase2". + . + . + "chase3(t)*chase(t, names=scoop, ontime=.25, offset=-0.25/2)". + "chase3". . . "song16f_blue(t)". "song16f_blue". - . - . - "sharps(t)". - "b-sharp". - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - "chan(\"strobebright\")*strobe(t)". - "strobe1". - . - . - "cycmusic(t)*((music(t+.1)-.3)*5+within(180,193)*music(t+.1)*9)". - "cyc". . . "chase(t+.08,names=frontsrand, ontime=.25, offset=.25)*alle(t)". "chase1". - . - . - "song16c(t)". - "song16c". - . - . - "bow(t)". - "bow". diff --git a/show/dance2011/subterms/song7.n3 b/show/dance2011/subterms/song7.n3 --- a/show/dance2011/subterms/song7.n3 +++ b/show/dance2011/subterms/song7.n3 @@ -1,35 +1,40 @@ - . - . - "song07top(t)". - "song07top". - . - . - "cycmusic(t)*(music(t+.1)>.3)". - "cyc". - . - . - "chase1(t)*(chase(t, names=colors, ontime=.25,offset=-.03))". - "chase1". - . . + . + . + . . . - . + . . - . - . - . - "chan(\"strobebright\")*strobebright(t)+chan(\"strobespeed\")*.973". - "strobebright". + . + "cyc". + "cycmusic(t)*(music(t+.1)>.3)". + . + . + "f-cross". + "cross(t)". + . + . + "edges". + "edges(t)". + . . - . + "centerpool". "centerpool(t)". - "centerpool". + . + . + "chase1". + "chase1(t)*(chase(t, names=colors, ontime=.25,offset=-.03))". + . + . + "strobebright". + "chan(\"strobebright\")*strobebright(t)+chan(\"strobespeed\")*.973". + . + . + "song07top". + "song07top(t)". + . . - . - "bow(t)". "bow". - . - . - "cross(t)". - "f-cross". + "bow(t)". + .