admin/omath
1
0
Fork 0
mirror of https://github.com/orange-cpp/omath.git synced 2026-02-13 07:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug

Browse Source
This commit is contained in:
Orange
2024-05-07 02:12:16 +03:00
parent 768c8b133a
commit 17fae55fdf
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/uml/color.h
View File

@@ -17,9 +17,13 @@ namespace uml::color
class Color : public Vector4
{
public:
Color(float r, float g, float, float b, float a = 1.f);
Color(const Vector4& vec);
Color(float r, float g, float b, float a);
static Color FromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
explicit Color(const Vector4& vec);
[[nodiscard]] Color Blend(const Color& other, float ratio) const;
explicit operator Vector4() {return {x,y,z,w};}
[[nodiscard]] static Color Red() {return {1.f, 0.f, 0.f, 1.f};}
[[nodiscard]] static Color Green() {return {0.f, 1.f, 0.f, 1.f};}
[[nodiscard]] static Color Blue() {return {0.f, 0.f, 1.f, 1.f};}
};
}

13
source/color.cpp
View File

@@ -14,16 +14,23 @@ namespace uml::color
Color Color::Blend(const Color &other, float ratio) const
{
return *this * (1.f - std::clamp(ratio, 0.f, 1.f)) + other * ratio;
return Color( (*this * (1.f - ratio)) + (other * ratio) );
}
Color::Color(float r, float g, float, float b, float a) : Vector4(r,g,b,a)
Color::Color(float r, float g, float b, float a) : Vector4(r,g,b,a)
{
}
Color::Color(const Vector4 &vec) : Vector4(vec.x, vec.y, vec.z, vec.w)
Color::Color(const Vector4 &vec) : Vector4(vec)
{
}
Color Color::FromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255)
{
return Color{Vector4(r, g, b, a) / 255.f};
}
}