Mercurial > code > home > repos > light9

changeset 1399:01c33edd1d7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkpoint show data Ignore-this: 96ab9e8a549afcbe8ba394e17332fcf5
author drewp@bigasterisk.com
date Sun, 14 Jun 2015 22:06:25 +0000
parents e1e56c14596b
children b8febd8e277b
files show/dance2015/effectClass.n3 show/dance2015/sessions/curvecalc/default.n3 show/dance2015/sessions/subcomposer/default.n3 show/dance2015/song13/curve-2.n3 show/dance2015/song14.n3 show/dance2015/song14/curve-4.n3 show/dance2015/song14/curve-7.n3 show/dance2015/song7.n3 show/dance2015/song7/curve-2.n3 show/dance2015/song7/curve-4.n3 show/dance2015/song7/curve-5.n3 show/dance2015/song7/curve-7.n3
diffstat 12 files changed, 64 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/show/dance2015/effectClass.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/effectClass.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -71,8 +71,12 @@
 <http://light9.bigasterisk.com/theater/piedmont/channel/b33>
 ) .
 
+
+chase:mid a :Chase; :channels (
+    ch:down-c1 ch:down-c3 ch:down-c4 ch:down-wide
+    ) .
 chase:midrand a :Chase; :channels (
-    ch:down-c1 ch:down-wide ch:down-c3 ch:down-c4 ch:down-wide ch:down-c1 ch:down-c3 ch:down-c2 ch:down-c3 ch:down-c4 ch:down-wide ch:down-c1 ch:down-c4 ch:down-c2 ch:down-wide ch:down-c2 ch:down-c4 ch:down-c1    
+    ch:down-c1 ch:down-wide ch:down-c3 ch:down-c4 ch:down-wide ch:down-c1 ch:down-c3 ch:down-c2 ch:down-c3 ch:down-c4 ch:down-wide ch:down-c1 ch:down-c4 ch:down-c2 ch:down-wide ch:down-c2 ch:down-c4    
 ) .
 
 effect:midChase a :EffectClass;
--- a/show/dance2015/sessions/curvecalc/default.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/sessions/curvecalc/default.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -4,5 +4,5 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2015/sessions/curvecalc/default> ns1:currentSong <http://light9.bigasterisk.com/show/dance2015/song14> .
+<http://light9.bigasterisk.com/show/dance2015/sessions/curvecalc/default> ns1:currentSong <http://light9.bigasterisk.com/show/dance2015/song7> .
 
--- a/show/dance2015/sessions/subcomposer/default.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/sessions/subcomposer/default.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -277,5 +277,30 @@
     ns1:level 0e+00 .
 
 <http://light9.bigasterisk.com/sub/local/1434311371.29-1> a ns1:LocalSubmaster,
-        ns1:Submaster .
+        ns1:Submaster ;
+    ns1:lightLevel <http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/232498299>,
+        <http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/249432592>,
+        <http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/469899309>,
+        <http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/48335954>,
+        <http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/552866626> .
+
+<http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/232498299> a ns1:ChannelSetting ;
+    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/down-c2> ;
+    ns1:level 0e+00 .
 
+<http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/249432592> a ns1:ChannelSetting ;
+    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/down-c1> ;
+    ns1:level 0e+00 .
+
+<http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/469899309> a ns1:ChannelSetting ;
+    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/down-c3> ;
+    ns1:level 0e+00 .
+
+<http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/48335954> a ns1:ChannelSetting ;
+    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/down-wide> ;
+    ns1:level 0e+00 .
+
+<http://light9.bigasterisk.com/sub/local/1434311371.29-1/map/552866626> a ns1:ChannelSetting ;
+    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/down-c4> ;
+    ns1:level 0e+00 .
+
--- a/show/dance2015/song13/curve-2.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/song13/curve-2.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -4,5 +4,5 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2015/song13/curve-2> ns1:points "0 0 225.2 0 229 0.2327 265.1 0.2229 274.8 0 331.2 0 337.3 1 340.2 1 342.6 0" .
+<http://light9.bigasterisk.com/show/dance2015/song13/curve-2> ns1:points "0 0 225.2 0 229 0.3329 265.1 0.3189 274.8 0 331.2 0 337.3 0.6302 340.2 0.6302 342.6 0" .
 
--- a/show/dance2015/song14.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/song14.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -9,13 +9,15 @@
         <http://light9.bigasterisk.com/show/dance2015/song14/curve-3>,
         <http://light9.bigasterisk.com/show/dance2015/song14/curve-4>,
         <http://light9.bigasterisk.com/show/dance2015/song14/curve-5>,
-        <http://light9.bigasterisk.com/show/dance2015/song14/curve-6> ;
+        <http://light9.bigasterisk.com/show/dance2015/song14/curve-6>,
+        <http://light9.bigasterisk.com/show/dance2015/song14/curve-7> ;
     ns1:effect <http://light9.bigasterisk.com/show/dance2015/song14/effect-1>,
         <http://light9.bigasterisk.com/show/dance2015/song14/effect-2>,
         <http://light9.bigasterisk.com/show/dance2015/song14/effect-3>,
         <http://light9.bigasterisk.com/show/dance2015/song14/effect-4>,
         <http://light9.bigasterisk.com/show/dance2015/song14/effect-5>,
