twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2026-02-03 20:59:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from simonwashere/color-panel-hue

Browse Source 
Color panel hue
This commit is contained in:
Ray
2019-06-30 18:30:23 +02:00
committed by GitHub
parent 9c32d6cc13 4096ed02b5
commit 9440a2d502
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/raygui.h
View File

@ -3643,7 +3643,7 @@ RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int count, int
} }
// Color Panel control // Color Panel control
RAYGUIDEF Color GuiColorPanel(Rectangle bounds, Color color) RAYGUIDEF Color GuiColorPanelEx(Rectangle bounds, Color color, float hue)
{ {
GuiControlState state = guiState; GuiControlState state = guiState;
Vector2 pickerSelector = { 0 }; Vector2 pickerSelector = { 0 };
@ -3654,7 +3654,7 @@ RAYGUIDEF Color GuiColorPanel(Rectangle bounds, Color color)
pickerSelector.x = bounds.x + (float)hsv.y*bounds.width; // HSV: Saturation pickerSelector.x = bounds.x + (float)hsv.y*bounds.width; // HSV: Saturation
pickerSelector.y = bounds.y + (1.0f - (float)hsv.z)*bounds.height; // HSV: Value pickerSelector.y = bounds.y + (1.0f - (float)hsv.z)*bounds.height; // HSV: Value
Vector3 maxHue = { hsv.x, 1.0f, 1.0f }; Vector3 maxHue = { hue >= 0.0f ? hue : hsv.x, 1.0f, 1.0f };
Vector3 rgbHue = ConvertHSVtoRGB(maxHue); Vector3 rgbHue = ConvertHSVtoRGB(maxHue);
Color maxHueCol = { (unsigned char)(255.0f*rgbHue.x), Color maxHueCol = { (unsigned char)(255.0f*rgbHue.x),
(unsigned char)(255.0f*rgbHue.y), (unsigned char)(255.0f*rgbHue.y),
@ -3717,6 +3717,10 @@ RAYGUIDEF Color GuiColorPanel(Rectangle bounds, Color color)
return color; return color;
} }
RAYGUIDEF Color GuiColorPanel(Rectangle bounds, Color color) {
return GuiColorPanelEx(bounds, color, -1.0f);
}
// Color Bar Alpha control // Color Bar Alpha control
// NOTE: Returns alpha value normalized [0..1] // NOTE: Returns alpha value normalized [0..1]
RAYGUIDEF float GuiColorBarAlpha(Rectangle bounds, float alpha) RAYGUIDEF float GuiColorBarAlpha(Rectangle bounds, float alpha)