CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comment fixes in Convert\Color

Browse Source
This commit is contained in:
Clemens Schwaighofer
2022-03-23 11:38:05 +09:00
parent 2a583e525c
commit f0cfc1e940
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/admin/class_test.colors.php
View File

@@ -79,6 +79,15 @@ $hsb = [0, 0, 5];
print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: " print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: "
. DgS::printAr(Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2])) . "<br>"; . DgS::printAr(Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2])) . "<br>";
// Random text
$h = rand(0, 359);
$s = rand(15, 70);
$b = 100;
$l = 50;
print "RANDOM IN: H: " . $h . ", S: " . $s . ", B/L: " . $b . "/" . $l . "<br>";
print "RANDOM hsb->rgb: <pre>" . DgS::printAr(Colors::hsb2rgb($h, $s, $b)) . "</pre><br>";
print "RANDOM hsl->rgb: <pre>" . DgS::printAr(Colors::hsl2rgb($h, $s, $l)) . "</pre><br>";
// TODO: run compare check input must match output // TODO: run compare check input must match output
// error message // error message

6
www/lib/CoreLibs/Convert/Colors.php
View File

@@ -66,7 +66,8 @@ class Colors
} }
$rgbArray = []; $rgbArray = [];
if (strlen($hexStr) == 6) { if (strlen($hexStr) == 6) {
// If a proper hex code, convert using bitwise operation. No overhead... faster // If a proper hex code, convert using bitwise operation.
// No overhead... faster
$colorVal = hexdec($hexStr); $colorVal = hexdec($hexStr);
$rgbArray['r'] = 0xFF & ($colorVal >> 0x10); $rgbArray['r'] = 0xFF & ($colorVal >> 0x10);
$rgbArray['g'] = 0xFF & ($colorVal >> 0x8); $rgbArray['g'] = 0xFF & ($colorVal >> 0x8);
@@ -289,7 +290,8 @@ class Colors
if ($lum < 0 || $lum > 100) { if ($lum < 0 || $lum > 100) {
return false; return false;
} }
$hue = (1 / 360) * $hue; // calc to internal convert value for hue // calc to internal convert value for hue
$hue = (1 / 360) * $hue;
// convert to internal 0-1 format // convert to internal 0-1 format
$sat /= 100; $sat /= 100;
$lum /= 100; $lum /= 100;