X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ddd5f9146c58ba38f16d2e525273b83076c4f93a..ce5eed3c2adf1c85ddd67d435e0dfac777723dc3:/Shiar_Sheet/Colour.pm

diff --git a/Shiar_Sheet/Colour.pm b/Shiar_Sheet/Colour.pm
index 7ea68e9..cf22f3e 100644
--- a/Shiar_Sheet/Colour.pm
+++ b/Shiar_Sheet/Colour.pm
@@ -4,13 +4,15 @@ use strict;
 use warnings;
 use List::Util qw( min max );
 
-our $VERSION = '1.01';
+our $VERSION = '1.04';
 
 # ITU-R recommendation 601 luma co-efficients
 our $kr = .299;
 our $kb = .114;
 our $kg = 1 - $kb - $kr;
 
+my $PI = 2 * atan2 1, 0;
+
 sub new {
 	my $class = shift;
 	my @rgb = @_ >= 3 ? @_ : (map {hex} $_[0] =~ /(..)/g);
@@ -39,6 +41,21 @@ sub luminance {
 	return $r*$kr + $g*$kg + $b*$kb;
 }
 
+sub hue {
+	# colour shift (red = 0 .. 1)
+	my ($r, $g, $b) = @{ $_[0] };
+	my $hue = atan2 sqrt(3) * ($g - $b), $r*2 - $g - $b;
+	$hue /= $PI * 2;  # -.5 .. .5
+	$hue++ if $hue < 0;  # fp $hue %= 1
+	return $hue;
+}
+
+sub hsv {
+	my ($rgb) = @_;
+	my $v = max(@{$rgb});
+	return $rgb->hue, abs(min(@{$rgb}) - $v), $v;
+}
+
 sub rgb24 {
 	my $str = '';
 	$str .= sprintf '%X', min($_ / 17 + .5, 15) for @{ $_[0] };