X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=color.lisp;h=11f809eb33094e3e341acb9c329342fd3129d2a3;hp=64f0fb26fd2e31815f5b2dfbea3b68e5c55538be;hb=f6555d4ded6e1612ef1042fdbfd8df3c8eb5df18;hpb=823b4ff220ba55fbbd95e3442a1fdfe8de5661b1

diff --git a/color.lisp b/color.lisp
index 64f0fb2..11f809e 100644
--- a/color.lisp
+++ b/color.lisp
@@ -41,15 +41,15 @@
          (incf h 360))
   (while (>= h 360)
          (decf h 360))
-
-  (let ((h-pos (/ h 60))
-        r g b)
+  
+  (let ((h-pos (/ h 60)))
     (multiple-value-bind (h-int h-frac) (truncate h-pos)
       (declare (fixnum h-int))
       (let ((p (* v (- 1 s)))
             (q (* v (- 1 (* s h-frac))))
-            (t_ (* v (- 1 (* s (- 1 h-frac))))))
-
+            (t_ (* v (- 1 (* s (- 1 h-frac)))))
+            r g b)
+        
         (cond
          ((zerop h-int)
           (setf r v
@@ -74,50 +74,154 @@
          ((= 5 h-int)
           (setf r v
                 g p
-                b q)))))
-    (values r g b)))
+                b q)))
+        (values r g b)))))
+
+
+(defun hsv255->rgb255 (h s v) 
+  (declare (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)))
+
+  (when (zerop s)
+    (return-from hsv255->rgb255 (values v v v)))
+
+  (locally (declare (type fixnum h s v))
+    (while (minusp h)
+      (incf h 360))
+    (while (>= h 360)
+      (decf h 360))
+    
+    (let ((h-pos (/ h 60)))
+      (multiple-value-bind (h-int h-frac) (truncate h-pos)
+        (declare (fixnum h-int))
+        (let* ((fs (/ s 255))
+               (fv (/ v 255))
+               (p (round (* 255 fv (- 1 fs))))
+               (q (round (* 255 fv (- 1 (* fs h-frac)))))
+               (t_ (round (* 255 fv (- 1 (* fs (- 1 h-frac))))))
+               r g b)
+          
+          (cond
+           ((zerop h-int)
+            (setf r v
+                  g t_  
+                  b p))
+           ((= 1 h-int)
+            (setf r q
+                  g v
+                  b p))
+           ((= 2 h-int)
+            (setf r p
+                  g v
+                  b t_))
+           ((= 3 h-int)
+            (setf r p
+                  g q
+                  b v))
+           ((= 4 h-int)
+            (setf r t_
+                  g p
+                  b v))
+           ((= 5 h-int)
+            (setf r v
+                  g p
+                  b q)))
+          (values r g b))))))
+
 
 
 (defun rgb->hsv (r g b)
   (declare (optimize (speed 3) (safety 0)))
-
+  
   (let* ((min (min r g b))
          (max (max r g b))
          (delta (- max min))
          (v max)
          (s 0)
-         h)
-    
+         (h nil))
+
     (when (plusp max)
       (setq s (/ delta max)))
 
-    (cond
-     ((zerop delta)
-      (setq h nil))
-     (t
+    (when (plusp delta)
       (setq h (cond
                ((= max r)
-                (/ (- g b) delta))
+                (nth-value 0 (/ (- g b) delta)))
                ((= max g)
-                (+ 2 (/ (- b r) delta)))
+                (nth-value 0 (+ 2 (/ (- b r) delta))))
                (t
-                (+ 4 (/ (- r g) delta)))))
-      (setq h (* 60 h))
+                (nth-value 0 (+ 4 (/ (- r g) delta))))))
+      (setq h (the fixnum (* 60 h)))
       (when (minusp h)
-        (incf h 360))))
+        (incf h 360)))
+    
+    (values h s v)))
 
+(defun rgb255->hsv255 (r g b)
+  "Integer convert from rgb from 0-255 -> h from 0-360 and sv from 0-255"
+  (declare (fixnum r g b)
+           (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)))
+
+  (let* ((min (min r g b))
+         (max (max r g b))
+         (delta (- max min))
+         (v max)
+         (s 0)
+         (h nil))
+    (declare (fixnum min max delta v s)
+             (type (or null fixnum) h))
+    
+    (when (plusp max)
+      (setq s (truncate (the fixnum (* 255 delta)) max)))
+
+    (when (plusp delta)
+      (setq h (cond
+               ((= max r)
+                (truncate (the fixnum (* 60 (the fixnum (- g b)))) delta))
+               ((= max g)
+                (the fixnum
+                     (+ 120 (truncate (the fixnum (* 60 (the fixnum (- b r)))) delta))))
+               (t
+                (the fixnum
+                     (+ 240 (truncate (the fixnum (* 60 (the fixnum (- r g)))) delta))))))
+      (when (minusp h)
+        (incf h 360)))
+    
     (values h s v)))
 
 
