Mercurial > code > home > repos > light9

changeset 999:995155e1dc74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkpoint Ignore-this: c21791305b5f932986938771efa4f414
author drewp@bigasterisk.com
date Sun, 16 Jun 2013 21:11:16 +0000
parents 08814a44ae4e
children 1627032629dc
files show/dance2013/curves/song10-full show/dance2013/curves/song10-song10 show/dance2013/curves/song11-center show/dance2013/curves/song11-chase1 show/dance2013/curves/song11-cyc show/dance2013/curves/song11-full show/dance2013/curves/song11-orange show/dance2013/curves/song11-song11orange show/dance2013/curves/song11-stacrainbow_env show/dance2013/curves/song11-upscoop show/dance2013/curves/song16-backchase_env show/dance2013/curves/song16-blue show/dance2013/curves/song16-bumpyhues_env show/dance2013/curves/song16-center show/dance2013/curves/song16-chase150 show/dance2013/curves/song16-colorrb_env show/dance2013/curves/song16-cyc show/dance2013/curves/song16-downcp show/dance2013/curves/song16-frontpulse show/dance2013/curves/song16-full show/dance2013/curves/song16-lightning show/dance2013/curves/song16-pulserainbow_env show/dance2013/curves/song16.markers show/dance2013/song11.n3 show/dance2013/song16.n3
diffstat 25 files changed, 237 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/show/dance2013/curves/song10-full	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song10-full	Sun Jun 16 21:11:16 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 134.291867435 0
 139.473948367 1
 143.081517513 1
--- a/show/dance2013/curves/song10-song10	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song10-song10	Sun Jun 16 21:11:16 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 3.72452710798 0
 4.72623103512 0.3284613868578633
 10.5389861759 1
--- a/show/dance2013/curves/song11-center	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song11-center	Sun Jun 16 21:11:16 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 53.767473 0
 55.4102189415 0.425
 74.803726 0.5
--- a/show/dance2013/curves/song11-chase1	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song11-chase1	Sun Jun 16 21:11:16 2013 +0000
@@ -1,11 +1,12 @@
-0 0
+0.0 0
 20.303465 0.0
 20.409583 1.0
 29.340137 1.0
 29.396774 0.0
 37.4700379749 0
 129.671592093 0
-131.115060651 0.9513274336283185
+129.965356845 1
+144.916228678 1
 161.427900361 1
 163.953970337 0
 187.290045351 0
--- a/show/dance2013/curves/song11-cyc	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song11-cyc	Sun Jun 16 21:11:16 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 44.201392 0
 44.701392 1
 48.1757631106 0.9756336073805599
--- a/show/dance2013/curves/song11-full	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song11-full	Sun Jun 16 21:11:16 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 169.066254811 0.0
 172.674926206 0.42613636363636365
 183.019784202 0.42613636363636365
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song11-orange	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,7 @@
+0.0 0
+3.66563404487 0
+4.16563404487 1
+47.2334249397 1
+129.81332221 1
+130.163679799 0
+187.290045351 0
--- a/show/dance2013/curves/song11-song11orange	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song11-song11orange	Sun Jun 16 21:11:16 2013 +0000
@@ -1,8 +1,11 @@
-0 0
+0.0 0
 101.341774 0
 103.70625422 0.46363636363636357
 113.07170368 0.4896685482441475
-162.274595105 1
+130.116065798 0.2782969629566048
+130.580646357 0
+131.477767437 0.3601125839308933
+133.17588948 0.4188938411654161
 168.160583399 1
 183.436556484 1
 187.290045351 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song11-stacrainbow_env	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,6 @@
+0 0
+129.83802346 0
+130.33802346 1
+159.374486335 1
+168.71674513 0
+187.290045351 0
--- a/show/dance2013/curves/song11-upscoop	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song11-upscoop	Sun Jun 16 21:11:16 2013 +0000
@@ -1,12 +1,12 @@
-0 0
+0.0 0
 36.639441 0
 42.1314364284 0
 80.2929385177 0.0
 83.865273 0.5
 113.101969 0.5
