added lerpColor(int, int, float) to PApplet

codeanticode · codeanticode · commit 4b6579607e7e · 2021-04-28T10:53:07.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -7471,12 +7471,20 @@ public final int color(float x, float y, float z, float a) {
   }
 
 
+  public int lerpColor(int c1, int c2, float amt) {
+    if (g != null) {
+      return g.lerpColor(c1, c2, amt);
+    }
+    // use the default mode (RGB) if lerpColor is called before setup()
+    return PGraphics.lerpColor(c1, c2, amt, RGB);
+  }
+
+
   static public int blendColor(int c1, int c2, int mode) {
     return PImage.blendColor(c1, c2, mode);
   }
 
 
-
   //////////////////////////////////////////////////////////////
 
   // MAIN
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -5702,13 +5702,16 @@ public int lerpColor(int c1, int c2, float amt) {
 
   static float[] lerpColorHSB1;
   static float[] lerpColorHSB2;
-  static float[] lerpColorHSB3;
+  static float[] lerpColorHSB3;  
 
   /**
    * Interpolate between two colors. Like lerp(), but for the
    * individual color components of a color supplied as an int value.
    */
   static public int lerpColor(int c1, int c2, float amt, int mode) {
+    if (amt < 0) amt = 0;
+    if (amt > 1) amt = 1;
+
     if (mode == RGB) {
       float a1 = ((c1 >> 24) & 0xff);
       float r1 = (c1 >> 16) & 0xff;
@@ -5719,10 +5722,10 @@ static public int lerpColor(int c1, int c2, float amt, int mode) {
       float g2 = (c2 >> 8) & 0xff;
       float b2 = c2 & 0xff;
 
-      return (((int) (a1 + (a2-a1)*amt) << 24) |
-              ((int) (r1 + (r2-r1)*amt) << 16) |
-              ((int) (g1 + (g2-g1)*amt) << 8) |
-              ((int) (b1 + (b2-b1)*amt)));
+      return ((PApplet.round(a1 + (a2-a1)*amt) << 24) |
+              (PApplet.round(r1 + (r2-r1)*amt) << 16) |
+              (PApplet.round(g1 + (g2-g1)*amt) << 8) |
+              (PApplet.round(b1 + (b2-b1)*amt)));
 
     } else if (mode == HSB) {
       if (lerpColorHSB1 == null) {
@@ -5733,7 +5736,7 @@ static public int lerpColor(int c1, int c2, float amt, int mode) {
 
       float a1 = (c1 >> 24) & 0xff;
       float a2 = (c2 >> 24) & 0xff;
-      int alfa = ((int) (a1 + (a2-a1)*amt)) << 24;
+      int alfa = (PApplet.round(a1 + (a2-a1)*amt)) << 24;
 
       Color.RGBToHSV((c1 >> 16) & 0xff, (c1 >> 8) & 0xff, c1 & 0xff,
                      lerpColorHSB1);
@@ -5765,23 +5768,21 @@ static public int lerpColor(int c1, int c2, float amt, int mode) {
       }
       float ho = (PApplet.lerp(lerpColorHSB1[0], lerpColorHSB2[0], amt)) % 1.0f;
       */
+      // float ho = PApplet.lerp(lerpColorHSB1[0], lerpColorHSB2[0], amt);
+      // float so = PApplet.lerp(lerpColorHSB1[1], lerpColorHSB2[1], amt);
+      // float bo = PApplet.lerp(lerpColorHSB1[2], lerpColorHSB2[2], amt);
 
-//      float ho = PActivity.lerp(lerpColorHSB1[0], lerpColorHSB2[0], amt);
-//      float so = PActivity.lerp(lerpColorHSB1[1], lerpColorHSB2[1], amt);
-//      float bo = PActivity.lerp(lerpColorHSB1[2], lerpColorHSB2[2], amt);
-//    return alfa | (Color.HSVtoRGB(ho, so, bo) & 0xFFFFFF);
-//    return Color.HSVToColor(alfa, new float[] { ho, so, bo });
+      // return alfa | (Color.RGBToHSV(ho, so, bo) & 0xFFFFFF);
 
       lerpColorHSB3[0] = PApplet.lerp(lerpColorHSB1[0], lerpColorHSB2[0], amt);
       lerpColorHSB3[1] = PApplet.lerp(lerpColorHSB1[1], lerpColorHSB2[1], amt);
       lerpColorHSB3[2] = PApplet.lerp(lerpColorHSB1[2], lerpColorHSB2[2], amt);
-      return Color.HSVToColor(alfa, lerpColorHSB3);
+      return Color.HSVToColor(alfa, lerpColorHSB3);      
     }
     return 0;
   }
 
 
-
   //////////////////////////////////////////////////////////////
 
   // BEGINRAW/ENDRAW
