changeset 1005:32e72dad2d92

checkpoint Ignore-this: aa20d185d7542ca4ec03abb5896362e9
author drewp@bigasterisk.com
date Mon, 17 Jun 2013 02:06:46 +0000
parents 18885a10b119
children f7a0e26fbe7b
files show/dance2013/curves/song16-bumpyhues_env show/dance2013/curves/song16-center show/dance2013/curves/song16-colorrb_env show/dance2013/curves/song16-full show/dance2013/curves/song16.markers show/dance2013/curves/song17-backchase_env show/dance2013/curves/song17-cycpong_env show/dance2013/curves/song17-full show/dance2013/curves/song17-houseside show/dance2013/curves/song17-patio show/dance2013/curves/song17-song17getup show/dance2013/curves/song17-upscoop show/dance2013/curves/song5-song5 show/dance2013/curves/song7-alternatergb_env show/dance2013/curves/song7-center show/dance2013/curves/song7-full show/dance2013/curves/song7-red show/dance2013/curves/song7-song7end show/dance2013/curves/song7-song7intro show/dance2013/curves/song7-song7yel show/dance2013/song17.n3
diffstat 21 files changed, 64 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/show/dance2013/curves/song16-bumpyhues_env	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song16-bumpyhues_env	Mon Jun 17 02:06:46 2013 +0000
@@ -1,5 +1,5 @@
 0.0 0
-253.940614 0
+245.605957794 0
 254.440614 1
 306.481886577 0.9977966141275006
 317.271127908 0
--- a/show/dance2013/curves/song16-center	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song16-center	Mon Jun 17 02:06:46 2013 +0000
@@ -1,11 +1,22 @@
 0.0 0
-92.3279357736 0
-92.8279357736 0.46875
-110.510635846 0.46875
-124.163688149 0
+92.3279357736 0.0
+92.8279357736 0.483695652173913
+110.510635846 0.483695652173913
+118.774413 0.6721903307077491
+122.181241013 0.2768236964467419
+127.493088253 0
 295.551599662 0.0
 303.239666418 0.40624999999999994
 309.744953674 0.3968360022758761
 311.949224562 0
 317.54054584 0
+515.179924542 0.0
+518.872460771 0.3097826086956522
+528.46544149 0.5510947876206606
+532.081842951 0.873369565217481
+535.812446564 0.854638606791764
+538.134556976 0.4088055379248583
+547.803672462 0.3656990796710438
+550.506456712 0.3383678852957576
+554.122858173 0
 583.967687075 0
--- a/show/dance2013/curves/song16-colorrb_env	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song16-colorrb_env	Mon Jun 17 02:06:46 2013 +0000
@@ -2,4 +2,5 @@
 493.290778643 0
 493.790778643 1
 573.256570335 1
+579.245750462 0
 583.967687075 0
--- a/show/dance2013/curves/song16-full	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song16-full	Mon Jun 17 02:06:46 2013 +0000
@@ -17,15 +17,20 @@
 346.598323597 0.30807422078396496
 357.082272238 0.1593059523341164
 357.201744915 0.5294048605915975
+390.484045113 0.5658930475352372
+395.625355297 0.24404320009847746
+398.452103139 0.22840924974780177
+398.513392016 0.621180666185229
 422.1290671 0.567605044022731
 445.168592861 0.486800159283469
-450.787989387 0.3398639437639564
-470.033777709 0.351561656523547
-472.079573049 0.13540616609935377
-481.801827197 0.19999630097694795
+450.787989387 0.21541186668478865
+470.033777709 0.22282608695652176
+472.079573049 0.10670791968617757
+481.801827197 0.15760869565217392
 493.292042937 0.28523973948376585
 493.595118193 0.13165823182416242
-500.225963451 0.10638297872340426
+496.184300025 0.24780459635057198
+500.187896067 0.24225254394079554
 551.010378642 0.11848565781250646
 552.020354357 0.25950165032543165
 574.258553556 0.21516979020606564
--- a/show/dance2013/curves/song16.markers	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song16.markers	Mon Jun 17 02:06:46 2013 +0000
@@ -1,2 +1,3 @@
 357.432967 'q'
+398.693272 'q'
 557.274898 'q'
--- a/show/dance2013/curves/song17-backchase_env	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song17-backchase_env	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 163.897084748 0
 163.976541264 1
 177.067082349 1.0
--- a/show/dance2013/curves/song17-cycpong_env	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song17-cycpong_env	Mon Jun 17 02:06:46 2013 +0000
@@ -1,7 +1,8 @@
-0 0
+0.0 0
 10.5242765705 0
 11.0242765705 1
 51.9137020329 1
 67.0164337474 1
 67.5746455972 0