-130.458397 0.5
-132.589937 0.5
-133.70828 0.5
+130.02585648 0.5333333333333332
+130.779674822 0
+132.763098863 0
 151.863753312 0.324402510152214
 166.394786911 0.3587391525311754
 183.436556484 0.3406986646482433
--- a/show/dance2013/curves/song16-backchase_env	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song16-backchase_env	Sun Jun 16 21:11:16 2013 +0000
@@ -1,4 +1,11 @@
 0.0 0
+91.2156871095 0
+91.9847690131 0.8020833333333334
+145.361278077 0.7855405686682989
+147.339447054 0
+183.685020214 0
+188.474559512 0
 488.047903822 0
-488.547903822 1
+488.547903822 0
+546.727271224 0
 583.967687075 0
--- a/show/dance2013/curves/song16-blue	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song16-blue	Sun Jun 16 21:11:16 2013 +0000
@@ -1,6 +1,7 @@
 0.0 0
-11.2540997702 0
-35.6518529739 0.20542635658914732
+4.06311361785 0
+22.6756373606 0.7708333333333333
+37.9554306688 0.9509841605456247
 89.5683164686 0.1852265703217302
 91.8962058817 0
 583.967687075 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song16-bumpyhues_env	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,6 @@
+0 0
+253.940614 0
+254.440614 1
+306.481886577 0.9977966141275006
+317.271127908 0
+583.967687075 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song16-center	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,11 @@
+0 0
+92.3279357736 0
+92.8279357736 0.46875
+110.510635846 0.46875
+124.163688149 0
+295.551599662 0.0
+303.239666418 0.40624999999999994
+309.744953674 0.3968360022758761
+311.949224562 0
+317.54054584 0
+583.967687075 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song16-chase150	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,6 @@
+0 0
+321.201449308 0.0
+331.809634004 1
+447.527025321 1
+450.842469272 0
+583.967687075 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song16-colorrb_env	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,5 @@
+0 0
+493.290778643 0
+493.790778643 1
+573.256570335 1
+583.967687075 0
--- a/show/dance2013/curves/song16-cyc	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song16-cyc	Sun Jun 16 21:11:16 2013 +0000
@@ -1,8 +1,8 @@
 0.0 0
-12.701207 0
-13.201207 1
-56.0356237313 0.88
-74.8250168518 0.46499999999999997
-86.2427601641 0.41437828526090964
+3.56378850566 0
+7.74038292942 0.17122617510077887
+49.5670231124 0.19021739130434784
+51.3067856845 0.08611932145938302
+86.0229636111 0.21329132873917048
 90.3997055447 0
 583.967687075 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song16-downcp	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,17 @@
+0 0
+189.071134026 0
+189.127132325 1
+198.882236882 1
+199.030237449 0
+509.684929938 0
+515.763344886 0.28804347826086946
+518.887174369 0.31208287394212114
+520.086252285 0
+520.510958977 0.006374760266775956
+521.045301732 0.014765572269681518
+521.103845261 1
+521.695667118 1
+525.929960903 0
+532.080224727 0
+535.421197482 0
+583.967687075 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song16-frontpulse	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,6 @@
+0 0
+146.254160273 0.0
+150.824602782 1
+185.440085388 1
+186.863665841 0.0
+583.967687075 0
--- a/show/dance2013/curves/song16-full	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song16-full	Sun Jun 16 21:11:16 2013 +0000
@@ -1,6 +1,34 @@
 0.0 0
-53.886116 0
-57.1714260547 0.3058252427184466
-153.308145639 0.28762211802871207
+30.0075774536 0
+40.6282368894 0.07773697312275372
+48.9972410216 0.09375
+53.2940424511 0.29540857605177995
+90.3307585408 0.29753902757902356
+94.4266742315 0.203125
+153.308145639 0.19993837301535644
 172.263816574 0
