mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-11-22 20:58:34 +01:00
allow image codes to copy the text's color
This commit is contained in:
parent
db54ea7b5e
commit
267cbc8d9c
1 changed files with 11 additions and 7 deletions
|
@ -12,10 +12,12 @@ namespace MLEM.Formatting.Codes {
|
||||||
public class ImageCode : Code {
|
public class ImageCode : Code {
|
||||||
|
|
||||||
private readonly SpriteAnimation image;
|
private readonly SpriteAnimation image;
|
||||||
|
private readonly bool copyTextColor;
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public ImageCode(Match match, Regex regex, SpriteAnimation image) : base(match, regex) {
|
public ImageCode(Match match, Regex regex, SpriteAnimation image, bool copyTextColor) : base(match, regex) {
|
||||||
this.image = image;
|
this.image = image;
|
||||||
|
this.copyTextColor = copyTextColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
@ -35,7 +37,8 @@ namespace MLEM.Formatting.Codes {
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override void DrawSelf(GameTime time, SpriteBatch batch, Vector2 pos, GenericFont font, Color color, float scale, float depth) {
|
public override void DrawSelf(GameTime time, SpriteBatch batch, Vector2 pos, GenericFont font, Color color, float scale, float depth) {
|
||||||
batch.Draw(this.image.CurrentRegion, new RectangleF(pos, new Vector2(font.LineHeight * scale)), Color.White.CopyAlpha(color));
|
var actualColor = this.copyTextColor ? color : Color.White.CopyAlpha(color);
|
||||||
|
batch.Draw(this.image.CurrentRegion, new RectangleF(pos, new Vector2(font.LineHeight * scale)), actualColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -51,13 +54,14 @@ namespace MLEM.Formatting.Codes {
|
||||||
/// <param name="formatter">The formatter to add the code to</param>
|
/// <param name="formatter">The formatter to add the code to</param>
|
||||||
/// <param name="name">The name of the formatting code. The regex for this code will be between angle brackets.</param>
|
/// <param name="name">The name of the formatting code. The regex for this code will be between angle brackets.</param>
|
||||||
/// <param name="image">The image to render at the code's position</param>
|
/// <param name="image">The image to render at the code's position</param>
|
||||||
public static void AddImage(this TextFormatter formatter, string name, TextureRegion image) {
|
/// <param name="copyTextColor">Whether or not the image code should use the text's color instead of White</param>
|
||||||
formatter.AddImage(name, new SpriteAnimation(1, image));
|
public static void AddImage(this TextFormatter formatter, string name, TextureRegion image, bool copyTextColor = false) {
|
||||||
|
formatter.AddImage(name, new SpriteAnimation(1, image), copyTextColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc cref="AddImage(MLEM.Formatting.TextFormatter,string,MLEM.Textures.TextureRegion)"/>
|
/// <inheritdoc cref="AddImage(MLEM.Formatting.TextFormatter,string,MLEM.Textures.TextureRegion,bool)"/>
|
||||||
public static void AddImage(this TextFormatter formatter, string name, SpriteAnimation image) {
|
public static void AddImage(this TextFormatter formatter, string name, SpriteAnimation image, bool copyTextColor = false) {
|
||||||
formatter.Codes.Add(new Regex($"<i {name}>"), (f, m, r) => new ImageCode(m, r, image));
|
formatter.Codes.Add(new Regex($"<i {name}>"), (f, m, r) => new ImageCode(m, r, image, copyTextColor));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue