Mercurial > code > home > repos > light9

changeset 1688:b862b881c05f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
show cp Ignore-this: 5e5e33d9951448a4eba98e85bd8d7d0b
author drewp@bigasterisk.com
date Mon, 12 Jun 2017 01:37:48 +0000
parents ba783da4746b
children 68a70a96c308
files light9/effect/effecteval.py show/dance2017/song1.n3 show/dance2017/song16.n3 show/dance2017/song17.n3 show/dance2017/song6.n3
diffstat 5 files changed, 165 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/light9/effect/effecteval.py	Mon Jun 12 00:43:43 2017 +0000
+++ b/light9/effect/effecteval.py	Mon Jun 12 01:37:48 2017 +0000
@@ -307,9 +307,9 @@
 def effect_orangeSearch(effectSettings, strength, songTime, noteTime):
     dev = L9['device/auraStage']
     return {(dev, L9['color']): '#a885ff',
-            (dev, L9['rx']): lerp(0, .36, nsin(songTime / 2.0)),
-            (dev, L9['ry']): lerp(.5, .6,  nsin(songTime / 5)),
-            (dev, L9['zoom']): .88,
+            (dev, L9['rx']): lerp(.65, 1, nsin(songTime / 2.0)),
+            (dev, L9['ry']): .6,
+            (dev, L9['zoom']): 1,
             }
     
 def effect_Strobe(effectSettings, strength, songTime, noteTime):
--- a/show/dance2017/song1.n3	Mon Jun 12 00:43:43 2017 +0000
+++ b/show/dance2017/song1.n3	Mon Jun 12 01:37:48 2017 +0000
@@ -8,13 +8,38 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-show:song1 :note song:n0 .
+show:song1 :note song:n1, song:n2, song:n3 .
 
-song:n0 a :Note; :curve song:n0c0; :effectClass effect:e3;
-     :originTime 52.219 .
+song:n0 a :Note; :curve song:n0c0; :effectClass effect:e3; :originTime 52.219 .
 
 song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
 song:n0c0p0 :time 0.000; :value 0.000 .
 song:n0c0p1 :time 37.452; :value 1.000 .
 song:n0c0p2 :time 74.904; :value 1.000 .
 song:n0c0p3 :time 112.356; :value 0.000 .
