Skip to content

Icon offsets & properly limit to image bounds #2358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sowelipililimute wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Icon offsets & properly limit to image bounds #2358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions OpenDreamRuntime/Objects/DreamIcon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,12 @@ public enum BlendType {
}

private readonly BlendType _type;
private readonly int _xOffset, _yOffset;
protected readonly int XOffset, YOffset;

protected DreamIconOperationBlend(BlendType type, int xOffset, int yOffset) {
_type = type;
_xOffset = xOffset;
_yOffset = yOffset;
XOffset = xOffset;
YOffset = yOffset;

if (_type is not BlendType.Overlay and not BlendType.Underlay and not BlendType.Multiply and not BlendType.Add and not BlendType.Subtract)
throw new NotImplementedException($"\"{_type}\" blending is not implemented");
Expand Down Expand Up @@ -383,6 +383,7 @@ protected void BlendPixel(Rgba32[] pixels, int dstPixelPosition, Rgba32 src) {
public sealed class DreamIconOperationBlendImage : DreamIconOperationBlend {
private readonly Image<Rgba32> _blending;
private readonly ParsedDMIState? _blendingState;
private readonly int _width, _height;

public DreamIconOperationBlendImage(BlendType type, int xOffset, int yOffset, DreamValue blending) : base(type, xOffset, yOffset) {
//TODO: Find a way to get rid of this!
Expand All @@ -394,6 +395,7 @@ public DreamIconOperationBlendImage(BlendType type, int xOffset, int yOffset, Dr

_blending = blendingIcon.Texture;
_blendingState = blendingIcon.DMI.States.Values.FirstOrDefault();
(_width, _height) = (blendingIcon.DMI.Width, blendingIcon.DMI.Height);
}

public override void OnApply(DreamIcon icon) {
Expand Down Expand Up @@ -428,20 +430,27 @@ public override void ApplyToFrame(Rgba32[] pixels, int imageSpan, int frame, Ato

var blendingFrame = blendingDirFrames[frame];

// Use the smaller of the two sizes if they're different
// TODO: 1,1 should be bottom left, not top left
bounds = UIBox2i.FromDimensions(bounds.Left, bounds.Top, Math.Min(_blending.Width, bounds.Width),
Math.Min(_blending.Height, bounds.Height));
var x0 = XOffset - 1;
var y0 = (-YOffset + 1) + bounds.Height - _height;

var blendX = Math.Max(x0, 0);
var blendY = Math.Max(y0, 0);

var blendWidth = Math.Min(_width + x0, bounds.Width) - blendX;
var blendHeight = Math.Min(_height + y0, bounds.Height) - blendY;

if (blendWidth < 1 || blendHeight < 1)
return;

_blending.ProcessPixelRows(accessor => {
// TODO: x & y offsets

for (int y = bounds.Top; y < bounds.Bottom; y++) {
var row = accessor.GetRowSpan(blendingFrame.Y + y - bounds.Top);
for (int dy = 0; dy < blendHeight; dy++) {
var row = accessor.GetRowSpan((blendingFrame.Y + blendY + dy) - y0);

for (int x = bounds.Left; x < bounds.Right; x++) {
int dstPixelPosition = (y * imageSpan) + x;
Rgba32 src = row[blendingFrame.X + x - bounds.Left];
for (int dx = 0; dx < blendWidth; dx++) {
var dstPixelPosition = ((blendY + dy) * imageSpan) + (blendX + dx);
var src = row[(blendingFrame.X + blendX + dx) - x0];

BlendPixel(pixels, dstPixelPosition, src);
}
Expand Down