Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Color::RGB() => Color::Rgb()

This commit is contained in:
liuhaibo.2020 2020-04-30 14:58:50 +08:00
parent d6088ed79c
commit ef8db9023c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/kiwano/render/Color.cpp
View File

@ -75,22 +75,22 @@ Color::Color(uint32_t rgb, float alpha)
{
}
Color Color::RGB(float r, float g, float b)
Color Color::Rgb(float r, float g, float b)
{
return Color::RGBA(r, g, b, 1.0f);
return Color::Rgba(r, g, b, 1.0f);
}
Color Color::RGB(uint32_t rgb)
Color Color::Rgb(uint32_t rgb)
{
return Color::RGBA(rgb, 1.0f);
return Color::Rgba(rgb, 1.0f);
}
Color Color::RGBA(float r, float g, float b, float alpha)
Color Color::Rgba(float r, float g, float b, float alpha)
{
return Color(r, g, b, alpha);
}
Color Color::RGBA(uint32_t rgb, float alpha)
Color Color::Rgba(uint32_t rgb, float alpha)
{
return Color(rgb, alpha);
}

8
src/kiwano/render/Color.h
View File

@ -78,12 +78,12 @@ public:
/// @param r 红色值，范围 0.0 - 1.0
/// @param g 绿色值，范围 0.0 - 1.0
/// @param b 蓝色值，范围 0.0 - 1.0
static Color RGB(float r, float g, float b);
static Color Rgb(float r, float g, float b);
/// \~chinese
/// @brief 构造 RGB 颜色
/// @param rgb 使用16进制整形值表示 RGB颜色
static Color RGB(uint32_t rgb);
static Color Rgb(uint32_t rgb);
/// \~chinese
/// @brief 构造 RGBA 颜色
@ -91,13 +91,13 @@ public:
/// @param g 绿色值，范围 0.0 - 1.0
/// @param b 蓝色值，范围 0.0 - 1.0
/// @param alpha Alpha值，范围 0.0 - 1.0
static Color RGBA(float r, float g, float b, float alpha);
static Color Rgba(float r, float g, float b, float alpha);
/// \~chinese
/// @brief 构造 RGBA 颜色
/// @param rgb 使用16进制整形值表示 RGB颜色
/// @param alpha Alpha值，范围 0.0 - 1.0
static Color RGBA(uint32_t rgb, float alpha);
static Color Rgba(uint32_t rgb, float alpha);
bool operator==(const Color& rhs) const;