mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-22 08:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1097 from gottfriedleibniz/fix/color

Browse Source 
fix hsvColor types #1097
This commit is contained in:
Christophe 2022-04-20 12:25:48 +02:00 committed by GitHub
commit d33344bd86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/gtx/color_space.inl
View File

@ -63,9 +63,9 @@ namespace glm
GLM_FUNC_QUALIFIER vec<3, T, Q> hsvColor(const vec<3, T, Q>& rgbColor) GLM_FUNC_QUALIFIER vec<3, T, Q> hsvColor(const vec<3, T, Q>& rgbColor)
{ {
vec<3, T, Q> hsv = rgbColor; vec<3, T, Q> hsv = rgbColor;
float Min = min(min(rgbColor.r, rgbColor.g), rgbColor.b); T Min = min(min(rgbColor.r, rgbColor.g), rgbColor.b);
float Max = max(max(rgbColor.r, rgbColor.g), rgbColor.b); T Max = max(max(rgbColor.r, rgbColor.g), rgbColor.b);
float Delta = Max - Min; T Delta = Max - Min;
hsv.z = Max; hsv.z = Max;