griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Reorganize hsv sort paint functions

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/132959
This commit is contained in:
Sean Kim
2025-01-13 00:04:36 +01:00
committed by Sean Kim
parent d2418b89c3
commit 440e87ce55
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/blenkernel/intern/paint.cc
View File

@@ -1398,7 +1398,6 @@ bool BKE_palette_is_empty(const Palette *palette)
return BLI_listbase_is_empty(&palette->colors);
}
/* helper function to sort using qsort */
static int palettecolor_compare_hsv(const void *a1, const void *a2)
{
const tPaletteColorHSV *ps1 = static_cast<const tPaletteColorHSV *>(a1);
@@ -1431,7 +1430,11 @@ static int palettecolor_compare_hsv(const void *a1, const void *a2)
return 0;
}
/* helper function to sort using qsort */
void BKE_palette_sort_hsv(tPaletteColorHSV *color_array, const int totcol)
{
qsort(color_array, totcol, sizeof(tPaletteColorHSV), palettecolor_compare_hsv);
}
static int palettecolor_compare_svh(const void *a1, const void *a2)
{
const tPaletteColorHSV *ps1 = static_cast<const tPaletteColorHSV *>(a1);
@@ -1464,6 +1467,11 @@ static int palettecolor_compare_svh(const void *a1, const void *a2)
return 0;
}
void BKE_palette_sort_svh(tPaletteColorHSV *color_array, const int totcol)
{
qsort(color_array, totcol, sizeof(tPaletteColorHSV), palettecolor_compare_svh);
}
static int palettecolor_compare_vhs(const void *a1, const void *a2)
{
const tPaletteColorHSV *ps1 = static_cast<const tPaletteColorHSV *>(a1);
@@ -1496,6 +1504,11 @@ static int palettecolor_compare_vhs(const void *a1, const void *a2)
return 0;
}
void BKE_palette_sort_vhs(tPaletteColorHSV *color_array, const int totcol)
{
qsort(color_array, totcol, sizeof(tPaletteColorHSV), palettecolor_compare_vhs);
}
static int palettecolor_compare_luminance(const void *a1, const void *a2)
{
const tPaletteColorHSV *ps1 = static_cast<const tPaletteColorHSV *>(a1);
@@ -1514,24 +1527,6 @@ static int palettecolor_compare_luminance(const void *a1, const void *a2)
return 0;
}
void BKE_palette_sort_hsv(tPaletteColorHSV *color_array, const int totcol)
{
/* Sort by Hue, Saturation and Value. */
qsort(color_array, totcol, sizeof(tPaletteColorHSV), palettecolor_compare_hsv);
}
void BKE_palette_sort_svh(tPaletteColorHSV *color_array, const int totcol)
{
/* Sort by Saturation, Value and Hue. */
qsort(color_array, totcol, sizeof(tPaletteColorHSV), palettecolor_compare_svh);
}
void BKE_palette_sort_vhs(tPaletteColorHSV *color_array, const int totcol)
{
/* Sort by Saturation, Value and Hue. */
qsort(color_array, totcol, sizeof(tPaletteColorHSV), palettecolor_compare_vhs);
}
void BKE_palette_sort_luminance(tPaletteColorHSV *color_array, const int totcol)
{
/* Sort by Luminance (calculated with the average, enough for sorting). */