Mercurial > code > home > repos > light9

changeset 1173:423941a4b489

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
show 2014 checkpoint Ignore-this: 3dc1b1fb5a0ccb189eac5af97fc90c11
author drewp@bigasterisk.com
date Sun, 15 Jun 2014 06:18:06 +0000
parents 1451c614d1f9
children a88d5c76d2ff
files show/dance2014/patch-source.n3 show/dance2014/song12.n3 show/dance2014/song12/curve-1.n3 show/dance2014/song12/curve-2.n3 show/dance2014/sub/blue.n3 show/dance2014/sub/cyc.n3
diffstat 6 files changed, 52 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/show/dance2014/patch-source.n3	Sun Jun 15 04:37:58 2014 +0000
+++ b/show/dance2014/patch-source.n3	Sun Jun 15 06:18:06 2014 +0000
@@ -57,25 +57,25 @@
 [ :name "strobespeed"; :output dmx:c47 ] .
 [ :name "strobebright"; :output dmx:c48 ] .
 
-[ :name "b11-x"; :output dmx:c54 ] .
+#[ :name "b11-x"; :output dmx:c54 ] .
 [ :name "b12-low";	 :output dmx:c53 ] .
-[ :name "b13-x"; :output dmx:c52 ] .
+#[ :name "b13-x"; :output dmx:c52 ] .
 [ :name "b14-yel";	 :output dmx:c51 ] .
 [ :name "b15-red";	 :output dmx:c50 ] .
-[ :name "b16-x"; :output dmx:c49 ] .
+#[ :name "b16-x"; :output dmx:c49 ] .
 
 [ :name "b21-edge";  :output dmx:c55 ] .
 [ :name "b22-c";	 :output dmx:c56 ] .
 [ :name "b23-up";	 :output dmx:c57 ] .
 [ :name "b24-up";	 :output dmx:c58 ] .
-[ :name "b25-x"; :output dmx:c59 ] .
+#[ :name "b25-x"; :output dmx:c59 ] .
 [ :name "b26-edge";  :output dmx:c60 ] .
 
-[ :name "b31-x"; :output dmx:c61 ] .
+#[ :name "b31-x"; :output dmx:c61 ] .
 [ :name "b32-red";	 :output dmx:c62 ] .
-[ :name "b33-x"; :output dmx:c63 ] .
+#[ :name "b33-x"; :output dmx:c63 ] .
 [ :name "b34-yel";	 :output dmx:c64 ] .
-[ :name "b35-x"; :output dmx:c65 ] .
+#[ :name "b35-x"; :output dmx:c65 ] .
 [ :name "b36-low";	 :output dmx:c66 ] .
 
 [ :name "house-side"; :output dmx:c68 ] .
@@ -84,13 +84,13 @@
 [ :name "house3"; :output dmx:c71 ] .
 [ :name "house2"; :output dmx:c72 ] .
 
-[ :name "rgb1-r"; :output dmx:c73 ] .
-[ :name "rgb1-g"; :output dmx:c74 ] .
-[ :name "rgb1-b"; :output dmx:c75 ] .
+#[ :name "rgb1-r"; :output dmx:c73 ] .
+#[ :name "rgb1-g"; :output dmx:c74 ] .
+#[ :name "rgb1-b"; :output dmx:c75 ] .
 
-[ :name "rgb2-r"; :output dmx:c80 ] .
-[ :name "rgb2-g"; :output dmx:c81 ] .
-[ :name "rgb2-b"; :output dmx:c82 ] .
+#[ :name "rgb2-r"; :output dmx:c80 ] .
+#[ :name "rgb2-g"; :output dmx:c81 ] .
+#[ :name "rgb2-b"; :output dmx:c82 ] .
 
 [ :name "rgb3-mode"; :output dmx:c87 ] .
 [ :name "rgb3-r"; :output dmx:c88 ] .
--- a/show/dance2014/song12.n3	Sun Jun 15 04:37:58 2014 +0000
+++ b/show/dance2014/song12.n3	Sun Jun 15 06:18:06 2014 +0000
@@ -4,13 +4,22 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2014/song12> ns1:curve <http://light9.bigasterisk.com/show/dance2014/song12/curve-1> ;
-    ns1:effect <http://light9.bigasterisk.com/show/dance2014/song12/effect-1> .
+<http://light9.bigasterisk.com/show/dance2014/song12> ns1:curve <http://light9.bigasterisk.com/show/dance2014/song12/curve-1>,
+        <http://light9.bigasterisk.com/show/dance2014/song12/curve-2> ;
+    ns1:effect <http://light9.bigasterisk.com/show/dance2014/song12/effect-1>,
+        <http://light9.bigasterisk.com/show/dance2014/song12/effect-2> .
 
 <http://light9.bigasterisk.com/show/dance2014/song12/curve-1> a ns1:Curve ;
     rdfs:label "sub song12" .
 
