diff --git a/light9/effect/effecteval.py b/light9/effect/effecteval.py --- a/light9/effect/effecteval.py +++ b/light9/effect/effecteval.py @@ -307,9 +307,9 @@ def effect_chase1(effectSettings, streng 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): diff --git a/show/dance2017/song1.n3 b/show/dance2017/song1.n3 --- a/show/dance2017/song1.n3 +++ b/show/dance2017/song1.n3 @@ -8,13 +8,38 @@ @prefix xml: . @prefix xsd: . -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 . diff --git a/show/dance2017/song16.n3 b/show/dance2017/song16.n3 --- a/show/dance2017/song16.n3 +++ b/show/dance2017/song16.n3 @@ -7,7 +7,7 @@ @prefix xml: . @prefix xsd: . -show:song16 :note , , , , , , , , , , , , , , , , , , , , , , , , , , . +show:song16 :note , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . a :Note; :curve ; :effectClass effect:e1; :originTime 137.983 . @@ -410,9 +410,9 @@ show:song16 :note :time -20.505; :value 1.000 . - :time 80.864; + :time 82.439; :value 1.000 . - :time 84.191; + :time 82.631; :value 0.000 . a :Note; @@ -430,6 +430,66 @@ show:song16 :note :time 24.240; :value 0.000 . + a :Note; + :curve ; + :effectClass effect:spiderpurple; :originTime 597.086 . + + a :Curve; + :attr :strength; :point , , , . + :time -0.969; + :value 0.000 . + :time -0.912; + :value 1.000 . + :time 51.496; + :value 1.000 . + :time 52.764; + :value 0.000 . + + a :Note; + :curve ; + :effectClass effect:rainbow; :originTime 612.557 . + + a :Curve; + :attr :strength; :point , , , . + :time 2.473; + :value 0.000 . + :time 3.604; + :value 1.000 . + :time 52.889; + :value 1.000 . + :time 55.169; + :value 0.000 . + + a :Note; + :curve ; + :effectClass effect:lightning; :originTime 648.177 . + + a :Curve; + :attr :strength; :point , , , . + :time 1.173; + :value 0.000 . + :time 1.825; + :value 1.000 . + :time 8.153; + :value 1.000 . + :time 9.515; + :value 0.000 . + + a :Note; + :curve ; + :effectClass effect:qfill; :originTime 653.361 . + + a :Curve; + :attr :strength; :point , , , . + :time 2.974; + :value 0.000 . + :time 5.330; + :value 1.000 . + :time 12.268; + :value 1.000 . + :time 14.626; + :value 0.000 . + a :Curve; :attr :strength; :point , , , . :time 0.000; diff --git a/show/dance2017/song17.n3 b/show/dance2017/song17.n3 new file mode 100644 --- /dev/null +++ b/show/dance2017/song17.n3 @@ -0,0 +1,70 @@ +@prefix : . +@prefix dev: . +@prefix effect: . +@prefix rdf: . +@prefix rdfs: . +@prefix show: . +@prefix xml: . +@prefix xsd: . + +show:song17 :note , , , . + + a :Note; :curve ; + :effectClass effect:aurafill; :originTime 2.544; :setting . + + a :Curve; + :attr :strength; :point , , , . + :time 0.864; + :value 0.000 . + :time 4.268; + :value 1.000 . + :time 202.627; + :value 1.000 . + :time 205.937; + :value 0.000 . + :effectAttr :colorScale; + :value "#ffdfac" . + + a :Note; :curve ; + :effectClass effect:qfill; :originTime 8.970 . + + a :Curve; + :attr :strength; :point , , , . + :time -5.487; + :value 0.000 . + :time -1.804; + :value 1.000 . + :time 196.341; + :value 1.000 . + :time 199.571; + :value 0.000 . + + a :Note; :curve ; + :effectClass effect:houseside; :originTime 128.388 . + + a :Curve; + :attr :strength; :point , , , . + :time 0.000; + :value 0.000 . + :time 15.261; + :value 1.000 . + :time 76.919; + :value 1.000 . + :time 79.966; + :value 0.000 . + + a :Note; :curve ; + :effectClass effect:posts; :originTime 137.101; :setting . + + a :Curve; + :attr :strength; :point , , , . + :time -5.244; + :value 0.000 . + :time 15.261; + :value 1.000 . + :time 68.132; + :value 1.000 . + :time 71.180; + :value 0.000 . + :effectAttr :colorScale; + :value "#ff9088" . diff --git a/show/dance2017/song6.n3 b/show/dance2017/song6.n3 --- a/show/dance2017/song6.n3 +++ b/show/dance2017/song6.n3 @@ -23,7 +23,7 @@ show:song6 :note :time 190.799; :value 0.000 . :effectAttr :colorScale; - :value "#8b8b8b" . + :value "#ffffff" . a :Note; :curve ; :effectClass effect:tropic; :originTime 0.323 .