Add LXColor16 class; move the LXColor.Blend enum to BlendMode.

SymmetryLabs · Apr 20, 2018 · dada6db · dada6db
1 parent 2e67b97
commit dada6db
Show file tree

Hide file tree

Showing 4 changed files with 650 additions and 19 deletions.
diff --git a/src/heronarts/lx/LXLayeredComponent.java b/src/heronarts/lx/LXLayeredComponent.java
@@ -20,6 +20,7 @@
 
 package heronarts.lx;
 
+import heronarts.lx.color.BlendMode;
 import heronarts.lx.color.LXColor;
 import heronarts.lx.color.LXPalette;
 import heronarts.lx.model.LXFixture;
@@ -177,12 +178,12 @@ protected final LXLayeredComponent setColor(int i, int c) {
    *
    * @return this
    */
-  protected final LXLayeredComponent blendColor(int i, int c, LXColor.Blend blendMode) {
+  protected final LXLayeredComponent blendColor(int i, int c, BlendMode blendMode) {
     this.colors[i] = LXColor.blend(this.colors[i], c, blendMode);
     return this;
   }
 
-  protected final LXLayeredComponent blendColor(LXFixture f, int c, LXColor.Blend blendMode) {
+  protected final LXLayeredComponent blendColor(LXFixture f, int c, BlendMode blendMode) {
     for (LXPoint p : f.getPoints()) {
       this.colors[p.index] = LXColor.blend(this.colors[p.index], c, blendMode);
     }

diff --git a/src/heronarts/lx/color/BlendMode.java b/src/heronarts/lx/color/BlendMode.java
@@ -0,0 +1,14 @@
+package heronarts.lx.color;
+
+/**
+ * Color blending modes
+ */
+public enum BlendMode {
+  LERP,
+  ADD,
+  SUBTRACT,
+  MULTIPLY,
+  SCREEN,
+  LIGHTEST,
+  DARKEST
+}
diff --git a/src/heronarts/lx/color/LXColor.java b/src/heronarts/lx/color/LXColor.java
@@ -22,24 +22,9 @@
 
 import java.awt.Color;
 
-/**
- * Various utilities that operate on color values
- */
+/** Various utilities that operate on 32-bit integers representing RGBA colors */
 public class LXColor {
 
-  /**
-   * Color blending modes
-   */
-  public enum Blend {
-    LERP,
-    ADD,
-    SUBTRACT,
-    MULTIPLY,
-    SCREEN,
-    LIGHTEST,
-    DARKEST
-  }
-
   public static final int BLACK = 0xff000000;
   public static final int WHITE = 0xffffffff;
   public static final int RED = 0xffff0000;
@@ -71,6 +56,20 @@ public static byte blue(int argb) {
     return (byte) (argb & BLUE_MASK);
   }
 
+  public static long toLong(int argb) {
+    // If we were to shift left by 8, then 0xff would become 0xff00.
+    // Instead, we multiply by 0x0101, so that 0xff becomes 0xffff.
+    return LXColor16.rgba(
+        (int) red(argb) * 0x0101,
+        (int) green(argb) * 0x0101,
+        (int) blue(argb) * 0x0101,
+        (int) alpha(argb) * 0x0101);
+  }
+
+  public static void intsToLongs(int[] ints, long[] longs) {
+    for (int i = 0; i < ints.length; i++) longs[i] = toLong(ints[i]);
+  }
+
   /**
    * Hue of a color from 0-360
    *
@@ -390,7 +389,7 @@ public static float[] RGBtoHSB(int rgb, float[] hsb) {
    * @param blendMode Type of blending
    * @return Blended color
    */
-  public static int blend(int c1, int c2, Blend blendMode) {
+  public static int blend(int c1, int c2, BlendMode blendMode) {
     switch (blendMode) {
     case ADD:
       return add(c1, c2);