From 237c87c5355661b0968895f2ca4118afebe337c2 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 26 Jan 2009 06:56:44 +0000 Subject: [PATCH] fix color translation git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5666 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- server/rcon.pl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/server/rcon.pl b/server/rcon.pl index 4f4b28434..43d07c3e0 100755 --- a/server/rcon.pl +++ b/server/rcon.pl @@ -128,9 +128,9 @@ sub color_dp2none($) sub color_rgb2basic($) { my ($data) = @_; - my ($r, $g, $b) = @$data; - my $min = [sort ($r, $g, $b)]->[0]; - my $max = [sort ($r, $g, $b)]->[-1]; + my ($R, $G, $B) = @$data; + my $min = [sort { $a <=> $b } ($R, $G, $B)]->[0]; + my $max = [sort { $a <=> $b } ($R, $G, $B)]->[-1]; my $v = $max / 15; my $s = ($max == $min) ? 0 : 1 - $min/$max; @@ -146,17 +146,17 @@ sub color_rgb2basic($) { $h = 0; } - elsif($max == $r) + elsif($max == $R) { - $h = (60 * ($g - $b) / ($max - $min)) % 360; + $h = (60 * ($G - $B) / ($max - $min)) % 360; } - elsif($max == $g) + elsif($max == $G) { - $h = (60 * ($b - $r) / ($max - $min)) + 120; + $h = (60 * ($B - $R) / ($max - $min)) + 120; } - elsif($max == $b) + elsif($max == $B) { - $h = (60 * ($r - $g) / ($max - $min)) + 240; + $h = (60 * ($R - $G) / ($max - $min)) + 240; } return 1 if $h < 36; -- 2.39.2