ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Math: add half-float color literals. 

Unlike _rgb and _rgbf these are not constexpr, but I'll eventually add
table-based constexpr variants into a new ConstexprLiterals namespace
for all sRGB and half-float variants.
pull/674/head
Vladimír Vondruš 1 year ago
parent
33ee4c5e8a
commit
80b6c5d859
5 changed files with 223 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      doc/changelog.dox
  2. 34
      doc/snippets/Math.cpp
  3. 12
      doc/types.dox
  4. 137
      src/Magnum/Math/Color.h
  5. 52
      src/Magnum/Math/Test/ColorTest.cpp

5
doc/changelog.dox
Unescape View File

@ -307,6 +307,11 @@ See also:
- @ref Math::Vector, @ref Math::RectangularMatrix and all their subclasses - @ref Math::Vector, @ref Math::RectangularMatrix and all their subclasses
can be now constructed from fixed-size arrays without having to use the can be now constructed from fixed-size arrays without having to use the
potentially dangerous and non-constexpr @ref Math::Vector::from() API potentially dangerous and non-constexpr @ref Math::Vector::from() API
- New @link Literals::ColorLiterals::operator""_rgbh() _rgbh @endlink,
@link Literals::ColorLiterals::operator""_rgbah() _rgbah @endlink,
@link Literals::ColorLiterals::operator""_srgbh() _srgbh @endlink and
@link Literals::ColorLiterals::operator""_srgbah() _srgbah @endlink
literals for convenient @ref Color3h and @ref Color4h creation
@subsubsection changelog-latest-new-materialtools MaterialTools library @subsubsection changelog-latest-new-materialtools MaterialTools library

34
doc/snippets/Math.cpp
Unescape View File

