mirror/StrawberryBF
1
0
Fork 0
mirror of https://github.com/MaddyThorson/StrawberryBF.git synced 2025-01-31 07:48:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Color stuff. Fixed ToString for util structs

Browse Source
This commit is contained in:
Matt Thorson 2020-05-07 20:35:11 -07:00
parent 0d907209a2
commit e6194573d5
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Game.bf
View File

@ -26,7 +26,7 @@ namespace Strawberry
private bool updating; private bool updating;
public SDL.Renderer* Renderer { get; private set; } public SDL.Renderer* Renderer { get; private set; }
public Color ClearColor = Color.Black; public Color ClearColor = .Black;
private SDL.Rect screenRect; private SDL.Rect screenRect;
private SDL.Window* window; private SDL.Window* window;

59
src/Util/Color.bf
View File

@ -4,19 +4,22 @@ namespace Strawberry
{ {
public struct Color public struct Color
{ {
static public readonly Color White = Color(255, 255, 255); static public readonly Color White = 0xFFFFFFFF;
static public readonly Color Black = Color(0, 0, 0); static public readonly Color Black = 0x000000FF;
static public readonly Color Transparent = Color(0, 0, 0, 0); static public readonly Color Transparent = 0x00000000;
static public readonly Color Red = Color(255, 0, 0); static public readonly Color Red = 0xFF0000FF;
static public readonly Color Green = Color(0, 255, 0); static public readonly Color Green = 0x00FF00FF;
static public readonly Color Blue = Color(0, 0, 255); static public readonly Color Blue = 0x0000FFFF;
static public readonly Color Cyan = 0xFF00FFFF;
static public readonly Color Magenta = 0xFFFF00FF;
static public readonly Color Yellow = 0x00FFFFFF;
public uint8 R; public uint8 R;
public uint8 G; public uint8 G;
public uint8 B; public uint8 B;
public uint8 A; public uint8 A;
public this(uint8 red, uint8 green, uint8 blue, uint8 alpha) public this(uint8 red, uint8 green, uint8 blue, uint8 alpha = 255)
{ {
R = red; R = red;
G = green; G = green;
@ -24,13 +27,7 @@ namespace Strawberry
A = alpha; A = alpha;
} }
public this(uint8 red, uint8 green, uint8 blue) public this(float red, float green, float blue, float alpha = 1f)
: this(red, green, blue, 255)
{
}
public this(float red, float green, float blue, float alpha)
{ {
R = (uint8)(red * 255); R = (uint8)(red * 255);
G = (uint8)(green * 255); G = (uint8)(green * 255);
@ -38,12 +35,6 @@ namespace Strawberry
A = (uint8)(alpha * 255); A = (uint8)(alpha * 255);
} }
public this(float red, float green, float blue)
: this(red, green, blue, 1f)
{
}
public float Rf public float Rf
{ {
[Inline] [Inline]
@ -104,6 +95,19 @@ namespace Strawberry
} }
} }
public override void ToString(String strBuffer)
{
strBuffer.Set("Color [ ");
((uint)R).ToString(strBuffer);
strBuffer.Append(", ");
((uint)G).ToString(strBuffer);
strBuffer.Append(", ");
((uint)B).ToString(strBuffer);
strBuffer.Append(", ");
((uint)A).ToString(strBuffer);
strBuffer.Append(" ]");
}
static public Color Lerp(Color a, Color b, float t) static public Color Lerp(Color a, Color b, float t)
{ {
return Color( return Color(
@ -114,6 +118,21 @@ namespace Strawberry
); );
} }
static public implicit operator Color(uint32 from)
{
return Color(
(uint8)((from >> 24) & 0xFF),
(uint8)((from >> 16) & 0xFF),
(uint8)((from >> 8) & 0xFF),
(uint8)(from & 0xFF)
);
}
static public implicit operator uint32(Color from)
{
return (((uint32)from.R) << 24) | (((uint32)from.G) << 16) | (((uint32)from.B) << 8) | ((uint32)from.A);
}
static public Color operator/(Color a, Color b) static public Color operator/(Color a, Color b)
{ {
return Lerp(a, b, 0.5f); return Lerp(a, b, 0.5f);