New LX fixes FlashEffect bug

[SugarCubes.git] / MicahScott.pde

diff --git a/MicahScott.pde b/MicahScott.pde
index 916bf68a66b34d10d8d27d8eb57881ef0eab6f35..0eb967b62526e8b934023905a924a4d808b4ebcb 100644 (file)
--- a/MicahScott.pde
+++ b/MicahScott.pde
@@ -2,36 +2,53 @@
 class Rings extends SCPattern {
 
     float dx, dy, dz;
-    float angleParam, z, hue, satParam, spacingParam;
+    float angleParam, spacingParam;
     float dzParam, centerParam;
 
-    public Rings(GLucose glucose) {
-        super(glucose);
+    BasicParameter pDepth = new BasicParameter("DEPTH", 0.6);
+    BasicParameter pBright = new BasicParameter("BRT", 0.75);    
+    BasicParameter pHue = new BasicParameter("HUE", 0.39);
+    BasicParameter pSaturation = new BasicParameter("SAT", 0.5);
+
+    BasicParameter pSpeed1 = new BasicParameter("SPD1", 0.2);
+    BasicParameter pSpeed2 = new BasicParameter("SPD2", 0.4);
+    BasicParameter pScale = new BasicParameter("SCALE", 0.15);
+
+    public Rings(LX lx) {
+        super(lx);
+        addParameter(pDepth);
+        addParameter(pBright);
+        addParameter(pHue);
+        addParameter(pSaturation);
+
+        addParameter(pSpeed1);
+        addParameter(pSpeed2);
+        addParameter(pScale);
     }
 
     public void run(double deltaMs) {
 
-        float noiseScale = 0.02;
-        float speed = 0.002;
-        float zspeed = 0.04;
-        float scale = 1.0;
-
-        angleParam += (deltaMs * 0.001) % (2*PI);
+        float xyspeed = pSpeed1.getValuef() * 0.01;
+        float zspeed = pSpeed1.getValuef() * 0.08;
+        float scale = pScale.getValuef() * 20.0;
+        float br = pBright.getValuef() * 3.0;
+        float gamma = 3.0;
+        float depth = 1.0 - pDepth.getValuef();
+        float hue = pHue.getValuef() * 360.0;
+        float saturation = pSaturation.getValuef() * 100;
+
+        float angleSpeed = pSpeed1.getValuef() * 0.002;
+        angleParam = (float)((angleParam + angleSpeed * deltaMs) % (2*PI));
         float angle = sin(angleParam);
 
-        z += deltaMs * 0.0008;
-        hue += (deltaMs * 0.036) % 360;
-
-        satParam += deltaMs * 0.000122;
-        spacingParam += deltaMs * 0.000124;
+        spacingParam += deltaMs * pSpeed2.getValuef() * 0.001;
         dzParam += deltaMs * 0.000014;
-        centerParam += deltaMs * 0.000125;
+        centerParam += deltaMs * pSpeed2.getValuef() * 0.001;
 
-        float saturation = 100 * constrain(pow(1.9 * noise(satParam), 2.5), 0, 1);
         float spacing = noise(spacingParam) * 50;
 
-        dx += cos(angle) * speed;
-        dy += sin(angle) * speed;
+        dx += cos(angle) * xyspeed;
+        dy += sin(angle) * xyspeed;
         dz += (pow(noise(dzParam), 1.8) - 0.5) * zspeed;
 
         float centerx = map(noise(centerParam, 100), 0, 1, -0.1, 1.1);
@@ -52,14 +69,20 @@ class Rings extends SCPattern {
             float pulse = (sin(dz + dist * spacing) - 0.3) * 0.6;
 
             noiseDetail(4);
-            float n = map(noise(dx + x*scale + pulse, dy + y*scale, dz + z*scale), 0, 1, -0.65, 1);
-            float m = map(noise(dx + x*scale, dy + y*scale, dz + z*scale), 0, 1, 0, 300);
+            float n = map(noise(dx + (x - centerx) * scale + centerx + pulse,
+                                dy + (y - centery) * scale + centery,
+                                dz + (z - centerz) * scale + centerz)
+                          - depth, 0, 1, 0, 2.0);
+            float m = map(noise(dx + (x - centerx) * scale + centerx,
+                                dy + (y - centery) * scale + centery,
+                                dz + (z - centerz) * scale + centerz),
+                          0, 1, 0, 300);
             noiseDetail(1);
 
             colors[p.index] = lx.hsb(
                 (hue + m) % 360.0,
                 saturation,
-                100 * constrain(pow(3.0 * n, 3.5), 0, 1.0)
+                100 * constrain(pow(br * n, gamma), 0, 1.0)
                 );
         }
     }