Mercurial > code > home > repos > light9

changeset 1001:96ed4e295988

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkpoint Ignore-this: fee89d55d085c015d531f10f5de7a8e8
author drewp@bigasterisk.com
date Sun, 16 Jun 2013 23:02:30 +0000
parents 1627032629dc
children 9c9b68302bf7
files show/dance2013/curves/song11-center show/dance2013/curves/song11-chase1 show/dance2013/curves/song11-stacrainbow_env show/dance2013/curves/song15-full show/dance2013/curves/song15.markers 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-downcp show/dance2013/curves/song16-frontpulse show/dance2013/curves/song16-lightning show/dance2013/curves/song16-pulserainbow_env show/dance2013/curves/song6-song6 show/dance2013/song11.n3 show/dance2013/song15.n3 show/dance2013/song6.n3 show/dance2013/sub/patio.n3
diffstat 18 files changed, 80 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/show/dance2013/curves/song11-center	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song11-center	Sun Jun 16 23:02:30 2013 +0000
@@ -1,6 +1,6 @@
 0.0 0
-53.767473 0
-55.4102189415 0.425
+52.0834263494 0
+53.7261722909 0.425
 74.803726 0.5
 78.640372 0.5
 78.846558 0.0
--- a/show/dance2013/curves/song11-chase1	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song11-chase1	Sun Jun 16 23:02:30 2013 +0000
@@ -3,7 +3,12 @@
 20.409583 1.0
 29.340137 1.0
 29.396774 0.0
-37.4700379749 0
+40.7779867528 0
+52.2054461673 0
+57.8590313514 0.26388888888888895
+76.4436890307 0.30286850921271735
+83.1197311097 0.22849490508095713
+85.1045003765 0
 129.671592093 0
 129.965356845 1
 144.916228678 1
--- a/show/dance2013/curves/song11-stacrainbow_env	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song11-stacrainbow_env	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 129.83802346 0
 130.33802346 1
 159.374486335 1
--- a/show/dance2013/curves/song15-full	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song15-full	Sun Jun 16 23:02:30 2013 +0000
@@ -1,10 +1,23 @@
-0 0
+0.0 0
 3.08586641718 0
-15.6157998414 0
-17.7804684038 1
-58.5741188849 1.0
+13.65162592 0
+15.8162944824 0.4649122807017544
+58.5741188849 0.4649122807017544
 58.7441244449 0.0
 64.4358297112 0.0
-67.0808580687 1.0
+67.0808580687 0.4298245614035088
+93.8099420163 0.4298245614035088
+96.386397436 0
+114.52698811 0
+115.950862806 0.11907742156185105
+155.268929982 0.11925919465570083
+192.781288678 0.20759520954835886
+195.623651895 0.4707410264854405
+206.341729862 0.4569692921723433
+209.361740781 0.1713781863272379
+241.172603576 0.23066447706099957
+245.671221866 0.3357128099423493
+250.617617474 0.5211787131592669
+252.517921158 0.9907277852460207
 254.2 1
 258.037210884 0
--- a/show/dance2013/curves/song15.markers	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song15.markers	Sun Jun 16 23:02:30 2013 +0000
@@ -4,5 +4,13 @@
 48.945921317 'q'
 50.474093 'q'
 71.099264 'q'
+98.873352896 'q'
+99.522097896 'q'
+102.539986896 'q'
+103.256442896 'q'
+106.380837896 'q'
 106.803532 'q'
+107.143340896 'q'
+110.229332896 'q'
+110.951473896 'q'
 247.089252 'q'
--- a/show/dance2013/curves/song16-bumpyhues_env	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song16-bumpyhues_env	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 253.940614 0
 254.440614 1
 306.481886577 0.9977966141275006
--- a/show/dance2013/curves/song16-center	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song16-center	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 92.3279357736 0
 92.8279357736 0.46875
 110.510635846 0.46875
--- a/show/dance2013/curves/song16-chase150	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song16-chase150	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 321.201449308 0.0
 331.809634004 1
 447.527025321 1
--- a/show/dance2013/curves/song16-colorrb_env	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song16-colorrb_env	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 493.290778643 0
 493.790778643 1
 573.256570335 1
--- a/show/dance2013/curves/song16-downcp	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song16-downcp	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 189.071134026 0
 189.127132325 1
 198.882236882 1
--- a/show/dance2013/curves/song16-frontpulse	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song16-frontpulse	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 146.254160273 0.0
 150.824602782 1
 185.440085388 1
--- a/show/dance2013/curves/song16-lightning	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song16-lightning	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 50.0079546375 0
 50.287789302 0.9545454545454546
 51.3043741967 0.9090909090909091
