Mercurial > code > home > repos > light9

changeset 1836:0dd0b5e282b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qsweepusa effects Ignore-this: 651c0975777e428f35047a68083aad94
author drewp@bigasterisk.com
date Sat, 09 Jun 2018 22:40:39 +0000
parents a5a8e2eca252
children 392f4bfb4a19
files light9/effect/effecteval.py show/dance2018/effect.n3 show/dance2018/song10.n3
diffstat 3 files changed, 29 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/light9/effect/effecteval.py	Sat Jun 09 22:16:04 2018 +0000
+++ b/light9/effect/effecteval.py	Sat Jun 09 22:40:39 2018 +0000
@@ -12,6 +12,8 @@
 from light9.effect.settings import DeviceSettings
 from light9.effect.scale import scale
 import random
+random.seed(0)
+print "reload effecteval"
 
 log = logging.getLogger('effecteval')
 
@@ -198,6 +200,29 @@
             })
     return out
 
+def effect_qsweepusa(effectSettings, strength, songTime, noteTime):
+    out = {}
+    period = float(effectSettings.get(L9['period'], 2))
+
+    colmap = {
+        1: '#ff0000',
+        2: '#888888',
+        3: '#5050ff',
+    }
+    
+    for n in range(1, 3+1):
+        dev = L9['device/q%s' % n]
+        out.update({
+            (dev, L9['color']): scale(colmap[n], effectSettings.get(L9['strength'], 1)),
+            (dev, L9['zoom']): effectSettings.get(L9['zoom'], .5),
+            })
+        out.update({
+            (dev, L9['rx']):
+            lerp(.3, .8, nsin(songTime / period + n / 4)),
+            (dev, L9['ry']): effectSettings.get(L9['ry'], .5),
+            })
+    return out
+
 chase1_members = [
         DEV['backlight1'],
         DEV['lip1'],
@@ -242,7 +267,7 @@
     members = chase2_members
     
     out = {}
-    period = float(effectSettings.get(L9['period'], 2 / len(members)))
+    period = float(effectSettings.get(L9['period'], 0.3))
 
     for i, dev in enumerate(members):
         cursor = (songTime / period) % float(len(members))
--- a/show/dance2018/effect.n3	Sat Jun 09 22:16:04 2018 +0000
+++ b/show/dance2018/effect.n3	Sat Jun 09 22:40:39 2018 +0000
@@ -23,6 +23,7 @@
 
 effect:orangeSearch a :Effect; :publishAttr :strength ; :group "anim".
 effect:qsweep a :Effect; :publishAttr :strength ; :group "anim".
+effect:qsweepusa a :Effect; :publishAttr :strength ; :group "anim".
 effect:chase1 a :Effect; :publishAttr :strength ; :group "anim".
 effect:chase2 a :Effect; :publishAttr :strength ; :group "anim".
 
--- a/show/dance2018/song10.n3	Sat Jun 09 22:16:04 2018 +0000
+++ b/show/dance2018/song10.n3	Sat Jun 09 22:40:39 2018 +0000
@@ -56,3 +56,5 @@
      :value 0e+00 .
 <http://light9.bigasterisk.com/show/dance2018/song10/n2set0> :effectAttr :colorScale;
      :value "#3a3c3a" .
+
+effect:qsweepusa a :Effect; :publishAttr :strength ; :group "anim".
\ No newline at end of file