ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 20:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix RGB returning wrong color and change it to RGBA (#1793)

Browse source 
* FIx RGB returning wrong color and change it to RGBA

* Don't use the old RGB variable

* Fix UIGlowPayload too

* Add RGBA to ABGR helper and new method for glow/foreground to expose it directly

* Move from Utils to ColorHelpers

* Rename the function
This commit is contained in:
Infi 2024-05-04 06:22:53 +02:00 • committed by GitHub
parent d2a0c94ddd
commit 44a3c3a1ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs
View file

@ -77,15 +77,21 @@ public class UIForegroundPayload : Payload
} }
/// <summary> /// <summary>
/// Gets the Red/Green/Blue values for this foreground color, encoded as a typical hex color. /// Gets the Red/Green/Blue/Alpha values for this foreground color, encoded as a typical hex color.
/// </summary> /// </summary>
[JsonIgnore] [JsonIgnore]
public uint RGB => this.UIColor.UIForeground & 0xFFFFFF; public uint RGBA => this.UIColor.UIForeground;
/// <summary>
/// Gets the ABGR value for this foreground color, as ImGui requires it in PushColor.
/// </summary>
[JsonIgnore]
public uint ABGR => Interface.ColorHelpers.SwapEndianness(this.UIColor.UIForeground);
/// <inheritdoc/> /// <inheritdoc/>
public override string ToString() public override string ToString()
{ {
return $"{this.Type} - UIColor: {this.colorKey} color: {(this.IsEnabled ? this.RGB : 0)}"; return $"{this.Type} - UIColor: {this.colorKey} color: {(this.IsEnabled ? this.RGBA : 0)}";
} }
/// <inheritdoc/> /// <inheritdoc/>

12
Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs
View file

@ -68,10 +68,16 @@ public class UIGlowPayload : Payload
public bool IsEnabled => this.ColorKey != 0; public bool IsEnabled => this.ColorKey != 0;
/// <summary> /// <summary>
/// Gets the Red/Green/Blue values for this glow color, encoded as a typical hex color. /// Gets the Red/Green/Blue/Alpha values for this glow color, encoded as a typical hex color.
/// </summary> /// </summary>
[JsonIgnore] [JsonIgnore]
public uint RGB => this.UIColor.UIGlow & 0xFFFFFF; public uint RGBA => this.UIColor.UIGlow;
/// <summary>
/// Gets the ABGR value for this glow color, as ImGui requires it in PushColor.
/// </summary>
[JsonIgnore]
public uint ABGR => Interface.ColorHelpers.SwapEndianness(this.UIColor.UIGlow);
/// <summary> /// <summary>
/// Gets a Lumina UIColor object representing this payload. The actual color data is at UIColor.UIGlow. /// Gets a Lumina UIColor object representing this payload. The actual color data is at UIColor.UIGlow.
@ -85,7 +91,7 @@ public class UIGlowPayload : Payload
/// <inheritdoc/> /// <inheritdoc/>
public override string ToString() public override string ToString()
{ {
return $"{this.Type} - UIColor: {this.colorKey} color: {(this.IsEnabled ? this.RGB : 0)}"; return $"{this.Type} - UIColor: {this.colorKey} color: {(this.IsEnabled ? this.RGBA : 0)}";
} }
/// <inheritdoc/> /// <inheritdoc/>

11
Dalamud/Interface/ColorHelpers.cs
View file

@ -1,3 +1,4 @@
using System.Buffers.Binary;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Drawing; using System.Drawing;
using System.Numerics; using System.Numerics;
@ -159,6 +160,16 @@ public static class ColorHelpers
return new Vector4(r, g, b, hsv.A); return new Vector4(r, g, b, hsv.A);
} }
/// <summary>
/// Performs a swap of endianness
/// Exmaple:
/// (FFXIV) RGBA to ABGR (ImGui)
/// </summary>
/// <param name="rgba">Color value in byte order X Y Z W.</param>
/// <returns>Endian swapped color value with new byte order W Z Y X.</returns>
public static uint SwapEndianness(uint rgba)
=> BinaryPrimitives.ReverseEndianness(rgba);
/// <summary> /// <summary>
/// Lighten a color. /// Lighten a color.
/// </summary> /// </summary>