mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-10-31 21:00:51 +01:00
Added the ability to set a custom SamplerState for images
This commit is contained in:
parent
6a8e9639c1
commit
b935bd0a61
2 changed files with 20 additions and 0 deletions
|
@ -34,6 +34,7 @@ Fixes
|
||||||
Additions
|
Additions
|
||||||
- Added UiControls.NavType, which stores the most recently used type of ui navigation
|
- Added UiControls.NavType, which stores the most recently used type of ui navigation
|
||||||
- Added SetWidthBasedOnAspect and SetHeightBasedOnAspect to images
|
- Added SetWidthBasedOnAspect and SetHeightBasedOnAspect to images
|
||||||
|
- Added the ability to set a custom SamplerState for images
|
||||||
|
|
||||||
Improvements
|
Improvements
|
||||||
- Allow scrolling panels to contain other scrolling panels
|
- Allow scrolling panels to contain other scrolling panels
|
||||||
|
|
|
@ -96,6 +96,11 @@ namespace MLEM.Ui.Elements {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// The sampler state that this image's <see cref="Texture"/> should be drawn with.
|
||||||
|
/// If this is <see langword="null"/>, the current <see cref="SpriteBatchContext"/>'s <see cref="SpriteBatchContext.SamplerState"/> will be used, which will likely be the same as <see cref="UiSystem.SpriteBatchContext"/>.
|
||||||
|
/// </summary>
|
||||||
|
public SamplerState SamplerState;
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override bool IsHidden => base.IsHidden || this.Texture == null;
|
public override bool IsHidden => base.IsHidden || this.Texture == null;
|
||||||
|
@ -153,6 +158,14 @@ namespace MLEM.Ui.Elements {
|
||||||
public override void Draw(GameTime time, SpriteBatch batch, float alpha, SpriteBatchContext context) {
|
public override void Draw(GameTime time, SpriteBatch batch, float alpha, SpriteBatchContext context) {
|
||||||
if (this.Texture == null)
|
if (this.Texture == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (this.SamplerState != null) {
|
||||||
|
batch.End();
|
||||||
|
var localContext = context;
|
||||||
|
localContext.SamplerState = this.SamplerState;
|
||||||
|
batch.Begin(localContext);
|
||||||
|
}
|
||||||
|
|
||||||
var center = new Vector2(this.Texture.Width / 2F, this.Texture.Height / 2F);
|
var center = new Vector2(this.Texture.Width / 2F, this.Texture.Height / 2F);
|
||||||
var color = this.Color.OrDefault(Microsoft.Xna.Framework.Color.White) * alpha;
|
var color = this.Color.OrDefault(Microsoft.Xna.Framework.Color.White) * alpha;
|
||||||
if (this.MaintainImageAspect) {
|
if (this.MaintainImageAspect) {
|
||||||
|
@ -163,6 +176,12 @@ namespace MLEM.Ui.Elements {
|
||||||
var scale = new Vector2(1F / this.Texture.Width, 1F / this.Texture.Height) * this.DisplayArea.Size;
|
var scale = new Vector2(1F / this.Texture.Width, 1F / this.Texture.Height) * this.DisplayArea.Size;
|
||||||
batch.Draw(this.Texture, this.DisplayArea.Location + center * scale, color, this.ImageRotation, center, scale * this.ImageScale, this.ImageEffects, 0);
|
batch.Draw(this.Texture, this.DisplayArea.Location + center * scale, color, this.ImageRotation, center, scale * this.ImageScale, this.ImageEffects, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.SamplerState != null) {
|
||||||
|
batch.End();
|
||||||
|
batch.Begin(context);
|
||||||
|
}
|
||||||
|
|
||||||
base.Draw(time, batch, alpha, context);
|
base.Draw(time, batch, alpha, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue