blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Math: Added max_uu/min_uu variations.

This commit is contained in:
Jeroen Bakker 2021-06-04 09:14:15 +02:00
parent ddd4b2b785
commit 053082e9d8
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenlib/BLI_math_base.h
View File

@ -154,6 +154,9 @@ MINLINE int max_iii(int a, int b, int c);
MINLINE int min_iiii(int a, int b, int c, int d);
MINLINE int max_iiii(int a, int b, int c, int d);
MINLINE uint min_uu(uint a, uint b);
MINLINE uint max_uu(uint a, uint b);
MINLINE size_t min_zz(size_t a, size_t b);
MINLINE size_t max_zz(size_t a, size_t b);

15
source/blender/blenlib/intern/math_base_inline.c
View File

@ -514,6 +514,15 @@ MINLINE int max_ii(int a, int b)
return (b < a) ? a : b;
}
MINLINE uint min_uu(uint a, uint b)
{
return (a < b) ? a : b;
}
MINLINE uint max_uu(uint a, uint b)
{
return (b < a) ? a : b;
}
MINLINE float min_fff(float a, float b, float c)
{
return min_ff(min_ff(a, b), c);
@ -798,9 +807,9 @@ MINLINE unsigned char unit_float_to_uchar_clamp(float val)
MINLINE unsigned short unit_float_to_ushort_clamp(float val)
{
return (unsigned short)((val >= 1.0f - 0.5f / 65535) ?
65535 :
(val <= 0.0f) ? 0 : (val * 65535.0f + 0.5f));
return (unsigned short)((val >= 1.0f - 0.5f / 65535) ? 65535 :
(val <= 0.0f) ? 0 :
(val * 65535.0f + 0.5f));
}
#define unit_float_to_ushort_clamp(val) \
((CHECK_TYPE_INLINE(val, float)), unit_float_to_ushort_clamp(val))