+94.550389944 0
 233.674535147 0
--- a/show/dance2013/curves/song17-full	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song17-full	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 130.877107237 0
 133.847081503 0.6338028169014084
 148.123608282 0.6398781843752069
--- a/show/dance2013/curves/song17-houseside	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song17-houseside	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 93.9468011864 0
 105.973347763 1
 229.782454485 1
--- a/show/dance2013/curves/song17-patio	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song17-patio	Mon Jun 17 02:06:46 2013 +0000
@@ -1,5 +1,5 @@
-0 0
+0.0 0
 88.9887156974 0
-99.9673944035 1
-229.333368255 1
+99.9673944035 0.3
+229.333368255 0.3
 233.674535147 0
--- a/show/dance2013/curves/song17-song17getup	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song17-song17getup	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 4.03455718626 0
 7.15638296953 1
 163.563249093 1
--- a/show/dance2013/curves/song17-upscoop	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song17-upscoop	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 142.34836827 0
 149.509814019 0.6854838709677419
 163.916063359 0.6434904102091061
--- a/show/dance2013/curves/song5-song5	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song5-song5	Mon Jun 17 02:06:46 2013 +0000
@@ -1,6 +1,6 @@
 0.0 0
 2.95622161785 0
-3.15444874714 0.07436372403432624
+3.27984429275 0.08608247403432624
 4.20132688494 1
 151.27049725 1
 155.156893424 0
--- a/show/dance2013/curves/song7-alternatergb_env	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song7-alternatergb_env	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,9 @@
-0 0
-227.838730159 0
-228.338730159 1
+0.0 0
+194.766256749 0
+204.726346397 0.28
+232.906060021 0.3047739654868714
+290.785781213 0.306783962075811
+297.511503722 0.3769157167128531
+392.138288977 0.3103036437655686
+395.468240534 0
 412.940997732 0
--- a/show/dance2013/curves/song7-center	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song7-center	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 183.882573636 0
 190.912989196 0.2642857142857143
 193.768545028 0.25371428571428567
--- a/show/dance2013/curves/song7-full	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song7-full	Mon Jun 17 02:06:46 2013 +0000
@@ -1,5 +1,5 @@
-0 0
+0.0 0
 398.152426451 0
-403.922579036 0.7828947368421053
-409.041694086 0.7725934903047093
+402.580796582 0.57
+409.041694086 0.5625
 412.940997732 0
--- a/show/dance2013/curves/song7-red	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song7-red	Mon Jun 17 02:06:46 2013 +0000
@@ -1,7 +1,7 @@
-0 0
-119.787524621 0
+0.0 0
+118.451622823 0
 120.287524621 1
 145.646995781 1
 171.215612165 1
-175.42476067 0
+182.316536872 0
 412.940997732 0
--- a/show/dance2013/curves/song7-song7end	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song7-song7end	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 193.043147101 0
 198.35082319 1
 407.293941353 1
--- a/show/dance2013/curves/song7-song7intro	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song7-song7intro	Mon Jun 17 02:06:46 2013 +0000
@@ -1,6 +1,8 @@
-0 0
-6.79153736963 0
-7.29153736963 1
-69.2051685175 1
+0.0 0
+5.14518552647 0
+7.05204522321 0.06
+8.86105946011 0.9800000000000001
+57.4030654995 1
+65.7735179433 0.4887204071512201
 85.8867180844 0
 412.940997732 0
--- a/show/dance2013/curves/song7-song7yel	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/curves/song7-song7yel	Mon Jun 17 02:06:46 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 48.7019557291 0
 63.7646782823 0.6854790639473448
 82.97421285 1
--- a/show/dance2013/song17.n3	Mon Jun 17 01:13:16 2013 +0000
+++ b/show/dance2013/song17.n3	Mon Jun 17 02:06:46 2013 +0000
@@ -39,9 +39,9 @@
 
 <http://light9.bigasterisk.com/show/dance2013/song17/subterm/5> a ns1:Subterm ;
     rdfs:label "backchase" ;
-    ns1:expression "backchase_env(t) * chase(t, names=backchase, ontime=0.2, offset=0.0)" .
+    ns1:expression "backchase_env(t) * chase(t, names=backchase, ontime=60./134/2, offset=0.0)" .
 
 <http://light9.bigasterisk.com/show/dance2013/song17/subterm/6> a ns1:Subterm ;
     rdfs:label "cycpong" ;
-    ns1:expression "cycpong_env(t) * chase(t, names=cycpong, ontime=0.4, offset=0.2)" .
+    ns1:expression "cycpong_env(t) * chase(t, names=cycpong, ontime=60./102.-.2, offset=0.2)" .