Merge remote-tracking branch 'origin/master'
# Conflicts: # include/Color4.hpp # main.cpp
This commit is contained in:
@@ -137,6 +137,10 @@ Color4 Color4::FromHexA(const std::string &hexACode) {
|
||||
throw std::invalid_argument("Invalid hex code");
|
||||
}
|
||||
|
||||
Color4 Color4::FromHSV(float hue, float saturation, float value, float alpha) {
|
||||
return Color4(HSV{hue, saturation, value}, alpha);
|
||||
}
|
||||
|
||||
u8 Color4::RedChannel() const { return r;}
|
||||
|
||||
u8 Color4::GreenChannel() const { return g;}
|
||||
|
Reference in New Issue
Block a user