--- a/show/dance2013/curves/song16-pulserainbow_env	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song16-pulserainbow_env	Sun Jun 16 23:02:30 2013 +0000
@@ -1,4 +1,4 @@
-0 0
+0.0 0
 198.753213598 0
 199.253213598 1
 240.566365316 0.8946785814213044
--- a/show/dance2013/curves/song6-song6	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/curves/song6-song6	Sun Jun 16 23:02:30 2013 +0000
@@ -1,5 +1,10 @@
 0.0 0
 3.69694174651 0
 7.51443678595 1
+55.8750524294 1.0
+57.7363849983 0.4391438795660413
+58.9889651651 0.456359200663447
+106.699252662 0.4397590361445783
+111.118748334 0.97572894910884
 193.068825231 1
 196.604421769 0
--- a/show/dance2013/song11.n3	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/song11.n3	Sun Jun 16 23:02:30 2013 +0000
@@ -21,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=60/116/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" ;
--- a/show/dance2013/song15.n3	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/song15.n3	Sun Jun 16 23:02:30 2013 +0000
@@ -6,7 +6,11 @@
 
 <http://light9.bigasterisk.com/show/dance2013/song15> ns1:subterm <http://light9.bigasterisk.com/show/dance2013/song15/subterm/0>,
         <http://light9.bigasterisk.com/show/dance2013/song15/subterm/1>,
-        <http://light9.bigasterisk.com/show/dance2013/song15/subterm/2> .
+        <http://light9.bigasterisk.com/show/dance2013/song15/subterm/2>,
+        <http://light9.bigasterisk.com/show/dance2013/song15/subterm/3>,
+        <http://light9.bigasterisk.com/show/dance2013/song15/subterm/4>,
+        <http://light9.bigasterisk.com/show/dance2013/song15/subterm/5>,
+        <http://light9.bigasterisk.com/show/dance2013/song15/subterm/6> .
 
 <http://light9.bigasterisk.com/show/dance2013/song15/subterm/0> a ns1:Subterm ;
     rdfs:label "strobebright" ;
@@ -22,3 +26,22 @@
     ns1:expression "full(t)" ;
     ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/full> .
 
+<http://light9.bigasterisk.com/show/dance2013/song15/subterm/3> a ns1:Subterm ;
+    rdfs:label "pulserainbow" ;
+    ns1:expression "pulserainbow_env(t) * hsv(t*1,1,1)*(smooth_music(t+.08)>.5)" .
+
+<http://light9.bigasterisk.com/show/dance2013/song15/subterm/4> a ns1:Subterm ;
+    rdfs:label "song15dial" ;
+    ns1:expression "song15dial(t)" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/song15dial> .
+
+<http://light9.bigasterisk.com/show/dance2013/song15/subterm/5> a ns1:Subterm ;
+    rdfs:label "cycmid" ;
+    ns1:expression "cycmid(t)" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/cycmid> .
+
+<http://light9.bigasterisk.com/show/dance2013/song15/subterm/6> a ns1:Subterm ;
+    rdfs:label "ledall" ;
+    ns1:expression "cycmid(t)" ;
+    ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/ledall> .
+
--- a/show/dance2013/song6.n3	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/song6.n3	Sun Jun 16 23:02:30 2013 +0000
@@ -5,7 +5,8 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 <http://light9.bigasterisk.com/show/dance2013/song6> ns1:subterm <http://light9.bigasterisk.com/show/dance2013/song6/subterm/0>,
-        <http://light9.bigasterisk.com/show/dance2013/song6/subterm/1> .
+        <http://light9.bigasterisk.com/show/dance2013/song6/subterm/1>,
+        <http://light9.bigasterisk.com/show/dance2013/song6/subterm/2> .
 
 <http://light9.bigasterisk.com/show/dance2013/song6/subterm/0> a ns1:Subterm ;
     rdfs:label "song6" ;
@@ -17,3 +18,7 @@
     ns1:expression "full(t)" ;
     ns1:sub <http://light9.bigasterisk.com/show/dance2013/sub/full> .
 
+<http://light9.bigasterisk.com/show/dance2013/song6/subterm/2> a ns1:Subterm ;
+    rdfs:label "colors" ;
+    ns1:expression "colors_env(t) * chase(t, names=colors, ontime=60./112, offset=0.0)" .
+
--- a/show/dance2013/sub/patio.n3	Sun Jun 16 21:42:55 2013 +0000
+++ b/show/dance2013/sub/patio.n3	Sun Jun 16 23:02:30 2013 +0000
@@ -11,7 +11,7 @@
 
 <http://light9.bigasterisk.com/sub/local/1371320332.68/map/916981013> a ns1:ChannelSetting ;
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/post-r> ;
-    ns1:level 1e+00 .
+    ns1:level 6.1e-01 .
 
 <http://light9.bigasterisk.com/sub/local/1371320332.68/map/953892364> a ns1:ChannelSetting ;
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/post-l> ;