Browse Source

Math: removed deprecated uppercase *HSV APIs from Color.

Deprecated since c27a12bb30 (December
2016). Use the CamelCased *Hsv APIs instead.
simd
Vladimír Vondruš 8 years ago
parent
commit
7b1aa6f497
  1. 2
      doc/changelog.dox
  2. 60
      src/Magnum/Math/Color.h

2
doc/changelog.dox

@ -173,6 +173,8 @@ See also:
- Removed availability of @ref Math::Color3 and @ref Math::Color4 literals in
the root namespace, deprecated since April 2016. Explicitly call
@cpp using namespace Math::Literals; @ce instead.
- Removed uppercase `*HSV` APIs from @ref Math::Color3 and @ref Math::Color4,
deprecated since December 2016. Use the CamelCased `*Hsv` APIs instead.
- Removed @cpp Math::normalize() @ce and @cpp Math::denormalize() @ce
functions, deprecated since December 2016. Use @ref Math::pack() and
@ref Math::unpack() instead.

60
src/Magnum/Math/Color.h

@ -328,13 +328,6 @@ template<class T> class Color3: public Vector3<T> {
*/
typedef std::tuple<Deg<FloatingPointType>, FloatingPointType, FloatingPointType> Hsv;
#ifdef MAGNUM_BUILD_DEPRECATED
/** @brief @copybrief Hsv
* @deprecated Use @ref Hsv instead.
*/
typedef CORRADE_DEPRECATED("use Hsv instead") Hsv HSV;
#endif
/**
* @brief Create RGB color from HSV representation
* @param hsv Color in HSV color space
@ -350,22 +343,6 @@ template<class T> class Color3: public Vector3<T> {
return fromHsv(std::make_tuple(hue, saturation, value));
}
#ifdef MAGNUM_BUILD_DEPRECATED
/** @brief @copybrief fromHsv(const Hsv&)
* @deprecated Use @ref fromHsv(const Hsv&) instead.
*/
CORRADE_DEPRECATED("use fromHsv() instead") static Color3<T> fromHSV(const Hsv& hsv) {
return fromHsv(hsv);
}
/** @brief @copybrief fromHsv(Deg<FloatingPointType>, FloatingPointType, FloatingPointType)
* @deprecated Use @ref fromHsv(Deg<FloatingPointType>, FloatingPointType, FloatingPointType)
* instead.
*/
CORRADE_DEPRECATED("use fromHsv() instead") static Color3<T> fromHSV(Deg<FloatingPointType> hue, FloatingPointType saturation, FloatingPointType value) {
return fromHsv(hue, saturation, value);
}
#endif
/**
* @brief Create linear RGB color from sRGB representation
* @param srgb Color in sRGB color space
@ -515,13 +492,6 @@ template<class T> class Color3: public Vector3<T> {
return Implementation::toHsv<T>(*this);
}
#ifdef MAGNUM_BUILD_DEPRECATED
/** @brief @copybrief toHsv()
* @deprecated Use @ref toHsv() instead.
*/
CORRADE_DEPRECATED("use toHsv() instead") Hsv toHSV() const { return toHsv(); }
#endif
/**
* @brief Hue
* @return Hue in range @f$ [0.0, 360.0] @f$.
@ -649,13 +619,6 @@ class Color4: public Vector4<T> {
/** @copydoc Color3::Hsv */
typedef typename Color3<T>::Hsv Hsv;
#ifdef MAGNUM_BUILD_DEPRECATED
/** @brief @copybrief Hsv
* @deprecated Use @ref Hsv instead.
*/
typedef CORRADE_DEPRECATED("use Hsv instead") Hsv HSV;
#endif
/**
* @brief Red color
*
@ -734,22 +697,6 @@ class Color4: public Vector4<T> {
return fromHsv(std::make_tuple(hue, saturation, value), alpha);
}
#ifdef MAGNUM_BUILD_DEPRECATED
/** @brief @copybrief fromHsv(const Hsv&, T)
* @deprecated Use @ref fromHsv(const Hsv&, T) instead.
*/
CORRADE_DEPRECATED("use fromHsv() instead") static Color4<T> fromHSV(const Hsv& hsv, T a = Implementation::fullChannel<T>()) {
return fromHsv(hsv, a);
}
/** @brief @copybrief fromHsv(Deg<FloatingPointType>, FloatingPointType, FloatingPointType, T)
* @deprecated Use @ref fromHsv(Deg<FloatingPointType>, FloatingPointType, FloatingPointType, T)
* instead.
*/
CORRADE_DEPRECATED("use fromHsv() instead") static Color4<T> fromHSV(Deg<FloatingPointType> hue, FloatingPointType saturation, FloatingPointType value, T a = Implementation::fullChannel<T>()) {
return fromHsv(hue, saturation, value, a);
}
#endif
/**
* @brief Create linear RGBA color from sRGB + alpha representation
* @param srgbAlpha Color in sRGB color space with linear alpha
@ -962,13 +909,6 @@ class Color4: public Vector4<T> {
return Implementation::toHsv<T>(Vector4<T>::rgb());
}
#ifdef MAGNUM_BUILD_DEPRECATED
/** @brief @copybrief toHsv()
* @deprecated Use @ref toHsv() instead.
*/
CORRADE_DEPRECATED("use toHsv() instead") Hsv toHSV() const { return toHsv(); }
#endif
/** @copydoc Color3::hue() */
Deg<FloatingPointType> hue() const {
return Implementation::hue<T>(Vector4<T>::rgb());

Loading…
Cancel
Save