Move glPixelStore call inside of InitTextEngine so users don't need to call it. Also adjusted Color3 and Color4, more work coming soon.
Some checks failed
Run ReCI Build Test / Explore-Gitea-Actions (push) Failing after 2m18s
Some checks failed
Run ReCI Build Test / Explore-Gitea-Actions (push) Failing after 2m18s
This commit is contained in:
@@ -5,19 +5,23 @@
|
||||
namespace JGL
|
||||
{
|
||||
using namespace J3ML;
|
||||
struct Color3 {
|
||||
class Color3 {
|
||||
public:
|
||||
u8 r;
|
||||
u8 g;
|
||||
u8 b;
|
||||
Color3 Lerp(const Color3& rhs, float alpha) const;
|
||||
Color3(u8 R, u8 G, u8 B) : r(R), g(G), b(B) {}
|
||||
|
||||
u8 RedChannel () const { return r; }
|
||||
u8 GreenChannel() const { return g; }
|
||||
u8 BlueChannel () const { return b; }
|
||||
float RedChannelNormalized () const { return static_cast<float>(r) / 255.f;}
|
||||
float BlueChannelNormalized() const { return static_cast<float>(b) / 255.f;}
|
||||
float GreenChannelNormalized() const { return static_cast<float>(g) / 255.f;}
|
||||
public:
|
||||
Color3(u8 R, u8 G, u8 B);
|
||||
static Color3 FromHex(const std::string& hexCode);
|
||||
public:
|
||||
Color3 Lerp(const Color3& rhs, float alpha) const;
|
||||
u8 RedChannel () const;
|
||||
u8 GreenChannel() const;
|
||||
u8 BlueChannel () const;
|
||||
float RedChannelNormalized () const;
|
||||
float BlueChannelNormalized() const;
|
||||
float GreenChannelNormalized() const;
|
||||
};
|
||||
|
||||
|
||||
|
@@ -6,12 +6,25 @@ namespace JGL
|
||||
{
|
||||
class Color4 {
|
||||
public:
|
||||
explicit Color4(const Color3& color3, unsigned int alpha) {r = color3.r; g = color3.g; b = color3.b; a = alpha;}
|
||||
Color4(int red, int green, int blue, int alpha = 127) : r(red), g(green), b(blue), a(alpha) {}
|
||||
static Color4 FromColor3(const Color3& color3, unsigned int alpha = 127) {return Color4(color3, alpha);}
|
||||
int r;
|
||||
int g;
|
||||
int b;
|
||||
int a;
|
||||
u8 r;
|
||||
u8 g;
|
||||
u8 b;
|
||||
u8 a;
|
||||
public:
|
||||
explicit Color4(const Color3& color3, u8 alpha = 255);
|
||||
Color4(u8 red, u8 green, u8 blue, u8 alpha = 255);
|
||||
static Color4 FromColor3(const Color3& color3, u8 alpha = 255);
|
||||
static Color4 FromHex(const std::string& hexCode, u8 alpha = 255);
|
||||
|
||||
public:
|
||||
u8 RedChannel() const;
|
||||
u8 GreenChannel() const;
|
||||
u8 BlueChannel() const;
|
||||
u8 AlphaChannel() const;
|
||||
|
||||
float RedChannelNormalized() const;
|
||||
float GreenChannelNormalized() const;
|
||||
float BlueChannelNormalized() const;
|
||||
float AlphaChannelNormalized() const;
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user