# HG changeset patch # User drewp@bigasterisk.com # Date 2010-06-20 20:01:51 # Node ID a17b39ab488cdf7f315cd7b0a97ad366f17c71f6 # Parent a566eb09a4c1592d3b649eeb4e7dff0f16ce39e4 cp Ignore-this: 3bb3f012d7f5ae3465792a0f9b1cb70 diff --git a/show/dance2010/curves/song1-song01 b/show/dance2010/curves/song1-song01 --- a/show/dance2010/curves/song1-song01 +++ b/show/dance2010/curves/song1-song01 @@ -1,9 +1,9 @@ -0 0 -29.5002604501 0 -33.9372914935 1 -76.7767635539 1 +0.0 0.0 +34.3331910242 0 +39.6497668743 1 +76.7767635539 1.0 79.0800664605 0.159574468085 89.5728908129 0.159574468085 -92.541592337 1 -139.273049087 1 -211.136099773 0 +92.541592337 1.0 +212.451008121 1 +215.126053859 0 diff --git a/show/dance2010/curves/song1-song01center b/show/dance2010/curves/song1-song01center --- a/show/dance2010/curves/song1-song01center +++ b/show/dance2010/curves/song1-song01center @@ -1,8 +1,8 @@ -0 0 -29.0216166234 0 -77.5596099071 0 -80.7691552587 1 -92.0297472466 1 -94.3842346623 0 -115.676990421 0 -211.136099773 0 +0.0 0.0 +29.0216166234 0.0 +74.8482251429 0 +76.7989132826 1 +92.0297472466 1.0 +94.3842346623 0.0 +115.676990421 0.0 +211.136099773 0.0 diff --git a/show/dance2010/curves/song1-song01dim b/show/dance2010/curves/song1-song01dim --- a/show/dance2010/curves/song1-song01dim +++ b/show/dance2010/curves/song1-song01dim @@ -1,6 +1,6 @@ -0 0 -2.76396348794 0 -5.9885875572 1 -31.6320265842 1 -35.624418289 0 -211.136099773 0 +0.0 0.0 +2.76396348794 0.0 +5.9885875572 1.0 +39.0071192927 1 +44.4752829615 0 +211.136099773 0.0 diff --git a/show/dance2010/curves/song17-full b/show/dance2010/curves/song17-full --- a/show/dance2010/curves/song17-full +++ b/show/dance2010/curves/song17-full @@ -1,3 +1,3 @@ -0 0 -3.13174232467 0 -226.704852608 0 +0.0 0.0 +3.13174232467 0.0 +226.704852608 0.0 diff --git a/show/dance2010/curves/song17-patios b/show/dance2010/curves/song17-patios --- a/show/dance2010/curves/song17-patios +++ b/show/dance2010/curves/song17-patios @@ -1,6 +1,6 @@ -0 0 -150.219682739 0 +0.0 0.0 +150.219682739 0.0 152.795420718 0.5 -155.869897095 1 -223.044786383 1 -226.704852608 0 +155.869897095 1.0 +223.044786383 1.0 +226.704852608 0.0 diff --git a/show/dance2010/curves/song17-song17 b/show/dance2010/curves/song17-song17 --- a/show/dance2010/curves/song17-song17 +++ b/show/dance2010/curves/song17-song17 @@ -1,5 +1,5 @@ -0 0 +0.0 0.0 3.2401339008 0.0106382978723 -6.44542765213 1 -223.098897137 1 -226.704852608 0 +6.44542765213 1.0 +223.098897137 1.0 +226.704852608 0.0 diff --git a/show/dance2010/curves/song17-stack1 b/show/dance2010/curves/song17-stack1 --- a/show/dance2010/curves/song17-stack1 +++ b/show/dance2010/curves/song17-stack1 @@ -1,3 +1,3 @@ 0.0 0.0 -110.779928263 0 +110.779928263 0.0 221.704852608 0.0 diff --git a/show/dance2010/curves/song2-full b/show/dance2010/curves/song2-full new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song2-full @@ -0,0 +1,6 @@ +0 0 +125.35236859 0 +134.504990559 1 +139.945160559 1 +142.727500015 0 +143.414875283 0 diff --git a/show/dance2010/curves/song2-song02 b/show/dance2010/curves/song2-song02 new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song2-song02 @@ -0,0 +1,6 @@ +0 0 +3.60308646982 0 +8.57345206415 1 +139.800589112 1 +142.567112453 0 +143.414875283 0 diff --git a/show/dance2010/curves/song3-bluered b/show/dance2010/curves/song3-bluered --- a/show/dance2010/curves/song3-bluered +++ b/show/dance2010/curves/song3-bluered @@ -173,31 +173,18 @@ 70.654311 0.574803149606 71.293278 0.244094488189 71.931653 0.228346456693 84.035697 0.220472440945 -84.168079 0.236220472441 -84.29305 0.251968503937 -84.944258 0.267716535433 -85.962745 0.141732283465 -86.634467 0.0157480314961 -89.803218 0.0 +90.6971125882 0.617021276596 98.172631 0.00787401574803 98.322802 0.0708661417323 98.435305 0.212598425197 98.574049 0.354330708661 99.196042 0.44094488189 -129.265487 0.377952755906 -129.374312 0.133858267717 -129.985622 0.00787401574803 -180.109079 0.0157480314961 -180.247286 0.299212598425 +121.216767359 0.404255319149 +125.123509126 1.0 +129.17463254 1.0 +131.191401194 1.0 +135.255180663 1.0 180.410902 0.574803149606 -181.064867 0.582677165354 -181.900951 0.566929133858 -182.024173 0.543307086614 -182.875934 0.527559055118 -189.484211 0.496062992126 -189.62144 0.472440944882 -189.724685 0.464566929134 -190.313311 0.464566929134 191.626553 0.472440944882 253.057750347 0.702127659574 253.536643652 0.031914893617 diff --git a/show/dance2010/curves/song3-blueright b/show/dance2010/curves/song3-blueright new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song3-blueright @@ -0,0 +1,22 @@ +0 0 +93.8987464425 0 +127.936473824 0 +128.009861092 0.265957446809 +128.642127996 0.276595744681 +128.772941838 0.489361702128 +129.317999514 0.478723404255 +129.996193 1.0 +131.143242 1.0 +131.609013 0.0 +136.157223 0.0 +136.403204 1.0 +138.043231 1.0 +138.154534 0.0 +268.822383 1.0 +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 diff --git a/show/dance2010/curves/song3-bredc b/show/dance2010/curves/song3-bredc --- a/show/dance2010/curves/song3-bredc +++ b/show/dance2010/curves/song3-bredc @@ -1,4 +1,9 @@ 0.0 0.0 +4.84522207609 0.0 +5.29080672599 0.425531914894 +10.430359947 0.425531914894 +11.8981562807 0.0 +75.9599807749 0.0 155.132032 0.00787401574803 155.228567 0.0393700787402 155.338137 0.181102362205 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 @@ -1,10 +1,10 @@ 0.0 0.0 -4.04546824623 0 -4.43157118067 1 -4.95027512291 1 +4.04546824623 0.0 +4.43157118067 1.0 +4.95027512291 1.0 5.22717722741 0.329787234043 8.68000346946 0.510638297872 -13.7127814838 1 +13.7127814838 1.0 31.381366 0.992125984252 31.484199 0.984251968504 31.640861 0.937007874016 @@ -19,19 +19,8 @@ 51.03758 0.0708661417323 51.652793 0.0551181102362 74.084781 0.102362204724 74.463728 0.102362204724 -82.208398 0.133858267717 -85.830879 0.370078740157 -85.962745 0.535433070866 -86.077813 0.629921259843 -86.218187 0.677165354331 -86.329601 0.740157480315 -86.43839 0.787401574803 -86.560703 0.818897637795 -86.713888 0.850393700787 -86.823 0.874015748031 -86.956861 0.913385826772 -87.072252 0.944881889764 -87.165352 0.976377952756 +79.3369484091 0.633858267717 +85.7770393202 0.572206399731 87.342985 1.0 88.23573 0.968503937008 88.344025 0.826771653543 @@ -74,11 +63,9 @@ 156.120344 0.00787401574803 159.709894 0.0 161.699308 0.0314960629921 168.156478 0.173228346457 -201.111371425 1.0 -201.199063 0.952755905512 -201.324898 0.0551181102362 -201.974791 0.0 -228.177888 0.0314960629921 +203.727648268 1 +204.656474765 0 +228.104305214 0 228.294322 0.574803149606 232.735763983 0.0 233.046896 0.937007874016 diff --git a/show/dance2010/curves/song3-chscoop b/show/dance2010/curves/song3-chscoop --- a/show/dance2010/curves/song3-chscoop +++ b/show/dance2010/curves/song3-chscoop @@ -37,16 +37,8 @@ 102.10679 0.472440944882 102.98581 0.0 127.732898067 0.0425531914894 156.787385 0.00787401574803 -170.475241134 1.0 -170.859766 0.992125984252 -179.845775 0.984251968504 -179.970875 0.96062992126 -180.109079 0.834645669291 -180.247286 0.48031496063 -180.410902 0.0866141732283 -180.51696 0.00787401574803 -197.652453489 1.0 -197.918118 0.984251968504 +170.622406706 0.627659574468 +197.652453489 0.63829787234 201.199063 0.96062992126 202.008875 0.0 210.993994099 0.0 diff --git a/show/dance2010/curves/song3-leftred b/show/dance2010/curves/song3-leftred new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song3-leftred @@ -0,0 +1,2 @@ +0 0 +347.927006803 0 diff --git a/show/dance2010/curves/song3-redblue b/show/dance2010/curves/song3-redblue --- a/show/dance2010/curves/song3-redblue +++ b/show/dance2010/curves/song3-redblue @@ -202,6 +202,8 @@ 98.435305 0.228346456693 98.574049 0.338582677165 98.677335 0.448818897638 99.411977 0.433070866142 +116.950640852 0.404255319149 +118.716627721 0.425531914894 129.265487 0.370078740157 129.374312 0.133858267717 129.639062 0.11811023622 @@ -238,8 +240,12 @@ 257.488916 0.393700787402 258.613954 0.393700787402 258.722624 0.590551181102 258.836896 0.826771653543 +270.76125512 0.914893617021 +270.810310311 0.276595744681 +280.327017329 0.297872340426 +284.00615664 0.787234042553 299.025508196 0.664349137209 -306.26554591 0.36170212766 +306.477071628 0.648936170213 306.880088286 0.0 307.661653 0.0 320.589233 0.0 diff --git a/show/dance2010/curves/song3-redleft b/show/dance2010/curves/song3-redleft new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song3-redleft @@ -0,0 +1,15 @@ +0 0 +132.769418 0.0 +133.029129 1.0 +133.868011 1.0 +134.321398 0.0 +139.552935 0.0 +139.670343 1.0 +140.740192 1.0 +140.819762 0.0 +271.682453 0.0 +271.772392 1.0 +275.445757 1.0 +281.38858 1.0 +306.082848265 0 +347.927006803 0 diff --git a/show/dance2010/curves/song4-full b/show/dance2010/curves/song4-full --- a/show/dance2010/curves/song4-full +++ b/show/dance2010/curves/song4-full @@ -1,7 +1,6 @@ -0 0 -153.530380894 0 -155.974909446 1 -157.012450407 1 -157.244642832 1 -159.947902396 0 -161.0369161 0 +0.0 0.0 +153.530380894 0.0 +156.02020427 1 +162.634726836 0.989361702128 +165.315338989 0 +165.906109633 0 diff --git a/show/dance2010/curves/song4-song04 b/show/dance2010/curves/song4-song04 --- a/show/dance2010/curves/song4-song04 +++ b/show/dance2010/curves/song4-song04 @@ -1,7 +1,7 @@ -0 0 -2.58220629387 0 -7.2355014291 1 -126.346687055 1 -157.237926629 1 -159.918695132 0 -161.0369161 0 +0.0 0.0 +2.58220629387 0.0 +7.2355014291 1.0 +126.346687055 1.0 +162.58271581 1 +165.240836901 0 +165.815519986 0 diff --git a/show/dance2010/curves/song5-blacklight b/show/dance2010/curves/song5-blacklight new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song5-blacklight @@ -0,0 +1,6 @@ +0 0 +179.129744256 0 +179.157922972 0.553191489362 +211.631378634 0.531914893617 +211.642569688 0 +241.586666667 0 diff --git a/show/dance2010/curves/song5-full b/show/dance2010/curves/song5-full --- a/show/dance2010/curves/song5-full +++ b/show/dance2010/curves/song5-full @@ -1,6 +1,6 @@ 0.0 0.0 230.52105332 0.0 232.608146084 1.0 -233.768453165 1.0 -235.642167398 0 -236.586666667 0.0 +238.134450606 1 +240.491897509 0 +241.027084518 0 diff --git a/show/dance2010/curves/song5-song05 b/show/dance2010/curves/song5-song05 --- a/show/dance2010/curves/song5-song05 +++ b/show/dance2010/curves/song5-song05 @@ -1,6 +1,24 @@ 0.0 0.0 3.10867680959 0.0 6.76759831714 1.0 -233.781803071 1 -235.663928554 0 -236.586666667 0.0 +179.596841 0.984251968504 +179.762631476 0.950829284637 +180.407884 0.48031496063 +180.51219 0.409448818898 +180.620313 0.354330708661 +180.72581 0.330708661417 +180.829227 0.307086614173 +180.941707 0.299212598425 +181.058646 0.283464566929 +185.762191937 0.272156140057 +194.116906979 0.187049757078 +195.947093 0.220472440945 +197.239995 0.377952755906 +200.003147 0.535433070866 +203.059587 0.685039370079 +205.478771 0.811023622047 +207.24509 0.92125984252 +208.757109 1.0 +238.13539711 1 +240.526062067 0 +241.113908331 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,10 +1,40 @@ -0 0 -97.4408472935 0 +0.0 0.0 +26.5465808893 0 +30.3366888613 0.340425531915 +35.0367392483 0 +39.512082 0.0 +39.876786 0.5 +40.689827 0.0 +42.852203 0.0 +43.34321 0.5 +44.17169 0.0 +46.193483 0.0 +46.490016 0.5 +47.22747 0.0 +49.441006 0.0 +49.665637 0.5 +50.294901 0.5 +50.381083 0.0 +52.63624 0.0 +52.909661 0.5 +53.624134 0.0 +55.9812398784 0.0106382978723 +56.6142432975 0.468085106383 +57.6270487681 0 +97.4408472935 0.0 113.197118621 0.393617021277 136.521831483 0.36170212766 139.178211459 0.234042553191 146.825365934 0.521276595745 -179.288028554 0.595744680851 -185.123461732 0.308510638298 -190.420313426 0 -297.085056689 0 +161.63778448 0.925531914894 +173.393981953 1 +182.673813426 0.81914893617 +186.722304588 0.36170212766 +190.420313426 0.0 +258.499172249 0 +264.8396623 0.531914893617 +281.029844444 0.734042553191 +284.220028117 0.63829787234 +285.695488066 0.585106382979 +287.888739342 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 @@ -1,6 +1,6 @@ -0 0 -292.743245323 0 +0.0 0.0 +292.743245323 0.0 294.317672669 0.446808510638 -294.540812305 0.446808510638 -296.28472138 0 -297.085056689 0 +298.388158044 0.446808510638 +300.108216855 0 +301.592756618 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 -283.876328947 0 -286.578762839 1 -294.449034287 1 -296.292476273 0 -297.085056689 0 +0.0 0.0 +283.876328947 0.0 +286.578762839 1.0 +298.516518471 1 +300.997997192 0 +301.591191128 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,9 +1,9 @@ -0 0 -145.859409579 0 -155.840958579 0.893617021277 +0.0 0.0 +145.859409579 0.0 +150.197983792 1 167.190945749 0.627659574468 182.656152702 0.627659574468 -190.249489968 1 -287.104281975 1 -289.541075031 0 -297.085056689 0 +190.249489968 1.0 +287.104281975 1.0 +289.541075031 0.0 +297.085056689 0.0 diff --git a/show/dance2010/curves/song6-song06open b/show/dance2010/curves/song6-song06open --- a/show/dance2010/curves/song6-song06open +++ b/show/dance2010/curves/song6-song06open @@ -1,8 +1,8 @@ -0 0 +0.0 0.0 3.49270121972 0.0106382978723 11.5053687238 0.31914893617 13.4077114361 0.712765957447 -23.7640651616 1 -187.499879494 1 -189.04701497 0 -297.085056689 0 +23.7640651616 1.0 +187.499879494 1.0 +189.04701497 0.0 +297.085056689 0.0 diff --git a/show/dance2010/curves/song7-bredc b/show/dance2010/curves/song7-bredc new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-bredc @@ -0,0 +1,6 @@ +0.0 0.0 +278.366002896 0.031914893617 +284.953103754 0.468085106383 +307.398040008 0.531914893617 +313.497207469 0.0 +344.968911565 0.0 diff --git a/show/dance2010/curves/song7-chcolor b/show/dance2010/curves/song7-chcolor new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-chcolor @@ -0,0 +1,7 @@ +0.0 0.0 +136.621351115 0.989361702128 +227.864896323 0.553191489362 +232.941518 0.5 +233.047917 1.0 +251.081392 0.0 +344.968911565 0.0 diff --git a/show/dance2010/curves/song7-chscoop b/show/dance2010/curves/song7-chscoop new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-chscoop @@ -0,0 +1,9 @@ +0.0 0.0 +197.369059021 0.904255319149 +208.34756045 0.0 +239.07706 0.0 +239.1786 0.5 +251.615485 0.0 +254.596512 1.0 +278.366002896 1.0 +344.968911565 0.0 diff --git a/show/dance2010/curves/song7-chscoop2 b/show/dance2010/curves/song7-chscoop2 new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-chscoop2 @@ -0,0 +1,5 @@ +0.0 0.0 +252.017599467 0.031914893617 +262.31870119 1.0 +293.491938198 0.0 +344.968911565 0.0 diff --git a/show/dance2010/curves/song7-full b/show/dance2010/curves/song7-full new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-full @@ -0,0 +1,5 @@ +0.0 0.0 +332.429282623 0.0 +335.046371851 0.792553191489 +341.580089829 0.755319148936 +344.968911565 0.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,5 +1,7 @@ -0 0 -4.9373078443 0 -25.3918689135 1 -52.1943972112 0 -339.968911565 0 +0.0 0.0 +4.9373078443 0.0 +25.3918689135 1.0 +52.1943972112 0.0 +213.958794514 0.063829787234 +226.401096133 1.0 +339.968911565 0.0 diff --git a/show/dance2010/curves/song8-full b/show/dance2010/curves/song8-full --- a/show/dance2010/curves/song8-full +++ b/show/dance2010/curves/song8-full @@ -1,6 +1,6 @@ 0.0 0.0 -271.181738585 0.0 +269.80213627 0 271.9305142 0.808510638298 277.022733509 0.797872340426 -279.397939955 0 -279.64853652 0 +279.397939955 0.0 +279.64853652 0.0 diff --git a/show/dance2010/curves/song8-song08 b/show/dance2010/curves/song8-song08 --- a/show/dance2010/curves/song8-song08 +++ b/show/dance2010/curves/song8-song08 @@ -7,6 +7,6 @@ 107.480558353 0.0 212.96895523 0.0 229.522649531 0.0 231.838212265 1.0 -277.044349163 1 -279.25161887 0 -279.679441833 0 +277.044349163 1.0 +279.25161887 0.0 +279.679441833 0.0 diff --git a/show/dance2010/curves/song8-song08rain b/show/dance2010/curves/song8-song08rain --- a/show/dance2010/curves/song8-song08rain +++ b/show/dance2010/curves/song8-song08rain @@ -4,5 +4,5 @@ 103.936218629 1.0 231.511318182 1.0 233.078693184 0.563829787234 277.046131005 0.574468085107 -279.324420049 0 -279.718073474 0 +279.324420049 0.0 +279.718073474 0.0 diff --git a/show/dance2010/curves/song9-chs1 b/show/dance2010/curves/song9-chs1 --- a/show/dance2010/curves/song9-chs1 +++ b/show/dance2010/curves/song9-chs1 @@ -1,6 +1,6 @@ -0 0 -4.26607653296 0 -6.66574458276 1 -174.877304085 1 -177.551868144 0 -192.773333333 0 +0.0 0.0 +4.26607653296 0.0 +6.66574458276 1.0 +174.877304085 1.0 +177.551868144 0.0 +192.773333333 0.0 diff --git a/show/dance2010/curves/song9-chs2 b/show/dance2010/curves/song9-chs2 --- a/show/dance2010/curves/song9-chs2 +++ b/show/dance2010/curves/song9-chs2 @@ -1,6 +1,6 @@ -0 0 -4.30228551588 0 -6.76614221721 1 -174.832291196 1 -177.609379978 0 -192.773333333 0 +0.0 0.0 +4.30228551588 0.0 +6.76614221721 1.0 +174.832291196 1.0 +177.609379978 0.0 +192.773333333 0.0 diff --git a/show/dance2010/curves/song9-full b/show/dance2010/curves/song9-full --- a/show/dance2010/curves/song9-full +++ b/show/dance2010/curves/song9-full @@ -1,6 +1,6 @@ -0 0 -174.816969531 0 -175.738652733 0.808510638298 +0.0 0.0 +174.816969531 0.0 +177.179173936 0.808510638298 188.98455703 0.808510638298 -192.081775267 0 -192.773333333 0 +192.081775267 0.0 +192.773333333 0.0 diff --git a/show/dance2010/curves/song9-song09 b/show/dance2010/curves/song9-song09 --- a/show/dance2010/curves/song9-song09 +++ b/show/dance2010/curves/song9-song09 @@ -1,9 +1,14 @@ -0 0 -3.69002453199 0 -4.58043633921 1 +0.0 0.0 +3.69002453199 0.0 +4.58043633921 1.0 8.7757407692 0.382978723404 -144.780518757 0.36170212766 -175.454435492 0.372340425532 +110.627951463 0.340425531915 +115.168650964 0.787234042553 +122.461289555 0.797872340426 +124.662840828 1 +132.230673329 1 +141.615788802 0.606382978724 +174.766450719 0.585106382979 189.243261307 0.478723404255 -192.102731572 0 -192.773333333 0 +192.102731572 0.0 +192.773333333 0.0 diff --git a/show/dance2010/curves/song9-t1 b/show/dance2010/curves/song9-t1 new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song9-t1 @@ -0,0 +1,2 @@ +0 0 +192.773333333 0 diff --git a/show/dance2010/readme b/show/dance2010/readme --- a/show/dance2010/readme +++ b/show/dance2010/readme @@ -73,12 +73,24 @@ for 2011: - asco stops considerably after the autostop time (according to curvecalc) - CC should support zoom-crushing towards the left as well - vidref's replay 'enabled' button should be completely sticky across sessions - +- audio process pipeline; RDF graph should track versions of songs (padded, normalized) +- vidref can loop like this if asco goes down: + File "/home/drewp/projects/light9/light9/vidref/main.py", line 168, in updateLoop + self.replayViews.update(position) + File "/home/drewp/projects/light9/light9/vidref/replay.py", line 42, in update + self.loadViewsForSong(position['song']) + File "/home/drewp/projects/light9/light9/vidref/replay.py", line 57, in loadViewsForSong + d = songDir(song) + File "/home/drewp/projects/light9/light9/vidref/replay.py", line 10, in songDir + safeUri = song.split('://')[-1].replace('/','_') + 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) #3: 306 horns- strobe. 255 light the sides. r first -4 louder +#4 louder #5 test blacklight @@ -88,18 +100,20 @@ 245 light change as they turn #8 test BL -10 louder +#10 louder #11 test BL 112 strobe? with the sound effect 180 challenge R then L 191 busy before the end, then light their line -14 test BL +#14 test BL 146 darker before kick line, so we can get brighter on it at this time -16 softer beginning +#16 softer beginning 587 strobe to 595 655 fade as they sit + how to normalize audio: + plus(pts/0):~/projects/light9/show/dance2008/music/norm% normalize-audio -v --mix *.wav diff --git a/show/dance2010/subs/song02 b/show/dance2010/subs/song02 new file mode 100644 --- /dev/null +++ b/show/dance2010/subs/song02 @@ -0,0 +1,49 @@ +_:UoBkHSda1853 "1.0"^^. +_:UoBkHSda1853 . +_:UoBkHSda1844 "0.59535"^^. +_:UoBkHSda1844 . + _:UoBkHSda1853. + _:UoBkHSda1844. + _:UoBkHSda1851. + _:UoBkHSda1856. + _:UoBkHSda1842. + _:UoBkHSda1857. + _:UoBkHSda1847. + _:UoBkHSda1845. + _:UoBkHSda1850. + _:UoBkHSda1849. + _:UoBkHSda1855. + _:UoBkHSda1843. + _:UoBkHSda1854. + _:UoBkHSda1852. + _:UoBkHSda1848. + _:UoBkHSda1846. + "song02". +_:UoBkHSda1851 "1.0"^^. +_:UoBkHSda1851 . +_:UoBkHSda1856 "0.26"^^. +_:UoBkHSda1856 . +_:UoBkHSda1842 "0.26"^^. +_:UoBkHSda1842 . +_:UoBkHSda1857 "0.4779"^^. +_:UoBkHSda1857 . +_:UoBkHSda1847 "0.835"^^. +_:UoBkHSda1847 . +_:UoBkHSda1845 "0.81"^^. +_:UoBkHSda1845 . +_:UoBkHSda1850 "1.0"^^. +_:UoBkHSda1850 . +_:UoBkHSda1849 "0.81"^^. +_:UoBkHSda1849 . +_:UoBkHSda1855 "0.5346"^^. +_:UoBkHSda1855 . +_:UoBkHSda1843 "0.26"^^. +_:UoBkHSda1843 . +_:UoBkHSda1854 "0.81"^^. +_:UoBkHSda1854 . +_:UoBkHSda1852 "0.81"^^. +_:UoBkHSda1852 . +_:UoBkHSda1848 "0.26"^^. +_:UoBkHSda1848 . +_:UoBkHSda1846 "0.81"^^. +_:UoBkHSda1846 . diff --git a/show/dance2010/subterms/song1.n3 b/show/dance2010/subterms/song1.n3 --- a/show/dance2010/subterms/song1.n3 +++ b/show/dance2010/subterms/song1.n3 @@ -1,25 +1,20 @@ + . + . + . . - . - . - . - . + "song01". + . + . + "song01(t)". + "house". . - "house". + . "house(t)". - . + "song01center". + . + . + "song01center(t)". + "song01dim". . - "song01dim". - "song01dim(t)". . - . - "song01center". - "song01center(t)". - . - . - "song01". - "song01(t)". - . - . - "". - "". - . + "song01dim(t)". diff --git a/show/dance2010/subterms/song16.n3 b/show/dance2010/subterms/song16.n3 --- a/show/dance2010/subterms/song16.n3 +++ b/show/dance2010/subterms/song16.n3 @@ -1,41 +1,40 @@ - "song16one23(t)". - . - "song16one23". - . - "song16poison(t)". - . - "song16poison". - . - . - . - . - . - . - . - . - . + "chscolor(t)*chase(t, names=colors+back, ontime=.3, offset=-.2, random=1)". + . + . + "chscolor". + "cyc(t)". + . + . + "cyc". "full(t)". + . . "full". - . - "cyc(t)". - . - "cyc". - . "song16blue(t)". + . . "song16blue". - . + "song16ltred(t)". + . + . + "song16ltred". + "song16one23(t)". + . + . + "song16one23". + "song16poison(t)". + . + . + "song16poison". "song16tightred(t)". + . . "song16tightred". - . - "chscoop(t)*chase(t, names=scoop, ontime=.4, offset=.1)". - "chscolor(t)*chase(t, names=colors+back, ontime=.3, offset=-.2, random=1)". - . - "". - . - "song16ltred(t)". - . - "song16ltred". - . + . + . + . + . + . + . + . + . 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)". - "full". . - . - "song17(t)". - "song17". - . - . - "patios(t)". - "patios". - . - . . . . + . + "patios". + "patios(t)". + . + . + "song17". + "song17(t)". + . diff --git a/show/dance2010/subterms/song2.n3 b/show/dance2010/subterms/song2.n3 --- a/show/dance2010/subterms/song2.n3 +++ b/show/dance2010/subterms/song2.n3 @@ -0,0 +1,10 @@ + "song02(t)". + . + "song02". + . + . + . + "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,46 +1,60 @@ - . - . - "down". + "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)". - . - . - "". - "ch1(t)*chase(t,names=back,random=1,ontime=.3,offset=-.1)". - "chscoop(t)*chase(t, names=scoop, ontime=.2, offset=.1, random=1)". - . - . - "up". - "up(t)". + . + . + "down". + "full(t)". + . . - . "full". - "full(t)". - . - . - "cyc". - "cyc(t)". - . + "leftred(t)". + . + . + "leftred". + "redblue(t)". + . + . + "redblue". + "redleft(t)". + . + . + "redleft". + "strobe(t)". . + . "strobe". - "strobe(t)". - . - . - . - . - . - . - . + "up(t)". + . + . + "up". + . . + . . - . - . - "redblue". - "redblue(t)". - . - . - "bluered". - "bluered(t)". - . - . - "bredc". - "bredc(t)". + . + . + . + . + . + . + . + . diff --git a/show/dance2010/subterms/song4.n3 b/show/dance2010/subterms/song4.n3 --- a/show/dance2010/subterms/song4.n3 +++ b/show/dance2010/subterms/song4.n3 @@ -1,10 +1,10 @@ + "song04". + . "song04(t)". . - . - "song04". + . + . + "full". + . "full(t)". . - . - "full". - . - . diff --git a/show/dance2010/subterms/song5.n3 b/show/dance2010/subterms/song5.n3 --- a/show/dance2010/subterms/song5.n3 +++ b/show/dance2010/subterms/song5.n3 @@ -1,10 +1,15 @@ - . - . . - "full". "full(t)". + "full". . + . + . + . . + "song05(t)". "song05". - "song05(t)". . + . + "blacklight(t)>0". + "blacklight". + . 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,7 +1,11 @@ - "song06open(t)". - . - . - "song06open". + "chcol(t)*chase(t, names=back, ontime=2.5, offset=-1.4 )". + . + . + "chcol". + "full(t)". + . + . + "full". "song06center(t)". . . @@ -10,16 +14,12 @@ . . "song06color". - "chcol(t)*chase(t, names=back, ontime=2.5, offset=-1.4 )". - . - . - "chcol". - . - . + "song06open(t)". + . + . + "song06open". + . . + . . - . - "full(t)". - . - . - "full". + . 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,10 +1,30 @@ - "". - . - "". - . + . + "chscoop2(t)*chase(t+.08, names=scoop, ontime=.15,offset=-.05,random=2)". + . + "chscoop2". + . + "full(t)". + . + "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". - . - "song07bk(t)". - . - . - . diff --git a/show/dance2010/subterms/song8.n3 b/show/dance2010/subterms/song8.n3 --- a/show/dance2010/subterms/song8.n3 +++ b/show/dance2010/subterms/song8.n3 @@ -1,15 +1,15 @@ + "full". + . + "full(t)". + . + "song08rain". + . + "song08rain(t)". + . + . + . + . + "song08". . "song08(t)". . - "song08". - . - . - . - . - "song08rain(t)". - . - "song08rain". - . - "full(t)". - . - "full". diff --git a/show/dance2010/subterms/song9.n3 b/show/dance2010/subterms/song9.n3 --- a/show/dance2010/subterms/song9.n3 +++ b/show/dance2010/subterms/song9.n3 @@ -1,20 +1,25 @@ - . . "song09". "song09(t)". - . + . + . + "chs2". + "chs2(t)*chase(t, names=back, ontime=1, offset=.08, random=1)". + . + . + "chs1". + "chs1(t)*chase(t, names=colors, ontime=.3, offset=.1)". + . . "full". "full(t)". - . - . - "chs1". - "chs1(t)*chase(t, names=colors, ontime=.3, offset=.1)". - . + . + . + "t1". + "t1(t)". + . . + . + . + . . - . - . - . - "chs2". - "chs2(t)*chase(t, names=back, ontime=1, offset=.08, random=1)".