+<http://light9.bigasterisk.com/show/dance2014/song12/curve-2> a ns1:Curve ;
+    rdfs:label "sub full" .
+
 <http://light9.bigasterisk.com/show/dance2014/song12/effect-1> a ns1:Effect ;
     rdfs:label "sub song12" ;
     ns1:code "out = <http://light9.bigasterisk.com/show/dance2014/sub/song12> * <http://light9.bigasterisk.com/show/dance2014/song12/curve-1>" .
 
+<http://light9.bigasterisk.com/show/dance2014/song12/effect-2> a ns1:Effect ;
+    rdfs:label "sub full" ;
+    ns1:code "out = <http://light9.bigasterisk.com/show/dance2014/sub/full> * <http://light9.bigasterisk.com/show/dance2014/song12/curve-2>" .
+
--- a/show/dance2014/song12/curve-1.n3	Sun Jun 15 04:37:58 2014 +0000
+++ b/show/dance2014/song12/curve-1.n3	Sun Jun 15 06:18:06 2014 +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/dance2014/song12/curve-1> ns1:points "0 0 2.896 0 7.616 1 111 1 114.9 0" .
+<http://light9.bigasterisk.com/show/dance2014/song12/curve-1> ns1:points "0 0 2.896 0 7.616 1 111.3 1 114.9 0" .
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2014/song12/curve-2.n3	Sun Jun 15 06:18:06 2014 +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/dance2014/song12/curve-2> ns1:points "0 0 104.3 0 108.8 1 111.2 1 114.9 0.007634" .
+
--- a/show/dance2014/sub/blue.n3	Sun Jun 15 04:37:58 2014 +0000
+++ b/show/dance2014/sub/blue.n3	Sun Jun 15 06:18:06 2014 +0000
@@ -6,17 +6,24 @@
 
 <http://light9.bigasterisk.com/show/dance2013/sub/blue> a ns1:Submaster ;
     rdfs:label "blue" ;
-    ns1:lightLevel <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/381609671>,
+    ns1:lightLevel <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/245085077>,
+        <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/381609671>,
         <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/536526494>,
         <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/642834876>,
+        <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/659210217>,
         <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/68042273>,
         <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/721791433>,
         <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/761872566>,
-        <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/940402239> .
+        <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/940402239>,
+        <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/970547308> .
+
+<http://light9.bigasterisk.com/show/dance2013/sub/blue/map/245085077> a ns1:ChannelSetting ;
+    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/f1-blue> ;
+    ns1:level 4.05e-01 .
 
 <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/381609671> a ns1:ChannelSetting ;
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/rgb2-b> ;
-    ns1:level 1 .
+    ns1:level 0e+00 .
 
 <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/536526494> a ns1:ChannelSetting ;
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/blue4> ;
@@ -26,6 +33,10 @@
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/blue3> ;
     ns1:level 1e+00 .
 
+<http://light9.bigasterisk.com/show/dance2013/sub/blue/map/659210217> a ns1:ChannelSetting ;
+    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/f11-blue> ;
+    ns1:level 3.8e-01 .
+
 <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/68042273> a ns1:ChannelSetting ;
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/blue1> ;
     ns1:level 1e+00 .
@@ -36,9 +47,13 @@
 
 <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/761872566> a ns1:ChannelSetting ;
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/rgb3-b> ;
-    ns1:level 4.8e-01 .
+    ns1:level 5.8e-01 .
 
 <http://light9.bigasterisk.com/show/dance2013/sub/blue/map/940402239> a ns1:ChannelSetting ;
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/rgb1-b> ;
+    ns1:level 0e+00 .
+
+<http://light9.bigasterisk.com/show/dance2013/sub/blue/map/970547308> a ns1:ChannelSetting ;
+    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/f12-purp> ;
     ns1:level 1e+00 .
 
--- a/show/dance2014/sub/cyc.n3	Sun Jun 15 04:37:58 2014 +0000
+++ b/show/dance2014/sub/cyc.n3	Sun Jun 15 06:18:06 2014 +0000
@@ -13,14 +13,6 @@
         <http://light9.bigasterisk.com/sub/local/1371318911.67/map/703463736>,
         <http://light9.bigasterisk.com/sub/local/1371318911.67/map/730845040> .
 
-<http://light9.bigasterisk.com/sub/local/1371318911.67/map/41358376> a ns1:ChannelSetting ;
-    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/up-l> ;
-    ns1:level 0e+00 .
-
-<http://light9.bigasterisk.com/sub/local/1371318911.67/map/440671256> a ns1:ChannelSetting ;
-    ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/up-r> ;
-    ns1:level 0e+00 .
-
 <http://light9.bigasterisk.com/sub/local/1371318911.67/map/54019112> a ns1:ChannelSetting ;
     ns1:channel <http://light9.bigasterisk.com/theater/piedmont/channel/cyc-left> ;
     ns1:level 1e+00 .