+
+song:n1 a :Note; :curve song:n1c0; :effectClass effect:posts; :originTime 27.949 .
+
+song:n1c0 a :Curve; :attr :strength; :point song:n1c0p0, song:n1c0p1, song:n1c0p2, song:n1c0p3 .
+song:n1c0p0 :time -24.481; :value 0.000 .
+song:n1c0p1 :time -16.184; :value 1.000 .
+song:n1c0p2 :time 158.529; :value 1.000 .
+song:n1c0p3 :time 161.634; :value 0.000 .
+
+song:n2 a :Note; :curve song:n2c0; :effectClass effect:aurafill; :originTime 50.711;
+     :setting song:n2set0 .
+
+song:n2c0 a :Curve; :attr :strength; :point song:n2c0p0, song:n2c0p1, song:n2c0p2, song:n2c0p3 .
+song:n2c0p0 :time -47.864; :value 0.000 .
+song:n2c0p1 :time -45.204; :value 1.000 .
+song:n2c0p2 :time 135.668; :value 1.000 .
+song:n2c0p3 :time 138.883; :value 0.000 .
+song:n2set0 :effectAttr :colorScale; :value "#ffd9ce" .
+
+song:n3 a :Note; :curve song:n3c0; :effectClass effect:qfill; :originTime 34.204 .
+
+song:n3c0 a :Curve; :attr :strength; :point song:n3c0p0, song:n3c0p1, song:n3c0p2, song:n3c0p3 .
+song:n3c0p0 :time -30.738; :value 0.000 .
+song:n3c0p1 :time -28.823; :value 1.000 .
+song:n3c0p2 :time 152.127; :value 1.000 .
+song:n3c0p3 :time 155.385; :value 0.000 .
--- a/show/dance2017/song16.n3	Mon Jun 12 00:43:43 2017 +0000
+++ b/show/dance2017/song16.n3	Mon Jun 12 01:37:48 2017 +0000
@@ -7,7 +7,7 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-show:song16 :note <http://light9.bigasterisk.com/show/dance2017/song16/n10>, <http://light9.bigasterisk.com/show/dance2017/song16/n11>, <http://light9.bigasterisk.com/show/dance2017/song16/n12>, <http://light9.bigasterisk.com/show/dance2017/song16/n13>, <http://light9.bigasterisk.com/show/dance2017/song16/n14>, <http://light9.bigasterisk.com/show/dance2017/song16/n15>, <http://light9.bigasterisk.com/show/dance2017/song16/n16>, <http://light9.bigasterisk.com/show/dance2017/song16/n17>, <http://light9.bigasterisk.com/show/dance2017/song16/n18>, <http://light9.bigasterisk.com/show/dance2017/song16/n19>, <http://light9.bigasterisk.com/show/dance2017/song16/n20>, <http://light9.bigasterisk.com/show/dance2017/song16/n21>, <http://light9.bigasterisk.com/show/dance2017/song16/n22>, <http://light9.bigasterisk.com/show/dance2017/song16/n23>, <http://light9.bigasterisk.com/show/dance2017/song16/n24>, <http://light9.bigasterisk.com/show/dance2017/song16/n25>, <http://light9.bigasterisk.com/show/dance2017/song16/n26>, <http://light9.bigasterisk.com/show/dance2017/song16/n28>, <http://light9.bigasterisk.com/show/dance2017/song16/n29>, <http://light9.bigasterisk.com/show/dance2017/song16/n30>, <http://light9.bigasterisk.com/show/dance2017/song16/n31>, <http://light9.bigasterisk.com/show/dance2017/song16/n32>, <http://light9.bigasterisk.com/show/dance2017/song16/n5>, <http://light9.bigasterisk.com/show/dance2017/song16/n6>, <http://light9.bigasterisk.com/show/dance2017/song16/n7>, <http://light9.bigasterisk.com/show/dance2017/song16/n8>, <http://light9.bigasterisk.com/show/dance2017/song16/n9> .
+show:song16 :note <http://light9.bigasterisk.com/show/dance2017/song16/n10>, <http://light9.bigasterisk.com/show/dance2017/song16/n11>, <http://light9.bigasterisk.com/show/dance2017/song16/n12>, <http://light9.bigasterisk.com/show/dance2017/song16/n13>, <http://light9.bigasterisk.com/show/dance2017/song16/n14>, <http://light9.bigasterisk.com/show/dance2017/song16/n15>, <http://light9.bigasterisk.com/show/dance2017/song16/n16>, <http://light9.bigasterisk.com/show/dance2017/song16/n17>, <http://light9.bigasterisk.com/show/dance2017/song16/n18>, <http://light9.bigasterisk.com/show/dance2017/song16/n19>, <http://light9.bigasterisk.com/show/dance2017/song16/n20>, <http://light9.bigasterisk.com/show/dance2017/song16/n21>, <http://light9.bigasterisk.com/show/dance2017/song16/n22>, <http://light9.bigasterisk.com/show/dance2017/song16/n23>, <http://light9.bigasterisk.com/show/dance2017/song16/n24>, <http://light9.bigasterisk.com/show/dance2017/song16/n25>, <http://light9.bigasterisk.com/show/dance2017/song16/n26>, <http://light9.bigasterisk.com/show/dance2017/song16/n28>, <http://light9.bigasterisk.com/show/dance2017/song16/n29>, <http://light9.bigasterisk.com/show/dance2017/song16/n30>, <http://light9.bigasterisk.com/show/dance2017/song16/n31>, <http://light9.bigasterisk.com/show/dance2017/song16/n32>, <http://light9.bigasterisk.com/show/dance2017/song16/n33>, <http://light9.bigasterisk.com/show/dance2017/song16/n34>, <http://light9.bigasterisk.com/show/dance2017/song16/n35>, <http://light9.bigasterisk.com/show/dance2017/song16/n36>, <http://light9.bigasterisk.com/show/dance2017/song16/n5>, <http://light9.bigasterisk.com/show/dance2017/song16/n6>, <http://light9.bigasterisk.com/show/dance2017/song16/n7>, <http://light9.bigasterisk.com/show/dance2017/song16/n8>, <http://light9.bigasterisk.com/show/dance2017/song16/n9> .
 
 <http://light9.bigasterisk.com/show/dance2017/song16/n0> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song16/n0c0>;
      :effectClass effect:e1; :originTime 137.983 .