+183.079938846 0.11458333333333334
+242.535599301 0.1186062937103918
+244.279900383 0.47889571938967507
+267.302285216 0.49706649355889754
+268.879324551 0.12474575832418806
+319.601549382 0.12394450640535992
+330.759698379 0.3178894296037415
+346.598323597 0.30807422078396496
+357.082272238 0.1593059523341164
+357.201744915 0.5294048605915975
+422.1290671 0.567605044022731
+445.168592861 0.486800159283469
+450.787989387 0.3398639437639564
+470.033777709 0.351561656523547
+472.079573049 0.13540616609935377
+481.801827197 0.19999630097694795
+493.292042937 0.28523973948376585
+493.595118193 0.13165823182416242
+500.225963451 0.10638297872340426
+551.010378642 0.11848565781250646
+552.020354357 0.25950165032543165
+574.258553556 0.21516979020606564
+577.506829844 0.6891521388563351
+580.18398063 0.7039806952464585
 583.967687075 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song16-lightning	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,31 @@
+0 0
+50.0079546375 0
+50.287789302 0.9545454545454546
+51.3043741967 0.9090909090909091
+51.9495220401 0
+53.8496840473 0.7159090909090908
+55.1298992989 0.011363636363636409
+55.926253668 0.8522727272727273
+56.6621254268 0
+57.6046461042 0
+58.6328504795 0.8749999999999999
+59.1519928846 0
+60.3767657435 0
+61.8535494786 0.7159090909090909
+62.2487652277 0
+63.9603604044 1
+64.5047038972 0.8409090909090909
+65.04904739 0.36363636363636365
+67.8110865942 0.12346476405933579
+69.0495173804 1
+70.8352171098 0.9965320708521962
+72.3472823676 0
+74.554897644 0.0
+75.7947911554 0.8846153846153847
+77.5790281595 0.0
+79.3330238586 0.0
+80.8753304215 0.987179487179487
+82.7805326463 0.0
+574.767962978 0.0
+575.733875111 0.0
+583.967687075 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2013/curves/song16-pulserainbow_env	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,6 @@
+0 0
+198.753213598 0
+199.253213598 1
+240.566365316 0.8946785814213044
+244.780912712 0
+583.967687075 0
--- a/show/dance2013/curves/song16.markers	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/curves/song16.markers	Sun Jun 16 21:11:16 2013 +0000
@@ -0,0 +1,2 @@
+357.432967 'q'
+557.274898 'q'
--- a/show/dance2013/song11.n3	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/song11.n3	Sun Jun 16 21:11:16 2013 +0000
@@ -9,7 +9,10 @@
         <http://light9.bigasterisk.com/show/dance2013/song11/subterm/2>,
         <http://light9.bigasterisk.com/show/dance2013/song11/subterm/3>,
         <http://light9.bigasterisk.com/show/dance2013/song11/subterm/4>,
-        <http://light9.bigasterisk.com/show/dance2013/song11/subterm/5> .
+        <http://light9.bigasterisk.com/show/dance2013/song11/subterm/5>,
+        <http://light9.bigasterisk.com/show/dance2013/song11/subterm/6>,
+        <http://light9.bigasterisk.com/show/dance2013/song11/subterm/7>,
+        <http://light9.bigasterisk.com/show/dance2013/song11/subterm/8> .
 
 <http://light9.bigasterisk.com/show/dance2013/song11/subterm/0> a ns1:Subterm ;
     rdfs:label "full" ;
@@ -18,7 +21,7 @@
 
 <http://light9.bigasterisk.com/show/dance2013/song11/subterm/1> a ns1:Subterm ;
     rdfs:label "" ;
-    ns1:expression "chase1(t)*chase(t, names=backchase,ontime=.2,offset=0.0)" .
+    ns1:expression "chase1(t)*chase(t, names=backchase,ontime=60/116/2,offset=0.0)" .
 
 <http://light9.bigasterisk.com/show/dance2013/song11/subterm/2> a ns1:Subterm ;
     rdfs:label "center" ;
@@ -40,3 +43,16 @@
     ns1:expression "song11orange(t)" ;
     ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/song11orange> .
 