-        <http://light9.bigasterisk.com/show/dance2015/song14/effect-6> .
+        <http://light9.bigasterisk.com/show/dance2015/song14/effect-6>,
+        <http://light9.bigasterisk.com/show/dance2015/song14/effect-7> .
 
 <http://light9.bigasterisk.com/show/dance2015/song14/curve-1> a ns1:Curve ;
     rdfs:label "center" .
@@ -35,6 +37,9 @@
 <http://light9.bigasterisk.com/show/dance2015/song14/curve-6> a ns1:Curve ;
     rdfs:label "frontrand chase" .
 
+<http://light9.bigasterisk.com/show/dance2015/song14/curve-7> a ns1:Curve ;
+    rdfs:label "slow color chase" .
+
 <http://light9.bigasterisk.com/show/dance2015/song14/effect-1> a ns1:Effect ;
     rdfs:label "center" ;
     ns1:code "env = <http://light9.bigasterisk.com/show/dance2015/song14/curve-1>",
@@ -67,3 +72,13 @@
     ns1:code "env = <http://light9.bigasterisk.com/show/dance2015/song14/curve-6>",
         "out = chase(t, names=frontrand, ontime=.25, offset=0) * env" .
 
+<http://light9.bigasterisk.com/show/dance2015/song14/effect-7> a ns1:Effect,
+        <http://light9.bigasterisk.com/effect/slowColor> ;
+    rdfs:label "slow color chase" ;
+    ns1:code "b = <http://light9.bigasterisk.com/show/dance2013/sub/blue> * nsin((t+.6) / period)",
+        "env = <http://light9.bigasterisk.com/show/dance2015/song14/curve-7>",
+        "out = [r*env,y*env,b*env]",
+        "period = 1",
+        "r = <http://light9.bigasterisk.com/show/dance2013/sub/red> * nsin(t / period)",
+        "y = <http://light9.bigasterisk.com/show/dance2013/sub/yellow> * nsin((t+.3) / period)" .
+
--- a/show/dance2015/song14/curve-4.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/song14/curve-4.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -4,5 +4,5 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2015/song14/curve-4> ns1:points "0 0 152.8 0 157.1 1 163.1 1 165.8 0" .
+<http://light9.bigasterisk.com/show/dance2015/song14/curve-4> ns1:points "0 0 152.8 0 156.2 0.3441 158.9 1 163.1 1 165.8 0" .
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2015/song14/curve-7.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -0,0 +1,8 @@
+@prefix ns1: <http://light9.bigasterisk.com/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://light9.bigasterisk.com/show/dance2015/song14/curve-7> ns1:points "0 0 4.499 0 6.499 1 147.3 1 149.3 0" .
+
--- a/show/dance2015/song7.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/song7.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -80,7 +80,7 @@
         <http://light9.bigasterisk.com/effect/midChase> ;
     rdfs:label "back chase" ;
     ns1:code "env = <http://light9.bigasterisk.com/show/dance2015/song7/curve-7>",
-        "out = chase(t, names=midrand, ontime=.3, offset=-.11) * env" .
+        "out = chase(t+.2, names=mid, ontime=60/127.*2, offset=0) * env" .
 
 <http://light9.bigasterisk.com/show/dance2015/song7/effect-8> a ns1:Effect ;
     rdfs:label "whiteled" ;
--- a/show/dance2015/song7/curve-2.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/song7/curve-2.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -4,5 +4,5 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2015/song7/curve-2> ns1:points "0 0 7.225 0 18.54 1 381.8 1 383.8 0" .
+<http://light9.bigasterisk.com/show/dance2015/song7/curve-2> ns1:points "0 0 7.225 0 18.54 1 83.07 1 86.89 0 121.5 0 123.1 1 381.8 1 383.8 0" .
 
--- a/show/dance2015/song7/curve-4.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/song7/curve-4.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -4,5 +4,5 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2015/song7/curve-4> ns1:points "0 0 82.61 0 84.59 1 120.4 1 121.1 0" .
+<http://light9.bigasterisk.com/show/dance2015/song7/curve-4> ns1:points "0 0" .
 
--- a/show/dance2015/song7/curve-5.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/song7/curve-5.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -4,5 +4,5 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2015/song7/curve-5> ns1:points "0 0 126.6 0 128.6 1 381.2 1 383.2 0" .
+<http://light9.bigasterisk.com/show/dance2015/song7/curve-5> ns1:points "0 0 126.6 0 130.7 0.5585 289.6 0.5501 381.2 1 383.2 0" .
 
--- a/show/dance2015/song7/curve-7.n3	Sun Jun 14 21:34:49 2015 +0000
+++ b/show/dance2015/song7/curve-7.n3	Sun Jun 14 22:06:25 2015 +0000
@@ -4,5 +4,5 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2015/song7/curve-7> ns1:points "0 0 66.8 0 68.8 1 88.8 1 90.8 0" .
+<http://light9.bigasterisk.com/show/dance2015/song7/curve-7> ns1:points "0 0 83.66 0 83.9 1 119.4 1 121.4 0" .