@@ -410,9 +410,9 @@
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2017/song16/n31c0p1> :time -20.505;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2017/song16/n31c0p2> :time 80.864;
+<http://light9.bigasterisk.com/show/dance2017/song16/n31c0p2> :time 82.439;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2017/song16/n31c0p3> :time 84.191;
+<http://light9.bigasterisk.com/show/dance2017/song16/n31c0p3> :time 82.631;
      :value 0.000 .
 
 <http://light9.bigasterisk.com/show/dance2017/song16/n32> a :Note;
@@ -430,6 +430,66 @@
 <http://light9.bigasterisk.com/show/dance2017/song16/n32c0p3> :time 24.240;
      :value 0.000 .
 
+<http://light9.bigasterisk.com/show/dance2017/song16/n33> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2017/song16/n33c0>;
+     :effectClass effect:spiderpurple; :originTime 597.086 .
+
+<http://light9.bigasterisk.com/show/dance2017/song16/n33c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song16/n33c0p0>, <http://light9.bigasterisk.com/show/dance2017/song16/n33c0p1>, <http://light9.bigasterisk.com/show/dance2017/song16/n33c0p2>, <http://light9.bigasterisk.com/show/dance2017/song16/n33c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song16/n33c0p0> :time -0.969;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n33c0p1> :time -0.912;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n33c0p2> :time 51.496;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n33c0p3> :time 52.764;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2017/song16/n34> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2017/song16/n34c0>;
+     :effectClass effect:rainbow; :originTime 612.557 .
+
+<http://light9.bigasterisk.com/show/dance2017/song16/n34c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song16/n34c0p0>, <http://light9.bigasterisk.com/show/dance2017/song16/n34c0p1>, <http://light9.bigasterisk.com/show/dance2017/song16/n34c0p2>, <http://light9.bigasterisk.com/show/dance2017/song16/n34c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song16/n34c0p0> :time 2.473;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n34c0p1> :time 3.604;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n34c0p2> :time 52.889;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n34c0p3> :time 55.169;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2017/song16/n35> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2017/song16/n35c0>;
+     :effectClass effect:lightning; :originTime 648.177 .
+
+<http://light9.bigasterisk.com/show/dance2017/song16/n35c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song16/n35c0p0>, <http://light9.bigasterisk.com/show/dance2017/song16/n35c0p1>, <http://light9.bigasterisk.com/show/dance2017/song16/n35c0p2>, <http://light9.bigasterisk.com/show/dance2017/song16/n35c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song16/n35c0p0> :time 1.173;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n35c0p1> :time 1.825;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n35c0p2> :time 8.153;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n35c0p3> :time 9.515;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2017/song16/n36> a :Note;
+     :curve <http://light9.bigasterisk.com/show/dance2017/song16/n36c0>;
+     :effectClass effect:qfill; :originTime 653.361 .
+
+<http://light9.bigasterisk.com/show/dance2017/song16/n36c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song16/n36c0p0>, <http://light9.bigasterisk.com/show/dance2017/song16/n36c0p1>, <http://light9.bigasterisk.com/show/dance2017/song16/n36c0p2>, <http://light9.bigasterisk.com/show/dance2017/song16/n36c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song16/n36c0p0> :time 2.974;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n36c0p1> :time 5.330;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n36c0p2> :time 12.268;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song16/n36c0p3> :time 14.626;
+     :value 0.000 .
+
 <http://light9.bigasterisk.com/show/dance2017/song16/n3c0> a :Curve;
      :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song16/n3c0p0>, <http://light9.bigasterisk.com/show/dance2017/song16/n3c0p1>, <http://light9.bigasterisk.com/show/dance2017/song16/n3c0p2>, <http://light9.bigasterisk.com/show/dance2017/song16/n3c0p3> .
 <http://light9.bigasterisk.com/show/dance2017/song16/n3c0p0> :time 0.000;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/show/dance2017/song17.n3	Mon Jun 12 01:37:48 2017 +0000
