3party/raygui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

REMOVED: GuiColorPanelEx()

Browse Source
This commit is contained in:
Ray 2021-09-10 22:58:40 +02:00
parent 181f41cee0
commit 653ee23f58
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/raygui.h
View File

@ -2934,7 +2934,7 @@ int GuiListViewEx(Rectangle bounds, const char **text, int count, int *focus, in
} }
// Color Panel control // Color Panel control
Color GuiColorPanelEx(Rectangle bounds, Color color, float hue) Color GuiColorPanel(Rectangle bounds, Color color)
{ {
GuiControlState state = guiState; GuiControlState state = guiState;
Vector2 pickerSelector = { 0 }; Vector2 pickerSelector = { 0 };
@ -2945,6 +2945,7 @@ Color GuiColorPanelEx(Rectangle bounds, Color color, float hue)
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
float hue = -1.0f;
Vector3 maxHue = { hue >= 0.0f ? hue : 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),
@ -3012,11 +3013,6 @@ Color GuiColorPanelEx(Rectangle bounds, Color color, float hue)
return color; return color;
} }
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]
float GuiColorBarAlpha(Rectangle bounds, float alpha) float GuiColorBarAlpha(Rectangle bounds, float alpha)
@ -3165,6 +3161,7 @@ Color GuiColorPicker(Rectangle bounds, Color color)
hsv.x = GuiColorBarHue(boundsHue, hsv.x); hsv.x = GuiColorBarHue(boundsHue, hsv.x);
//color.a = (unsigned char)(GuiColorBarAlpha(boundsAlpha, (float)color.a/255.0f)*255.0f); //color.a = (unsigned char)(GuiColorBarAlpha(boundsAlpha, (float)color.a/255.0f)*255.0f);
Vector3 rgb = ConvertHSVtoRGB(hsv); Vector3 rgb = ConvertHSVtoRGB(hsv);
color = RAYGUI_CLITERAL(Color){ (unsigned char)roundf(rgb.x*255.0f), (unsigned char)roundf(rgb.y*255.0f), (unsigned char)roundf(rgb.z*255.0f), color.a }; color = RAYGUI_CLITERAL(Color){ (unsigned char)roundf(rgb.x*255.0f), (unsigned char)roundf(rgb.y*255.0f), (unsigned char)roundf(rgb.z*255.0f), color.a };
return color; return color;