@ -568,9 +568,11 @@ using namespace Math::Literals;
Color3 a = 0x33b27f_srgbf; // {0.0331048f, 0.445201f, 0.212231f} Color3 a = 0x33b27f_srgbf; // {0.0331048f, 0.445201f, 0.212231f}
Color4ub b = 0x33b27fcc_rgba; // {0x33, 0xb2, 0x7f, 0xcc} Color4ub b = 0x33b27fcc_rgba; // {0x33, 0xb2, 0x7f, 0xcc}
Color3h c = 0x33b27f_rgbh; // {0.2_h, 0.6982_h, 0.498_h}
/* [types-literals-colors] */ /* [types-literals-colors] */
static_cast<void>(a); static_cast<void>(a);
static_cast<void>(b); static_cast<void>(b);
static_cast<void>(c);
} }
{ {
@ -1040,6 +1042,38 @@ Color4 a = 0x33b27fcc_srgbaf; // {0.0331048f, 0.445201f, 0.212231f, 0.8f}
static_cast<void>(a); static_cast<void>(a);
} }
{
/* [_rgbh] */
using namespace Math::Literals;
Color3h a = 0x33b27f_rgbh; // {0.2_h, 0.6982_h, 0.498_h}
/* [_rgbh] */
static_cast<void>(a);
}
{
/* [_srgbh] */
using namespace Math::Literals;
Color3h a = 0x33b27f_srgbh; // {0.03311_h, 0.4453_h, 0.2123_h}
/* [_srgbh] */
static_cast<void>(a);
}
{
/* [_rgbah] */
using namespace Math::Literals;
Color4h a = 0x33b27fcc_rgbah; // {0.2_h, 0.6982_h, 0.498_h, 0.7998_h}
/* [_rgbah] */
static_cast<void>(a);
}
{
/* [_srgbah] */
using namespace Math::Literals;
Color4h a = 0x33b27fcc_srgbah; // {0.03311_h, 0.4453_h, 0.2123_h, 0.7998_h}
/* [_srgbah] */
static_cast<void>(a);
}
{ {
/* [CubicHermite-fromBezier] */ /* [CubicHermite-fromBezier] */
CubicBezier2D segment; CubicBezier2D segment;

12
doc/types.dox
Unescape View File

@ -119,13 +119,17 @@ would be, such as matrix multiplication. The @ref Matrix2x1, @ref Matrix3x1 and
For easier entering of (s)RGB colors in hexadecimal format there are For easier entering of (s)RGB colors in hexadecimal format there are
@link Math::Literals::ColorLiterals::operator""_srgb() _srgb @endlink / @link Math::Literals::ColorLiterals::operator""_srgb() _srgb @endlink /
@link Math::Literals::ColorLiterals::operator""_srgbf() _srgbf @endlink, @link Math::Literals::ColorLiterals::operator""_srgbf() _srgbf @endlink /
@link Math::Literals::ColorLiterals::operator""_srgbh() _srgbh @endlink,
@link Math::Literals::ColorLiterals::operator""_srgba() _srgba @endlink / @link Math::Literals::ColorLiterals::operator""_srgba() _srgba @endlink /
@link Math::Literals::ColorLiterals::operator""_srgbaf() _srgbaf @endlink, @link Math::Literals::ColorLiterals::operator""_srgbaf() _srgbaf @endlink /
@link Math::Literals::ColorLiterals::operator""_srgbah() _srgbah @endlink,
@link Math::Literals::ColorLiterals::operator""_rgb() _rgb @endlink / @link Math::Literals::ColorLiterals::operator""_rgb() _rgb @endlink /
@link Math::Literals::ColorLiterals::operator""_rgbf() _rgbf @endlink and @link Math::Literals::ColorLiterals::operator""_rgbf() _rgbf @endlink /
@link Math::Literals::ColorLiterals::operator""_rgbh() _rgbh @endlink and
@link Math::Literals::ColorLiterals::operator""_rgba() _rgba @endlink / @link Math::Literals::ColorLiterals::operator""_rgba() _rgba @endlink /
@link Math::Literals::ColorLiterals::operator""_rgbaf() _rgbaf @endlink @link Math::Literals::ColorLiterals::operator""_rgbaf() _rgbaf @endlink /
@link Math::Literals::ColorLiterals::operator""_rgbah() _rgbah @endlink
literals in the @ref Math::Literals namespace. See their documentation for more literals in the @ref Math::Literals namespace. See their documentation for more
information about the differences. information about the differences.

137
src/Magnum/Math/Color.h
Unescape View File

@ -27,7 +27,7 @@
*/ */
/** @file /** @file
* @brief Class @ref Magnum::Math::Color3, @ref Magnum::Math::Color4, literal @link Magnum::Math::Literals::ColorLiterals::operator""_rgb() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_rgba() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_rgbf() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_rgbaf() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgb() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgba() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgbf() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgbaf() @endlink * @brief Class @ref Magnum::Math::Color3, @ref Magnum::Math::Color4, literal @link Magnum::Math::Literals::ColorLiterals::operator""_rgb() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_rgba() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_rgbf() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_rgbaf() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_rgbh() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_rgbah() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgb() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgba() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgbf() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgbaf() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgbh() @endlink, @link Magnum::Math::Literals::ColorLiterals::operator""_srgbah() @endlink
*/ */
/* std::declval() is said to be in <utility> but libstdc++, libc++ and MSVC STL /* std::declval() is said to be in <utility> but libstdc++, libc++ and MSVC STL
@ -339,8 +339,10 @@ value in range @f$ [0.0, 1.0] @f$.
@see @link Literals::ColorLiterals::operator""_rgb() @endlink, @see @link Literals::ColorLiterals::operator""_rgb() @endlink,
@link Literals::ColorLiterals::operator""_rgbf() @endlink, @link Literals::ColorLiterals::operator""_rgbf() @endlink,
@link Literals::ColorLiterals::operator""_rgbh() @endlink,
@link Literals::ColorLiterals::operator""_srgb() @endlink, @link Literals::ColorLiterals::operator""_srgb() @endlink,
@link Literals::ColorLiterals::operator""_srgbf() @endlink, @link Literals::ColorLiterals::operator""_srgbf() @endlink,
@link Literals::ColorLiterals::operator""_srgbh() @endlink,
@ref Color4, @ref Magnum::Color3, @ref Magnum::Color3h, @ref Color4, @ref Magnum::Color3, @ref Magnum::Color3h,
@ref Magnum::Color3ub, @ref Magnum::Color3us @ref Magnum::Color3ub, @ref Magnum::Color3us
*/ */
@ -777,8 +779,10 @@ _MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(3, Color3)
See @ref Color3 for more information. See @ref Color3 for more information.
@see @link Literals::ColorLiterals::operator""_rgba() @endlink, @see @link Literals::ColorLiterals::operator""_rgba() @endlink,
@link Literals::ColorLiterals::operator""_rgbaf() @endlink, @link Literals::ColorLiterals::operator""_rgbaf() @endlink,
@link Literals::ColorLiterals::operator""_rgbah() @endlink,
@link Literals::ColorLiterals::operator""_srgba() @endlink, @link Literals::ColorLiterals::operator""_srgba() @endlink,
@link Literals::ColorLiterals::operator""_srgbaf() @endlink, @link Literals::ColorLiterals::operator""_srgbaf() @endlink,
@link Literals::ColorLiterals::operator""_srgbah() @endlink,
@ref Magnum::Color4, @ref Magnum::Color4h, @ref Magnum::Color4ub, @ref Magnum::Color4, @ref Magnum::Color4h, @ref Magnum::Color4ub,
@ref Magnum::Color4us @ref Magnum::Color4us
*/ */
@ -1460,6 +1464,13 @@ template<class Color, unsigned divisor, unsigned size, char zero = '0', char x =
}; };
} }
/* Silly indirection to avoid #include <Magnum/Math/Half.h> for the half-float
literals */
template<std::size_t> struct HalfColor {
typedef Color3<Half> Type3;
typedef Color4<Half> Type4;
};
} }
/* Unlike STL, where there's e.g. std::literals::string_literals with both /* Unlike STL, where there's e.g. std::literals::string_literals with both
@ -1503,7 +1514,8 @@ Unpacks the literal into three 8-bit values. Example usage:
to linear RGB first. To convey such meaning, use the @link operator""_srgb() @endlink to linear RGB first. To convey such meaning, use the @link operator""_srgb() @endlink
literal instead. literal instead.
@see @link operator""_rgba() @endlink, @link operator""_rgbf() @endlink @see @link operator""_rgba() @endlink, @link operator""_rgbf() @endlink,
@link operator""_rgbh() @endlink
@m_keywords{_rgb rgb} @m_keywords{_rgb rgb}
*/ */
template<char... chars> constexpr Color3<UnsignedByte> operator"" _rgb() { template<char... chars> constexpr Color3<UnsignedByte> operator"" _rgb() {
@ -1527,7 +1539,8 @@ RGB. Use this literal to document that given value is in sRGB. Example usage:
representation directly or convert the value using @ref Color3::fromSrgb() representation directly or convert the value using @ref Color3::fromSrgb()
/ @ref Color3::fromSrgbInt(). / @ref Color3::fromSrgbInt().
@see @link operator""_srgba() @endlink, @link operator""_srgbf() @endlink @see @link operator""_srgba() @endlink, @link operator""_srgbf() @endlink,
@link operator""_srgbh() @endlink
@m_keywords{_srgb srgb} @m_keywords{_srgb srgb}
*/ */
/* Output is a Vector3 to hint that it doesn't have any (additive, /* Output is a Vector3 to hint that it doesn't have any (additive,
@ -1548,7 +1561,8 @@ Unpacks the literal into four 8-bit values. Example usage:
to linear RGB first. To convey such meaning, use the @link operator""_srgba() @endlink to linear RGB first. To convey such meaning, use the @link operator""_srgba() @endlink
literal instead. literal instead.
@see @link operator""_rgb() @endlink, @link operator""_rgbaf() @endlink @see @link operator""_rgb() @endlink, @link operator""_rgbaf() @endlink,
@link operator""_rgbah() @endlink
@m_keywords{_rgba rgba} @m_keywords{_rgba rgba}
*/ */
template<char... chars> constexpr Color4<UnsignedByte> operator"" _rgba() { template<char... chars> constexpr Color4<UnsignedByte> operator"" _rgba() {
@ -1573,7 +1587,8 @@ usage:
representation directly or convert the value using representation directly or convert the value using
@ref Color4::fromSrgbAlpha() / @ref Color4::fromSrgbAlphaInt(). @ref Color4::fromSrgbAlpha() / @ref Color4::fromSrgbAlphaInt().
@see @link operator""_srgb() @endlink, @link operator""_rgbaf() @endlink @see @link operator""_srgb() @endlink, @link operator""_rgbaf() @endlink,
@link operator""_rgbah() @endlink
@m_keywords{_srgba srgba} @m_keywords{_srgba srgba}
*/ */
/* Output is a Vector3 to hint that it doesn't have any (additive, /* Output is a Vector3 to hint that it doesn't have any (additive,
@ -1595,7 +1610,8 @@ Example usage:
to linear RGB first. In that case use the @link operator""_srgbf() @endlink to linear RGB first. In that case use the @link operator""_srgbf() @endlink
literal instead. literal instead.
@see @link operator""_rgbaf() @endlink, @link operator""_rgb() @endlink @see @link operator""_rgbaf() @endlink, @link operator""_rgb() @endlink,
@link operator""_rgbh() @endlink
@m_keywords{_rgbf rgbf} @m_keywords{_rgbf rgbf}
*/ */
template<char... chars> constexpr Color3<Float> operator"" _rgbf() { template<char... chars> constexpr Color3<Float> operator"" _rgbf() {
@ -1611,7 +1627,7 @@ usage:
@snippet Math.cpp _srgbf @snippet Math.cpp _srgbf
@see @link operator""_srgbaf() @endlink, @link operator""_srgb() @endlink, @see @link operator""_srgbaf() @endlink, @link operator""_srgb() @endlink,
@link operator""_rgbf() @endlink @link operator""_srgbh() @endlink, @link operator""_rgbf() @endlink
@m_keywords{_srgbf srgbf} @m_keywords{_srgbf srgbf}
*/ */
template<char... chars> inline Color3<Float> operator"" _srgbf() { template<char... chars> inline Color3<Float> operator"" _srgbf() {
@ -1631,7 +1647,8 @@ Example usage:
to linear RGB first. In that case use the @link operator""_srgbaf() @endlink to linear RGB first. In that case use the @link operator""_srgbaf() @endlink
literal instead. literal instead.
@see @link operator""_rgbf() @endlink, @link operator""_rgba() @endlink @see @link operator""_rgbf() @endlink, @link operator""_rgba() @endlink,
@link operator""_rgbah() @endlink
@m_keywords{_rgbaf rgbaf} @m_keywords{_rgbaf rgbaf}
*/ */
template<char... chars> constexpr Color4<Float> operator"" _rgbaf() { template<char... chars> constexpr Color4<Float> operator"" _rgbaf() {
@ -1647,12 +1664,114 @@ Example usage:
@snippet Math.cpp _srgbaf @snippet Math.cpp _srgbaf
@see @link operator""_srgbf() @endlink, @link operator""_srgba() @endlink, @see @link operator""_srgbf() @endlink, @link operator""_srgba() @endlink,
@link operator""_rgbaf() @endlink @link operator""_srgbah() @endlink, @link operator""_rgbaf() @endlink
@m_keywords{_srgbaf srgbaf} @m_keywords{_srgbaf srgbaf}
*/ */
template<char... chars> inline Color4<Float> operator"" _srgbaf() { template<char... chars> inline Color4<Float> operator"" _srgbaf() {
return Color4<Float>::fromSrgbAlpha(Implementation::color4Literal<Vector4<UnsignedByte>, 1, sizeof...(chars), chars...>()); return Color4<Float>::fromSrgbAlpha(Implementation::color4Literal<Vector4<UnsignedByte>, 1, sizeof...(chars), chars...>());
} }
/** @relatesalso Magnum::Math::Color3
@brief Half-float linear RGB literal
@m_since_latest
Equivalent to calling @ref Color3::fromLinearRgbInt() on the literal value and
then casting from a float to a half-float type. Example usage:
@snippet Math.cpp _rgbh
@attention 8bit-per-channel colors are commonly treated as being in sRGB color
space, which is not directly usable in calculations and has to be converted
to linear RGB first. In that case use the @link operator""_srgbh() @endlink
literal instead.
@see @link operator""_rgbah() @endlink, @link operator""_rgb() @endlink,
@link operator""_rgbf() @endlink
@m_keywords{_rgbh rgbh}
*/
template<char... chars> inline
#ifdef DOXYGEN_GENERATING_OUTPUT
Color3<Half> /* to avoid including Half.h */
#else
typename Implementation::HalfColor<sizeof...(chars)>::Type3
#endif
operator"" _rgbh() {
return Color3<Half>{Implementation::color3Literal<Color3<Float>, 255, sizeof...(chars), chars...>()};
}
/** @relatesalso Magnum::Math::Color3
@brief Half-float sRGB literal
@m_since_latest
Equivalent to calling @ref Color3::fromSrgbInt() on the literal value and then
casting from a float to a half-float type. Example usage:
@snippet Math.cpp _srgbh
@see @link operator""_srgbah() @endlink, @link operator""_srgb() @endlink,
@link operator""_srgbf() @endlink, @link operator""_rgbh() @endlink
@m_keywords{_srgbh srgbh}
*/
template<char... chars> inline
#ifdef DOXYGEN_GENERATING_OUTPUT
Color3<Half> /* to avoid including Half.h */
#else
typename Implementation::HalfColor<sizeof...(chars)>::Type3
#endif
operator"" _srgbh() {
return Color3<Half>{Color3<Float>::fromSrgb(Implementation::color3Literal<Vector3<UnsignedByte>, 1, sizeof...(chars), chars...>())};
}
/** @relatesalso Magnum::Math::Color4
@brief Half-float linear RGBA literal
@m_since_latest
Equivalent to calling @ref Color4::fromLinearRgbaInt() on the literal value and
then casting from a float to a half-float type. Example usage:
@snippet Math.cpp _rgbah
@attention 8bit-per-channel colors are commonly treated as being in sRGB color
space, which is not directly usable in calculations and has to be converted
to linear RGB first. In that case use the @link operator""_srgbah() @endlink
literal instead.
@see @link operator""_rgbh() @endlink, @link operator""_rgba() @endlink,
@link operator""_rgbaf() @endlink
@m_keywords{_rgbah rgbah}
*/
template<char... chars> inline
#ifdef DOXYGEN_GENERATING_OUTPUT
Color4<Half> /* to avoid including Half.h */
#else
typename Implementation::HalfColor<sizeof...(chars)>::Type4
#endif
operator"" _rgbah() {
return Color4<Half>{Implementation::color4Literal<Color4<Float>, 255, sizeof...(chars), chars...>()};
}
/** @relatesalso Magnum::Math::Color4
@brief Half-float sRGB + alpha literal
@m_since_latest
Equivalent to calling @ref Color4::fromSrgbAlphaInt() on the literal value and
then casting from a float to a half-float type. Example usage:
@snippet Math.cpp _srgbah
@see @link operator""_srgbh() @endlink, @link operator""_srgba() @endlink,
@link operator""_srgbaf() @endlink, @link operator""_rgbah() @endlink
@m_keywords{_srgbah srgbah}
*/
template<char... chars> inline
#ifdef DOXYGEN_GENERATING_OUTPUT
Color4<Half> /* to avoid including Half.h */
#else
typename Implementation::HalfColor<sizeof...(chars)>::Type4
#endif
operator"" _srgbah() {
return Color4<Half>{Color4<Float>::fromSrgbAlpha(Implementation::color4Literal<Vector4<UnsignedByte>, 1, sizeof...(chars), chars...>())};
}
#if defined(CORRADE_TARGET_CLANG) && __clang_major__ >= 17 #if defined(CORRADE_TARGET_CLANG) && __clang_major__ >= 17
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif

52
src/Magnum/Math/Test/ColorTest.cpp
Unescape View File

@ -124,8 +124,10 @@ struct ColorTest: TestSuite::Tester {
void literalParsing(); void literalParsing();
void literals(); void literals();
void literalsFloat(); void literalsFloat();
void literalsHalf();
void literalsSrgb(); void literalsSrgb();
void literalsSrgbFloat(); void literalsSrgbFloat();
void literalsSrgbHalf();
void xyz(); void xyz();
void fromXyzDefaultAlpha(); void fromXyzDefaultAlpha();
@ -277,8 +279,10 @@ ColorTest::ColorTest() {
&ColorTest::literalParsing, &ColorTest::literalParsing,
&ColorTest::literals, &ColorTest::literals,
&ColorTest::literalsFloat, &ColorTest::literalsFloat,
&ColorTest::literalsHalf,
&ColorTest::literalsSrgb, &ColorTest::literalsSrgb,
&ColorTest::literalsSrgbFloat, &ColorTest::literalsSrgbFloat,
&ColorTest::literalsSrgbHalf,
&ColorTest::premultiplied, &ColorTest::premultiplied,
&ColorTest::premultipliedRoundtrip<UnsignedByte>, &ColorTest::premultipliedRoundtrip<UnsignedByte>,
@ -1207,10 +1211,10 @@ void ColorTest::literalParsing() {
// 0xccff33a_srgba; /* too short 32-bit color */ // 0xccff33a_srgba; /* too short 32-bit color */
// 0xccff33aa_rgbaf; /* too long 32-bit color */ // 0xccff33aa_rgbaf; /* too long 32-bit color */
// 01234567_rgbf; /* 8-char octal literal (fails due to no 0x) */ // 01234567_rgbf; /* 8-char octal literal (fails due to no 0x) */
// 01234.56_rgbf; /* 8-char float literal (fails due to no 0x) */ // 01234.56_rgbh; /* 8-char float literal (fails due to no 0x) */
// .0123456_rgbf; /* 8-char float literal with leading period */ // .0123456_srgbh; /* 8-char float literal with leading period */
// 0001234567_rgba; /* 10-char octal literal (fails due to no 0x) */ // 0001234567_rgbah; /* 10-char octal literal (fails due to no 0x) */
// 012345.678_rgba; /* 10-char float literal (fails due to no 0x) */ // 012345.678_srgbah; /* 10-char float literal (fails due to no 0x) */
// .012345678_rgba; /* 10-char float literal with leading period */ // .012345678_rgba; /* 10-char float literal with leading period */
// 0xap3510_srgb; /* 6-char C++17 hex float literal, p at 1 */ // 0xap3510_srgb; /* 6-char C++17 hex float literal, p at 1 */
// 0xaP3510_srgb; /* 6-char C++17 hex float literal, P at 1 */ // 0xaP3510_srgb; /* 6-char C++17 hex float literal, P at 1 */
@ -1274,6 +1278,27 @@ void ColorTest::literalsFloat() {
CORRADE_COMPARE(0x00000000_rgbaf, (Color4{0.0f, 0.0f})); CORRADE_COMPARE(0x00000000_rgbaf, (Color4{0.0f, 0.0f}));
} }
void ColorTest::literalsHalf() {
/* Verifies mainly that the output is correctly unpacked, consistent with
the runtime API, the actual character parsing is checked thoroughly in
literalParsing() above. Comparing to fromIntegralLinearRgb() / unpack()
tests as the ground truth. */
CORRADE_COMPARE(0xf32a80_rgbh, Color3h{Color3::fromLinearRgbInt(0xf32a80)});
CORRADE_COMPARE(0xf32a80_rgbh, (Color3h{0.952941_h, 0.164706_h, 0.501961_h}));
CORRADE_COMPARE(0xf32a8023_rgbah, Color4h{Color4::fromLinearRgbaInt(0xf32a8023)});
CORRADE_COMPARE(0xf32a8023_rgbah, (Color4h{0.952941_h, 0.164706_h, 0.501961_h, 0.137255_h}));
/* These are not constexpr yet */
/* Test also boundary values to be sure */
/** @todo is it possible to verify *all* values for roundtrip, without some
crazy template madness? */
CORRADE_COMPARE(0xffffff_rgbh, Color3h{1.0_h});
CORRADE_COMPARE(0x000000_rgbh, Color3h{0.0_h});
CORRADE_COMPARE(0xffffffff_rgbah, Color4h{1.0_h});
CORRADE_COMPARE(0x00000000_rgbah, (Color4h{0.0_h, 0.0_h}));
}
void ColorTest::literalsSrgb() { void ColorTest::literalsSrgb() {
/* Should be the same as literals(), just giving back a non-Color type */ /* Should be the same as literals(), just giving back a non-Color type */
CORRADE_COMPARE(0x3f568a_srgb, (Vector3ub{0x3f, 0x56, 0x8a})); CORRADE_COMPARE(0x3f568a_srgb, (Vector3ub{0x3f, 0x56, 0x8a}));
@ -1304,6 +1329,25 @@ void ColorTest::literalsSrgbFloat() {
CORRADE_COMPARE(0x00000000_srgbaf, (Color4{0.0f, 0.0f})); CORRADE_COMPARE(0x00000000_srgbaf, (Color4{0.0f, 0.0f}));
} }
void ColorTest::literalsSrgbHalf() {
/* Verifies mainly that the output is correctly unpacked and converted,
consistent with the runtime API, the actual character parsing is checked
thoroughly in literalParsing() above. Comparing to fromIntegralSrgb()
tests as the ground truth. */
CORRADE_COMPARE(0xf32a8023_srgbah, Color4h{Color4::fromSrgbAlphaInt(0xf32a8023)});
CORRADE_COMPARE(0xf32a8023_srgbah, (Color4h{0.896269_h, 0.0231534_h, 0.215861_h, 0.137255_h}));
/* These are not constexpr yet */
/* Test also boundary values to be sure */
/** @todo is it possible to verify *all* values for roundtrip, without some
crazy template madness? */
CORRADE_COMPARE(0xffffff_srgbh, Color3h{1.0_h});
CORRADE_COMPARE(0x000000_srgbh, Color3h{0.0_h});
CORRADE_COMPARE(0xffffffff_srgbah, Color4h{1.0_h});
CORRADE_COMPARE(0x00000000_srgbah, (Color4h{0.0_h, 0.0_h}));
}
void ColorTest::premultiplied() { void ColorTest::premultiplied() {
/* Usual scenario */ /* Usual scenario */
CORRADE_COMPARE((Color4{0.6f, 0.8f, 0.4f, 0.25f}).premultiplied(), (Color4{0.15f, 0.2f, 0.1f, 0.25f})); CORRADE_COMPARE((Color4{0.6f, 0.8f, 0.4f, 0.25f}).premultiplied(), (Color4{0.15f, 0.2f, 0.1f, 0.25f}));

Write Preview
Loading…
Cancel
Save