+<http://light9.bigasterisk.com/show/dance2013/song11/subterm/6> a ns1:Subterm ;
+    rdfs:label "orange" ;
+    ns1:expression "orange(t)" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/orange> .
+
+<http://light9.bigasterisk.com/show/dance2013/song11/subterm/7> a ns1:Subterm ;
+    rdfs:label "stacrainbow" ;
+    ns1:expression "stacrainbow_env(t) * hsv(t*60/117*4,1,1)*(nsin(t*60/117*4)>.3)" .
+
+<http://light9.bigasterisk.com/show/dance2013/song11/subterm/8> a ns1:Subterm ;
+    rdfs:label "" ;
+    ns1:expression "cyc_music(t)*chase(t, names=cycpong, ontime=60./116*.5, offset=0.0)" .
+
--- a/show/dance2013/song16.n3	Sun Jun 16 20:12:46 2013 +0000
+++ b/show/dance2013/song16.n3	Sun Jun 16 21:11:16 2013 +0000
@@ -7,6 +7,15 @@
 <http://light9.bigasterisk.com/show/dance2013/song16> ns1:subterm <http://light9.bigasterisk.com/show/dance2013/song16/subterm/0>,
         <http://light9.bigasterisk.com/show/dance2013/song16/subterm/1>,
         <http://light9.bigasterisk.com/show/dance2013/song16/subterm/10>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/11>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/12>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/13>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/14>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/15>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/16>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/17>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/18>,
+        <http://light9.bigasterisk.com/show/dance2013/song16/subterm/19>,
         <http://light9.bigasterisk.com/show/dance2013/song16/subterm/2>,
         <http://light9.bigasterisk.com/show/dance2013/song16/subterm/3>,
         <http://light9.bigasterisk.com/show/dance2013/song16/subterm/4>,
@@ -40,7 +49,48 @@
 
 <http://light9.bigasterisk.com/show/dance2013/song16/subterm/10> a ns1:Subterm ;
     rdfs:label "backchase" ;
-    ns1:expression "backchase_env(t) * chase(t, names=backchase, ontime=0.5, offset=0.2)" .
+    ns1:expression "backchase_env(t) * chase(t, names=backchase, ontime=60./74/2, offset=0.0)" .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/11> a ns1:Subterm ;
+    rdfs:label "pulserainbow" ;
+    ns1:expression "pulserainbow_env(t) * hsv(t*60./137,1,1)" .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/12> a ns1:Subterm ;
+    rdfs:label "bumpyhues" ;
+    ns1:expression "bumpyhues_env(t) * hsv(t*60/106,.4,1)*(.7+nsin(t*60/106*3))" .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/13> a ns1:Subterm ;
+    rdfs:label "" ;
+    ns1:expression "chase150(t)*chase(t, names=scoop, ontime=0.5/2, offset=0.0)" .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/14> a ns1:Subterm ;
+    rdfs:label "colorrb" ;
+    ns1:expression "colorrb_env(t) * chase(t, names=colorrb, ontime=0.5, offset=0.2)" .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/15> a ns1:Subterm ;
+    rdfs:label "" ;
+    ns1:expression "lightning(t)*noise(t)" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/cyc> .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/16> a ns1:Subterm ;
+    rdfs:label "" ;
+    ns1:expression "lightning(t)*noise(t)" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/upscoop> .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/17> a ns1:Subterm ;
+    rdfs:label "" ;
+    ns1:expression "frontpulse(t)*(music(t+.04)-.05)*6" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/fronts> .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/18> a ns1:Subterm ;
+    rdfs:label "downcp" ;
+    ns1:expression "downcp(t)*(music(t+.05))*4" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/downcp> .
+
+<http://light9.bigasterisk.com/show/dance2013/song16/subterm/19> a ns1:Subterm ;
+    rdfs:label "center" ;
+    ns1:expression "center(t)" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/center> .
 
 <http://light9.bigasterisk.com/show/dance2013/song16/subterm/2> a ns1:Subterm ;
     rdfs:label "full" ;
@@ -49,7 +99,7 @@
 
 <http://light9.bigasterisk.com/show/dance2013/song16/subterm/3> a ns1:Subterm ;
     rdfs:label "backcolors" ;
-    ns1:expression "backcolors(t) * chase(t, names=backcolors, ontime=0.5, offset=0.2)" .
+    ns1:expression "backcolors(t) * chase(t, names=backcolors, ontime=60./74/2, offset=0.0)" .
 
 <http://light9.bigasterisk.com/show/dance2013/song16/subterm/4> a ns1:Subterm ;
     rdfs:label "" ;