@@ -0,0 +1,70 @@
+@prefix : <http://light9.bigasterisk.com/> .
+@prefix dev: <http://light9.bigasterisk.com/device/> .
+@prefix effect: <http://light9.bigasterisk.com/effect/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix show: <http://light9.bigasterisk.com/show/dance2017/> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+show:song17 :note <http://light9.bigasterisk.com/show/dance2017/song17/n0>, <http://light9.bigasterisk.com/show/dance2017/song17/n1>, <http://light9.bigasterisk.com/show/dance2017/song17/n2>, <http://light9.bigasterisk.com/show/dance2017/song17/n3> .
+
+<http://light9.bigasterisk.com/show/dance2017/song17/n0> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song17/n0c0>;
+     :effectClass effect:aurafill; :originTime 2.544; :setting <http://light9.bigasterisk.com/show/dance2017/song17/n0set0> .
+
+<http://light9.bigasterisk.com/show/dance2017/song17/n0c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song17/n0c0p0>, <http://light9.bigasterisk.com/show/dance2017/song17/n0c0p1>, <http://light9.bigasterisk.com/show/dance2017/song17/n0c0p2>, <http://light9.bigasterisk.com/show/dance2017/song17/n0c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song17/n0c0p0> :time 0.864;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n0c0p1> :time 4.268;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n0c0p2> :time 202.627;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n0c0p3> :time 205.937;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n0set0> :effectAttr :colorScale;
+     :value "#ffdfac" .
+
+<http://light9.bigasterisk.com/show/dance2017/song17/n1> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song17/n1c0>;
+     :effectClass effect:qfill; :originTime 8.970 .
+
+<http://light9.bigasterisk.com/show/dance2017/song17/n1c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song17/n1c0p0>, <http://light9.bigasterisk.com/show/dance2017/song17/n1c0p1>, <http://light9.bigasterisk.com/show/dance2017/song17/n1c0p2>, <http://light9.bigasterisk.com/show/dance2017/song17/n1c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song17/n1c0p0> :time -5.487;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n1c0p1> :time -1.804;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n1c0p2> :time 196.341;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n1c0p3> :time 199.571;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2017/song17/n2> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song17/n2c0>;
+     :effectClass effect:houseside; :originTime 128.388 .
+
+<http://light9.bigasterisk.com/show/dance2017/song17/n2c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song17/n2c0p0>, <http://light9.bigasterisk.com/show/dance2017/song17/n2c0p1>, <http://light9.bigasterisk.com/show/dance2017/song17/n2c0p2>, <http://light9.bigasterisk.com/show/dance2017/song17/n2c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song17/n2c0p0> :time 0.000;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n2c0p1> :time 15.261;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n2c0p2> :time 76.919;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n2c0p3> :time 79.966;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2017/song17/n3> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song17/n3c0>;
+     :effectClass effect:posts; :originTime 137.101; :setting <http://light9.bigasterisk.com/show/dance2017/song17/n3set0> .
+
+<http://light9.bigasterisk.com/show/dance2017/song17/n3c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song17/n3c0p0>, <http://light9.bigasterisk.com/show/dance2017/song17/n3c0p1>, <http://light9.bigasterisk.com/show/dance2017/song17/n3c0p2>, <http://light9.bigasterisk.com/show/dance2017/song17/n3c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song17/n3c0p0> :time -5.244;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n3c0p1> :time 15.261;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n3c0p2> :time 68.132;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n3c0p3> :time 71.180;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song17/n3set0> :effectAttr :colorScale;
+     :value "#ff9088" .
--- a/show/dance2017/song6.n3	Mon Jun 12 00:43:43 2017 +0000
+++ b/show/dance2017/song6.n3	Mon Jun 12 01:37:48 2017 +0000
@@ -23,7 +23,7 @@
 <http://light9.bigasterisk.com/show/dance2017/song6/n0c0p3> :time 190.799;
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2017/song6/n0set0> :effectAttr :colorScale;
-     :value "#8b8b8b" .
+     :value "#ffffff" .
 
 <http://light9.bigasterisk.com/show/dance2017/song6/n1> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song6/n1c0>;
      :effectClass effect:tropic; :originTime 0.323 .