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,7 +1,7 @@ 0.0 0 -48.2479519787 0 -52.0918822188 1 -52.2980700477 0 +48.3526823045 0 +51.1648248902 1 +51.1693098694 0 76.4580470866 0.0 78.4871971495 1 78.5788361846 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 @@ -19,5 +19,7 @@ 472.75213179 0 530.848476544 0 531.623502239 0.04442674454614141 531.724470681 0.6720430107526881 +567.36489638 0.6659621219648417 +574.851149034 0 792.187777778 0 800.271133787 0 diff --git a/show/dance2012/curves/song16-chasecolorsfast b/show/dance2012/curves/song16-chasecolorsfast --- a/show/dance2012/curves/song16-chasecolorsfast +++ b/show/dance2012/curves/song16-chasecolorsfast @@ -1,7 +1,13 @@ 0.0 0 +40.2630820235 0 +61.405796328 0.21695785542811408 +71.6094541011 0.26086956521739135 +72.4367777043 0 404.408382246 0.0 405.056289886 1 472.467601912 1 472.738752261 0 528.665208298 0 +697.990954543 0.0 +701.924964805 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,7 +1,15 @@ 0.0 0 +112.01403532 0.0 +114.112845085 0.21578947368421053 +147.088784091 0.2076525767117397 +149.686358058 0 472.882385352 0 473.335107311 0.7419354838709677 487.35364504 0.7291902663505083 488.373997612 0.05434782608695652 615.555960312 0 +744.962853464 0.0 +751.299067773 0.18244079179921804 +754.123645236 0.7065217391304348 +790.671375772 0.7168893502157255 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 @@ -4,4 +4,9 @@ 395.352742914 1 401.892089786 1 402.781079338 0.0 488.130230157 0 +634.563829415 0.0 +636.942452587 0.8010752688172043 +673.815527317 0.8105658838000936 +742.558145624 0.8574293442616001 +745.878932641 0 800.271133787 0 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,7 @@ 0.0 0 473.054766782 0.0 473.425257281 1 +560.705809547 0.954157939180571 +561.455513824 0 +569.522939456 0 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,5 +1,459 @@ 0.0 0 -782.912371846 0 -789.771546147 1 +328.051666092 0.0 +345.242155599 0.16304347826086957 +362.252639981 0.15670663276029356 +365.897743778 0.09581759072327099 +377.463073106 0.09316022113094426 +378.208094321 0 +487.410197202 0 +487.561243997 0.5434782608695652 +487.858181727 0.75 +487.921315036 0.2608695652173913 +487.979917918 0.8695652173913043 +488.10165411 0.717391304347826 +488.223390301 0.9565217391304348 +488.345126492 0.7065217391304348 +488.393908274 0.43478260869565216 +488.497296731 0.44565217391304346 +488.596448233 0.15217391304347827 +488.64946697 1 +488.771203162 0.8913043478260869 +488.866501512 0.22826086956521738 +488.953807449 0.6086956521739131 +489.07554364 0.8695652173913043 +489.091545911 0.7282608695652174 +489.197279831 1 +489.32784253 0.0 +489.34945007 0.8913043478260869 +489.406608069 0.03260869565217391 +489.471186262 1 +489.623356501 0.8043478260869565 +489.654156908 0.5652173913043478 +489.836394836 0.18478260869565216 +489.924210187 0.25 +489.958131027 0.6739130434782609 +490.079867218 1 +490.201603409 0.9891304347826086 +490.353773649 0.8152173913043478 +490.396803425 0.30434782608695654 +490.505943888 1 +490.74941627 0.717391304347826 +490.801883343 0.7391304347826086 +490.871152462 0.9347826086956522 +490.992888653 1 +491.266795083 0.9347826086956522 +491.341989901 0.15217391304347827 +491.364494341 0.5652173913043478 +491.388531275 0.9021739130434783 +491.454512101 0.6304347826086957 +491.540701514 0.4782608695652174 +491.814607944 1 +491.859592019 0.06521739130434782 +491.966778183 0.6956521739130435 +492.118948422 1 +492.174654177 0.5543478260869565 +492.240684614 0.8369565217391305 +492.423288901 1 +492.534725216 0.05434782608695652 +492.545025092 1 +492.697195331 1 +492.84936557 0.6521739130434783 +493.001535809 0.9021739130434783 +493.119840653 0.391304347826087 +493.123272 0.2717391304347826 +493.184140096 0.9347826086956522 +493.209858413 0.15217391304347827 +493.305876287 0.17391304347826086 +493.397178431 1 +493.458046526 0.2826086956521739 +493.479911692 0.40217391304347827 +493.610216766 1 +493.682451651 0.08695652173913043 +493.701518909 0.8913043478260869 +493.701518909 0.16304347826086957 +493.731952957 1 +493.853689148 0.4673913043478261 +493.914557244 0.6956521739130435 +493.95250493 0.44565217391304346 +494.036293435 0.5 +494.218897722 0.9347826086956522 +494.267567088 0.08695652173913043 +494.371067961 1 +494.584106296 0.6304347826086957 +494.717655886 0.6086956521739131 +494.736276535 0.6195652173913043 +494.830178086 0.34782608695652173 +494.888446774 0.9782608695652174 +494.920195845 0.358695652173913 +495.010213605 0.6521739130434783 +495.040617013 1 +495.162353205 0.8913043478260869 +495.415293523 0.043478260869565216 +495.557995826 0.6630434782608695 +495.595329043 0.41304347826086957 +495.730355682 0.17391304347826086 +495.740600113 1 +495.892770352 1 +496.000408961 0.5760869565217391 +496.166676783 0.8478260869565217 +496.288412974 0.782608695652174 +496.292966679 0.22826086956521738 +496.382984439 0.6195652173913043 +496.471017261 0.5652173913043478 +496.585524398 0.16304347826086957 +496.6231875 0.9130434782608695 +496.675542158 0.16304347826086957 +496.775357739 0.967391304347826 +496.927527978 0.5652173913043478 +497.04926417 0.9021739130434783 +497.058117636 0.6304347826086957 +497.215648715 0.2608695652173913 +497.292736552 1 +497.305666475 0.5869565217391305 +497.440693114 0.08695652173913043 +497.505774887 0.6630434782608695 +497.575719754 0.6521739130434783 +497.627511078 1 +497.810115365 0.75 +497.936923898 0.20652173913043478 +497.980799672 0.14130434782608695 +497.992719652 0.9347826086956522 +498.018081359 0.3804347826086957 +498.09923882 0.5543478260869565 +498.114455843 0.32608695652173914 +498.18039628 0.5978260869565217 +498.266626083 1 +498.342711202 0.08695652173913043 +498.363000567 0.10869565217391304 +498.363000567 0.10869565217391304 +498.484736759 0.20652173913043478 +498.484736759 0.5434782608695652 +498.510098465 0.8586956521739131 +498.60647295 0.6521739130434783 +498.64705168 0.30434782608695654 +498.662268704 1 +498.728209141 0.30434782608695654 +498.748498506 0.391304347826087 +498.784004896 0.8260869565217391 +498.905741087 0.782608695652174 +498.910813428 0.5760869565217391 +499.002115572 0.10869565217391304 +499.118779422 1 +499.270949661 0.18478260869565216 +499.392685852 0.4782608695652174 +499.397758193 0.717391304347826 +499.478915654 0.7391304347826086 +499.499205019 0.20652173913043478 +499.575290139 0.7391304347826086 +499.610796528 0.532608695652174 +499.793400815 0.42391304347826086 +499.793400815 0.7608695652173914 +499.803545498 0.6413043478260869 +499.849196569 1 +499.925281689 0.6304347826086957 +499.945571054 0.9565217391304348 +499.970932761 0.9782608695652174 +500.031800856 0.10869565217391304 +500.107885976 0.03260869565217391 +500.153537048 0.44565217391304346 +500.183971095 0.22826086956521738 +500.189043437 0 +500.275273239 0.9347826086956522 +500.351358358 0.14130434782608695 +500.39700943 0.967391304347826 +500.594830741 0.6630434782608695 +500.675988202 0.5869565217391305 +500.701349908 0.5760869565217391 +500.777435028 0.9456521739130435 +500.8230861 1 +500.93974995 0 +501.365826619 0.782608695652174 +501.370898961 0.6195652173913043 +501.44698408 0 +501.5230692 0.25 +501.548430906 0 +501.644805391 0.4891304347826087 +501.79697563 0.9021739130434783 +501.918711821 1 +501.918711821 0.358695652173913 +502.040448013 0.6739130434782609 +502.07088206 0.6630434782608695 +502.096243767 0.9891304347826086 +502.177401228 0.44565217391304346 +502.192618252 1 +502.375222539 1 +502.461452341 0.8586956521739131 +502.49695873 0.9130434782608695 +502.542609802 0.8369565217391305 +502.618694921 0.7391304347826086 +502.725214089 0.09782608695652174 +502.801299208 0.532608695652174 +502.80637155 0.4891304347826087 +502.88752901 0.5869565217391305 +503.014337543 0.9347826086956522 +503.070133297 0.021739130434782608 +503.151290758 0 +503.273026949 0.4782608695652174 +503.475920602 0.5434782608695652 +503.557078062 0 +503.800550445 0.7391304347826086 +503.881707906 0 +503.962865367 1 +504.328073941 0.09782608695652174 +504.490388862 1 +504.672993149 0.06521739130434782 +504.75415061 0.6304347826086957 +504.94689958 0.782608695652174 +505.017912358 1 +505.048346406 0.717391304347826 +505.200516645 0.31521739130434784 +505.291818788 0.391304347826087 +505.403410297 0.9239130434782609 +505.535291171 0.15217391304347827 +505.667172045 0.05434782608695652 +505.697606093 0.4782608695652174 +505.748329506 0 +505.849776332 0.9347826086956522 +505.971512523 0.14130434782608695 +505.981657206 0.8478260869565217 +506.052669984 0 +506.062814667 0.7934782608695652 +506.133827445 0 +506.225129588 0.6847826086956522 +506.296142367 0.15217391304347827 +506.316431732 1 +506.559904114 0.11956521739130435 +506.590338162 0.391304347826087 +506.641061575 0.06521739130434782 +506.671495623 0.08695652173913043 +506.742508401 0.06521739130434782 +506.793231814 0.6413043478260869 +506.843955227 0.8586956521739131 +506.874389275 0.3804347826086957 +506.89467864 0.31521739130434784 +506.925112688 0.9347826086956522 +506.955546736 0.782608695652174 +506.996125466 0.2826086956521739 +507.036704197 0.9021739130434783 +507.056993562 0.9891304347826086 +507.077282927 0.14130434782608695 +507.178729753 0.8695652173913043 +507.280176579 0.7065217391304348 +507.341044675 0.8913043478260869 +507.401912771 0.11956521739130435 +507.462780866 1 +507.503359597 0.6086956521739131 +507.543938327 1 +507.625095788 0.8586956521739131 +507.645385153 0.8913043478260869 +507.746831979 0.5434782608695652 +507.82798944 0 +507.848278806 0.717391304347826 +507.909146901 0.6413043478260869 +508.010593727 0 +508.051172458 0.5760869565217391 +508.25406611 0.33695652173913043 +508.335223571 0.8586956521739131 +508.375802301 0.32608695652173914 +508.375802301 1 +508.436670397 0.10869565217391304 +508.517827858 0.10869565217391304 +508.517827858 0 +508.517827858 1 +508.598985319 0.5217391304347826 +508.598985319 0 +508.700432145 0.782608695652174 +508.700432145 0.11956521739130435 +508.801878971 0.6521739130434783 +508.923615162 0 +509.025061988 1 +509.106219449 0.10869565217391304 +509.18737691 0.03260869565217391 +509.451138658 1 +509.552585484 1 +509.714900405 0.5217391304347826 +509.775768501 1 +509.796057866 0.30434782608695654 +509.836636597 0.09782608695652174 +509.877215327 0.14130434782608695 +509.917794058 0.6521739130434783 +509.978662153 0.44565217391304346 +510.019240884 1 +510.059819614 0.8043478260869565 +510.140977075 0.10869565217391304 +510.16126644 0.6086956521739131 +510.222134536 0.05434782608695652 +510.242423901 0.5978260869565217 +510.323581362 0.7608695652173914 +510.485896284 0.45652173913043476 +510.485896284 1 +510.58734311 1 +510.688789936 0.6847826086956522 +510.749658031 1 +510.790236762 0.42391304347826086 +510.830815492 0.20652173913043478 +510.871394223 0.30434782608695654 +510.911972953 1 +510.952551683 0.5760869565217391 +510.993130414 1 +511.155445336 0.9130434782608695 +511.256892162 0 +511.277181527 0.8913043478260869 +511.338049623 0.40217391304347827 +511.358338988 0.9347826086956522 +511.419207083 0.09782608695652174 +511.480075179 0.6630434782608695 +511.500364544 0.22826086956521738 +511.581522005 0.5 +511.642390101 1 +511.662679466 0.33695652173913043 +511.662679466 0.9130434782608695 +511.764126292 0.44565217391304346 +511.764126292 0.6521739130434783 +511.845283753 0 +511.845283753 1 +511.845283753 1 +511.946730579 1 +512.02788804 0.9239130434782609 +512.230781692 0.358695652173913 +512.251071057 0.4891304347826087 +512.352517883 0.2717391304347826 +512.372807249 0.7934782608695652 +512.433675344 0.010869565217391304 +512.474254075 0.6847826086956522 +512.53512217 0 +512.595990266 0.44565217391304346 +512.677147727 0.3695652173913043 +512.758305188 0.8260869565217391 +512.819173283 0.9239130434782609 +512.859752014 0.8478260869565217 +513.022066935 0.6847826086956522 +513.123513762 0.11956521739130435 +513.143803127 0.9565217391304348 +513.224960588 0.9130434782608695 +513.285828683 0 +513.306118048 0.6086956521739131 +513.326407414 0.8260869565217391 +513.42785424 0.9782608695652174 +513.448143605 0.6195652173913043 +513.529301066 0.7391304347826086 +513.549590431 0.6304347826086957 +513.549590431 1 +513.610458527 0.5652173913043478 +513.630747892 0.6413043478260869 +513.691615988 0.2717391304347826 +513.732194718 0.6304347826086957 +513.772773448 0.31521739130434784 +513.833641544 0 +514.077113927 0.30434782608695654 +514.158271388 0.5217391304347826 +514.158271388 0.11956521739130435 +514.198850118 0.13043478260869565 +514.239428848 0 +514.320586309 0 +514.381454405 0.6413043478260869 +514.462611866 1 +514.462611866 0.1956521739130435 +514.543769327 0.05434782608695652 +514.584348057 0.22826086956521738 +514.624926787 0.021739130434782608 +514.706084248 0 +514.82782044 0.4673913043478261 +515.051003457 0 +515.213318379 0.8804347826086957 +515.29447584 0.22826086956521738 +515.3756333 0.8369565217391305 +515.558237587 0.20652173913043478 +515.700263144 0.9565217391304348 +515.903156796 0.31521739130434784 +516.004603622 0.40217391304347827 +516.085761083 0.6847826086956522 +516.248076005 0 +516.329233466 0.7608695652173914 +516.532127118 0.08695652173913043 +516.633573944 0.6847826086956522 +516.694442039 0.043478260869565216 +516.73502077 0.7608695652173914 +516.7755995 0.16304347826086957 +516.816178231 0.6956521739130435 +516.877046326 0.9565217391304348 +516.917625057 0.717391304347826 +516.998782518 0.8804347826086957 +517.019071883 0.18478260869565216 +517.079939979 1 +517.100229344 0.5217391304347826 +517.181386805 0.9021739130434783 +517.282833631 0.358695652173913 +517.303122996 0.10869565217391304 +517.384280457 0.2391304347826087 +517.404569822 0.75 +517.465437918 0 +517.485727283 0.16304347826086957 +517.7089103 0.6413043478260869 +517.810357126 0.717391304347826 +517.891514587 0.717391304347826 +517.972672048 0.1956521739130435 +518.053829509 0.14130434782608695 +518.155276335 0.717391304347826 +518.317591257 0.18478260869565216 +518.743667926 1 +518.885693483 0.16304347826086957 +519.007429674 0.16304347826086957 +519.169744596 0.75 +519.352348883 0.2608695652173913 +519.433506344 0.22826086956521738 +519.555242535 0.30434782608695654 +519.737846822 0.6304347826086957 +519.819004283 0.5652173913043478 +519.981319204 0.043478260869565216 +520.062476665 0.043478260869565216 +520.366817143 0.7608695652173914 +520.569710796 0.07608695652173914 +520.650868256 0.09782608695652174 +521.076944926 0.7717391304347826 +521.279838578 0.1956521739130435 +521.360996039 0.21739130434782608 +521.503021596 0.6521739130434783 +521.563889691 0.4782608695652174 +521.584179056 0.03260869565217391 +521.665336517 0.21739130434782608 +521.665336517 0.5 +521.746493978 0.29347826086956524 +521.847940804 0.5760869565217391 +521.868230169 0.4782608695652174 +521.969676995 0.7282608695652174 +521.969676995 0.5760869565217391 +522.030545091 0.6086956521739131 +522.050834456 0.5543478260869565 +522.071123822 0.8913043478260869 +522.131991917 0.6847826086956522 +522.131991917 0.5 +522.152281282 0.2826086956521739 +522.233438743 0.3695652173913043 +522.253728108 0.532608695652174 +522.253728108 0.9239130434782609 +522.274017474 0.717391304347826 +522.355174935 1 +522.3754643 0.358695652173913 +522.476911126 0.358695652173913 +522.476911126 0.25 +522.558068587 0.2826086956521739 +522.598647317 0.358695652173913 +522.659515413 0.5978260869565217 +522.720383508 0.3695652173913043 +522.943566526 0 +523.024723987 0 +523.105881448 0.4891304347826087 +523.268196369 0.5217391304347826 +523.268196369 0.33695652173913043 +523.329064465 0.532608695652174 +523.369643195 0.3695652173913043 +523.430511291 0.6847826086956522 +523.917456056 0.4891304347826087 +523.963107128 0.42391304347826086 +524.290794988 0 +530.435490349 0 +788.589648091 0 +790.494108578 1 796.352819022 1 800.271133787 0 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 @@ -7,7 +7,8 @@ 396.080924858 0 398.708341012 0.22562539958160158 404.912196392 0.2221396499697582 406.345419665 0.06379096480078565 -452.479947611 0.056320099247309005 +435.991735813 0 +452.614951455 0 455.113979573 0.4254964070445256 472.218439039 0.40441069012205044 472.889858951 0 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 @@ -4,5 +4,8 @@ 112.804259873 1 146.735408106 1 154.861922153 0.9874095836823682 167.642585574 0 +744.33304903 0.0 +746.795011819 1 +790.615154437 0.9495265185587756 792.187777778 0 800.271133787 0 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,13 +1,19 @@ 0.0 0 146.915019344 0.0 148.560143792 0.28790723507883287 -155.849545435 0.46195652173913054 -243.805481621 0.46696339982076834 -247.196269875 0.6792366724893776 -292.841472553 0.6634993262003107 +155.917047357 0.8369565217391306 +243.940485465 0.6734851389512031 +246.993764109 0.8803236290111167 +292.74021967 0.831977587069876 294.02804759 0.36730947910714673 296.029865938 0.39706086643631755 296.192332283 0.2849462365591398 298.191733118 0 +570.679162876 0.0 +572.743573661 0 +603.207939102 0 +606.888596366 0.33152173913043476 +611.171122113 0.3245658213116895 +613.717488773 0 792.187777778 0 800.271133787 0 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 @@ -5,5 +5,8 @@ 105.94721796 1 114.234018618 0 472.687168858 0.0 473.310056348 0.6032608695652174 +570.16306018 0.6318489676852049 +582.941632917 0.5985134573920412 +584.631494428 0 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,11 +1,17 @@ 0.0 0 3.92083573932 0.0 -6.52096891381 1 -93.5410255644 1 +10.1730546526 0.6473684210526316 +93.5410255644 0.6473684210526316 94.7283643993 0 376.587192102 0.0 378.444276208 0.7580645161290323 404.098745345 0.7454840757628337 406.57783425 0 +611.175008209 0 +616.5184921 0.5543478260869567 +636.818149903 0.5547854745254244 +675.45101473 0.5386974109223996 +746.239550102 0.5131353157532719 +747.532964489 0.3928723813858309 792.187777778 0 800.271133787 0 diff --git a/show/dance2012/curves/song16-strobe b/show/dance2012/curves/song16-strobe new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song16-strobe @@ -0,0 +1,6 @@ +0 0 +583.53035568 0 +583.901501551 0.7989130434782608 +603.224681126 0.772512110819336 +605.60030662 0 +800.271133787 0 diff --git a/show/dance2012/curves/song16-upscoop b/show/dance2012/curves/song16-upscoop new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song16-upscoop @@ -0,0 +1,7 @@ +0 0 +572.505933111 0 +573.751543518 0.6739130434782609 +581.138860296 0.678945894558293 +582.895335341 0.6735037408228122 +583.612947764 0 +800.271133787 0 diff --git a/show/dance2012/curves/song16.markers b/show/dance2012/curves/song16.markers --- a/show/dance2012/curves/song16.markers +++ b/show/dance2012/curves/song16.markers @@ -48,11 +48,14 @@ 494.852188 'w' 498.507213 'w' 529.913342 'w' 531.487164 'w' +561.395137693 'q' 562.837952 'q' 569.583612 'q' 575.790063 'w' 580.26001 'w' +605.601012017 'w' 606.443197 'w' +609.128894296 'w' 610.888704 'q' 611.557579 'q' 615.766523 'w' 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,46 +1,46 @@ - "strobe(t)*chan(\"strobebright\")" . - . - "strobe" . - . - "chase(t, names=colors, ontime=.3) * chasecolors(t)" . - . - "chasecolors" . - . - "full(t)" . - . - "full" . - . - "backctr(t)" . - . - "backctr" . - . - "front(t)" . - . - "front" . - . + "stroberate" . "chan('strobespeed')*.97" . + . . - "stroberate" . - . + "chasecolors" . + "chase(t, names=colors, ontime=.3) * chasecolors(t)" . + . + . + "song15start" . "song15start(t)" . - . - "song15start" . . - "center(t)" . - . - "center" . - . + . + "timewarp" . "getsub('green')*(0 < timewarp(t) < 25) + getsub('orange') * .5 * (.25 < timewarp(t) < .5) + getsub('blue') * (.5 < timewarp(t) < .75) + getsub('red') * (.75 < timewarp(t) < 1) " . + . . - "timewarp" . - . + "front" . + "front(t)" . + . + . + . + . + . + . + . + . + . . - . - . . - . - . - . - . - . + "full" . + "full(t)" . + . + . + "center" . + "center(t)" . + . + . + "strobe" . + "strobe(t)*chan(\"strobebright\")" . + . + . + "backctr" . + "backctr(t)" . + . + . 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,81 @@ - "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)" . - . - . - "mids" . - "song16purple(t)" . - . - . - "song16purple" . - "front(t)" . - . - . - "front" . + . + . + "full(t)" . + "full" . + . + . + "cycmusic(t)*chan('cyc-mid')*((music(t+.15)-.2)*5)**2" . + "cycmusic" . + . + . + "song16red(t)" . + "song16red" . + . + . + "upscoop(t)" . + "upscoop" . + . + . + . + . + . . - . + . + . . - . + . + . . . - . - . - . - . - . - . . - "song16red(t)" . - . - . - "song16red" . - "cycmusic(t)*chan('cyc-mid')*((music(t+.15)-.2)*5)**2" . - . - . - "cycmusic" . - "song16goodgirl(t)" . + . + . + . + . + "chasefronts(t)*(chase(t, names=fronts, ontime=.5, offset=.4)+chase(t+15.67, names=fronts, ontime=.5, offset=.4))" . + "chasefronts" . + . + . + "centertighter(t)" . + "centertighter" . + . + . + "chasecolorsfast(t)*(chase(t, names=backcolors,ontime=.40,offset=.1)+chase(t+1, names=backcolors,ontime=.40,offset=.1))" . + "chasecolorsfast" . + . + . + "mids(t)" . + "mids" . + . + . + "song16blue(t)" . + "song16blue" . . . + "song16goodgirl(t)" . "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))" . + . + . + "chan('strobespeed')*.99" . + "stroberate" . + . + . + "song16purple(t)" . + "song16purple" . + . + . + "front(t)" . + "front" . . . + "chasescoop(t)*(chase(t, names=scoop, ontime=.2, offset=.1)+chase(t+123.45, names=scoop, ontime=.2, offset=.1))" . "chasescoop" . + . + . + "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" . + . + . + "strobe(t)*chan('strobebright')" . + "strobe" .