X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FColor.java;h=c3f782f99682be51c184b7b51418a6030bfbc9f2;hb=a4fb845a65eb734bc9ee681e4756cf1a405c4ac8;hp=1e92da9c193d5052b3ed0963a27948308042f76a;hpb=65af4342c4259d9b99de31a65be58cb1ec4e524d;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/Color.java b/src/kaka/cakelight/Color.java
index 1e92da9..c3f782f 100644
--- a/src/kaka/cakelight/Color.java
+++ b/src/kaka/cakelight/Color.java
@@ -1,6 +1,16 @@
 package kaka.cakelight;
 
 public class Color {
+    public static final Color BLACK = Color.rgb(0, 0, 0);
+
+    private static int[] gammaCorrection = new int[256];
+
+    public static void calculateGammaCorrection(double gamma) {
+        for (int i = 0, max = 255; i <= max; i++) {
+            gammaCorrection[i] = (int)(Math.pow((double)i / max, gamma) * max);
+        }
+    }
+
     private int r, g, b;
 
     public static Color rgb(double r, double g, double b) {
@@ -15,6 +25,11 @@ public class Color {
         return c;
     }
 
+    /**
+     * @param hue 0.0 - 1.0
+     * @param saturation 0.0 - 1.0
+     * @param value 0.0 - 1.0
+     */
     public static Color hsv(double hue, double saturation, double value) {
         double normalizedHue = hue - Math.floor(hue);
         int h = (int)(normalizedHue * 6);
@@ -34,16 +49,55 @@ public class Color {
         }
     }
 
+    public double[] toHSV() {
+        return toHSV(r / 255.0, g / 255.0, b / 255.0);
+    }
+
+    /**
+     * @return an array with hsv values ranging from 0.0 to 1.0
+     */
+    public static double[] toHSV(double r, double g, double b) {
+        double h, s, v;
+        double min = Math.min(Math.min(r, g), b);
+        double max = Math.max(Math.max(r, g), b);
+
+        if (max == 0) {
+            return new double[] {0, 0, 0};
+        }
+
+        // Value
+        v = max;
+
+        // Saturation
+        double delta = max - min;
+        s = delta / max;
+
+        // Hue
+        if (r == max) {
+            h = (g - b) / delta; // between yellow & magenta
+        } else if (g == max) {
+            h = 2 + (b - r) / delta; // between cyan & yellow
+        } else {
+            h = 4 + (r - g) / delta; // between magenta & cyan
+        }
+
+        h /= 6.0;
+        if (h < 0)
+            h += 1;
+
+        return new double[] {h, s, v};
+    }
+
     public int r() {
-        return r;
+        return gammaCorrection[r];
     }
 
     public int g() {
-        return g;
+        return gammaCorrection[g];
     }
 
     public int b() {
-        return b;
+        return gammaCorrection[b];
     }
 
     public Color interpolate(Color other, double value) {