Minor UI cleanups, make spacing and border colors consistent

[SugarCubes.git] / MarkSlee.pde

diff --git a/MarkSlee.pde b/MarkSlee.pde
index 68d8de143f334e81c41b3317ff9f9286f586ef4e..7e0f46f279eb8e59ff941d83a84d05dda72a7b22 100644 (file)
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -128,6 +128,34 @@ class SwipeTransition extends SCTransition {
   }
 }
 
+class MaskTransition extends SCTransition {
+  
+  MaskTransition(GLucose glucose) {
+    super(glucose);
+  }
+
+  void computeBlend(int[] c1, int[] c2, double progress) {
+    if (progress < 0.5) {
+      for (int i = 0; i < c1.length; ++i) {
+        colors[i] = lerpColor(
+          c1[i],
+          blendColor(c1[i], c2[i], MULTIPLY),
+          (float) (2.*progress),
+          RGB);
+      }
+    } else {
+      for (int i = 0; i < c1.length; ++i) {
+        colors[i] = lerpColor(
+          c2[i],
+          blendColor(c1[i], c2[i], MULTIPLY),
+          (float) (2.*(1. - progress)),
+          RGB);
+      }
+    }
+  }
+}
+
+
 class BassPod extends SCPattern {
 
   private GraphicEQ eq = null;
@@ -705,3 +733,35 @@ class Traktor extends SCPattern {
     }
   }
 }
+
+class ColorFuckerEffect extends SCEffect {
+  
+  BasicParameter hueShift = new BasicParameter("HSHFT", 0);
+  BasicParameter sat = new BasicParameter("SAT", 1);  
+  BasicParameter bright = new BasicParameter("BRT", 1);
+  
+  ColorFuckerEffect(GLucose glucose) {
+    super(glucose);
+    addParameter(hueShift);
+    addParameter(bright);
+    addParameter(sat);    
+  }
+  
+  public void doApply(int[] colors) {
+    if (!enabled) {
+      return;
+    }
+    float bMod = bright.getValuef();
+    float sMod = sat.getValuef();
+    float hMod = hueShift.getValuef();
+    if (bMod < 1 || sMod < 1 || hMod > 0) {    
+      for (int i = 0; i < colors.length; ++i) {
+        colors[i] = color(
+          (hue(colors[i]) + hueShift.getValuef()*360.) % 360,
+          saturation(colors[i]) * sat.getValuef(),
+          brightness(colors[i]) * bright.getValuef()
+        );
+      }
+    }
+  }
+}