DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-13 01:58:30 +00:00
Code Issues Releases Wiki Activity

Fixed some erorrs in color calculations

Browse Source
This commit is contained in:
Darth Affe 2021-02-26 01:03:54 +01:00
parent 1975b9bf48
commit fe2f6e00f1
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RGB.NET.Core/Color/HclColor.cs
View File

@ -193,7 +193,7 @@ namespace RGB.NET.Core
h *= DEGREES_RADIANS_CONVERSION;
float a = c * MathF.Cos(h);
float b = c * MathF.Sign(h);
float b = c * MathF.Sin(h);
return LabColor.CalculateRGBFromLab(l, a, b);
}

17
RGB.NET.Core/Color/LabColor.cs
View File

@ -167,21 +167,12 @@ namespace RGB.NET.Core
{
(float x, float y, float z) = XYZColor.CaclulateXYZFromRGB(r, g, b);
return CaclulateLabFromXYZ(x, y, z);
//const float LAB_MULTIPLIER = (1f / 127f) * 0.5f;
//(float x, float y, float z) = XYZColor.CaclulateXYZFromRGB(r, g, b);
//(float l, float a, float _b) = CaclulateLabFromXYZ(x, y, z);
//return (l / 100.0f, 0.5f + (a * LAB_MULTIPLIER), 0.5f + (_b * LAB_MULTIPLIER));
}
internal static (float r, float g, float b) CalculateRGBFromLab(float l, float a, float b)
{
(float x, float y, float z) = CalculateXYZFromLab(l, a, b);
return XYZColor.CalculateRGBFromXYZ(x, y, z);
//(float x, float y, float z) = CalculateXYZFromLab(100.0f * l, 254.0f * (a - 0.5f), 2.0f * 254.0f * (b - 0.5f));
//return XYZColor.CalculateRGBFromXYZ(x, y, z);
}
private static (float l, float a, float b) CaclulateLabFromXYZ(float x, float y, float z)
@ -212,15 +203,15 @@ namespace RGB.NET.Core
float x = (a / 500.0f) + y;
float z = y - (b / 200.0f);
float powX = MathF.Pow(y, 3.0f);
float powX = MathF.Pow(x, 3.0f);
float powY = MathF.Pow(y, 3.0f);
float powZ = MathF.Pow(y, 3.0f);
float powZ = MathF.Pow(z, 3.0f);
y = ((powY > 0.008856f) ? (powY) : ((y - FACTOR2) / 7.787f));
x = ((powX > 0.008856f) ? (powX) : ((x - FACTOR2) / 7.787f));
y = ((powY > 0.008856f) ? (powY) : ((y - FACTOR2) / 7.787f));
z = ((powZ > 0.008856f) ? (powZ) : ((z - FACTOR2) / 7.787f));
return (95.047f * x, 100.0f * y, 108.883f * z);
return (x * 95.047f, y * 100.0f, z * 108.883f);
}
#endregion