-(defun hsv-equal (h1 s1 v1 h2 s2 v2)
+(defun hsv-equal (h1 s1 v1 h2 s2 v2 &key (limit .001))
+  (declare (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)))
+  (flet ((~= (a b)
+           (cond 
+            ((and (null a) (null b))
+             t)
+            ((or (null a) (null b))
+             nil)
+            (t
+             (< (abs (- a b)) limit)))))
+    (cond
+     ((and (~= 0 v1) (~= 0 v2))
+      t)
+     ((or (null h1) (null h2))
+      (when (and (~= 0 s1) (~= 0 s2) (~= v1 v2))
+        t))
+     (t
+      (when (~= h1 h2) (~= s1 s2) (~= v1 v2)
+        t)))))
+
+(defun hsv255-equal (h1 s1 v1 h2 s2 v2 &key (limit 1))
+  (declare (type fixnum s1 v1 s2 v2 limit)
+           (type (or null fixnum) h1 h2)
+           (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)))
   (flet ((~= (a b)
+           (declare (type (or null fixnum) a b))
            (cond 
             ((and (null a) (null b))
              t)
             ((or (null a) (null b))
              nil)
             (t
-             (< (abs (- a b)) 0.000001)))))
+             (<= (abs (the fixnum (- a b))) limit)))))
     (cond
      ((and (~= 0 v1) (~= 0 v2))
       t)
@@ -128,3 +232,74 @@
       (when (~= h1 h2) (~= s1 s2) (~= v1 v2)
         t)))))
 
+(defun hsv-similar (h1 s1 v1 h2 s2 v2 &key 
+                       (hue-range 15) (value-range .2) (saturation-range 0.2)
+                       (gray-limit 0.3) (black-limit 0.3))
+  "Returns T if two HSV values are similar."
+  (cond
+   ;; all black colors are similar
+   ((and (<= v1 black-limit) (<= v2 black-limit))
+    t)
+   ;; all desaturated (gray) colors are similar for a value, despite hue
+   ((and (<= s1 gray-limit) (<= s2 gray-limit))
+    (when (<= (abs (- v1 v2)) value-range)
+      t))
+   (t
+    (when (and (<= (abs (hue-difference h1 h2)) hue-range)
+               (<= (abs (- v1 v2)) value-range)
+               (<= (abs (- s1 s2)) saturation-range))
+      t))))
+
+
+(defun hsv255-similar (h1 s1 v1 h2 s2 v2 
+                          &key (hue-range 15) (value-range 50) (saturation-range 50)
+                          (gray-limit 75) (black-limit 75))
+  "Returns T if two HSV values are similar."
+  (declare (fixnum s1 v1 s2 v2 hue-range value-range saturation-range
+                   gray-limit black-limit)
+           (type (or null fixnum) h1 h2)
+           (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)))
+  (cond
+   ;; all black colors are similar
+   ((and (<= v1 black-limit) (<= v2 black-limit))
+    t)
+   ;; all desaturated (gray) colors are similar for a value, despite hue
+   ((and (<= s1 gray-limit) (<= s2 gray-limit))
+    (when (<= (abs (- v1 v2)) value-range)
+      t))
+   (t
+    (when (and (<= (hue-difference-fixnum h1 h2) hue-range)
+               (<= (abs (- v1 v2)) value-range)
+               (<= (abs (- s1 s2)) saturation-range))
+      t))))
+
+
+   
+(defun hue-difference (h1 h2)
+  "Return difference between two hues around 360 degree circle"
+  (when (and h1 h2)
+    (let ((diff (- h2 h1)))
+      (cond
+       ((< diff -180)
+        (+ 360 diff)
+        )
+       ((> diff 180)
+        (- (- 360 diff)))
+       (t
+        diff)))))
+ 
+  
+(defun hue-difference-fixnum (h1 h2)
+  "Return difference between two hues around 360 degree circle"
+  (when (and h1 h2)
+    (locally (declare (type fixnum h1 h2))
+      (let ((diff (- h2 h1)))
+        (cond
+         ((< diff -180)
+          (+ 360 diff)
+          )
+         ((> diff 180)
+          (- (- 360 diff)))
+         (t
+          diff))))))
+ 
\ No newline at end of file