epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allocate 1px empty margin between sprites.

Browse Source
This commit is contained in:
Paul Chote
2019-12-27 15:47:36 +00:00
committed by abcdefg30
parent 84daf890d3
commit d91495a041
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Graphics/SheetBuilder.cs
View File

@@ -36,6 +36,7 @@ namespace OpenRA.Graphics
public readonly SheetType Type; public readonly SheetType Type;
readonly List<Sheet> sheets = new List<Sheet>(); readonly List<Sheet> sheets = new List<Sheet>();
readonly Func<Sheet> allocateSheet; readonly Func<Sheet> allocateSheet;
readonly int margin;
Sheet current; Sheet current;
TextureChannel channel; TextureChannel channel;
@@ -60,16 +61,17 @@ namespace OpenRA.Graphics
public SheetBuilder(SheetType t) public SheetBuilder(SheetType t)
: this(t, Game.Settings.Graphics.SheetSize) { } : this(t, Game.Settings.Graphics.SheetSize) { }
public SheetBuilder(SheetType t, int sheetSize) public SheetBuilder(SheetType t, int sheetSize, int margin = 1)
: this(t, () => AllocateSheet(t, sheetSize)) { } : this(t, () => AllocateSheet(t, sheetSize), margin) { }
public SheetBuilder(SheetType t, Func<Sheet> allocateSheet) public SheetBuilder(SheetType t, Func<Sheet> allocateSheet, int margin = 1)
{ {
channel = t == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA; channel = t == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
Type = t; Type = t;
current = allocateSheet(); current = allocateSheet();
sheets.Add(current); sheets.Add(current);
this.allocateSheet = allocateSheet; this.allocateSheet = allocateSheet;
this.margin = margin;
} }
public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Size, 0, frame.Offset); } public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Size, 0, frame.Offset); }
@@ -115,16 +117,16 @@ namespace OpenRA.Graphics
public Sprite Allocate(Size imageSize) { return Allocate(imageSize, 0, float3.Zero); } public Sprite Allocate(Size imageSize) { return Allocate(imageSize, 0, float3.Zero); }
public Sprite Allocate(Size imageSize, float zRamp, float3 spriteOffset) public Sprite Allocate(Size imageSize, float zRamp, float3 spriteOffset)
{ {
if (imageSize.Width + p.X > current.Size.Width) if (imageSize.Width + p.X + margin > current.Size.Width)
{ {
p = new int2(0, p.Y + rowHeight); p = new int2(0, p.Y + rowHeight + margin);
rowHeight = imageSize.Height; rowHeight = imageSize.Height;
} }
if (imageSize.Height > rowHeight) if (imageSize.Height > rowHeight)
rowHeight = imageSize.Height; rowHeight = imageSize.Height;
if (p.Y + imageSize.Height > current.Size.Height) if (p.Y + imageSize.Height + margin > current.Size.Height)
{ {
var next = NextChannel(channel); var next = NextChannel(channel);
if (next == null) if (next == null)
@@ -141,8 +143,8 @@ namespace OpenRA.Graphics
p = int2.Zero; p = int2.Zero;
} }
var rect = new Sprite(current, new Rectangle(p.X, p.Y, imageSize.Width, imageSize.Height), zRamp, spriteOffset, channel, BlendMode.Alpha); var rect = new Sprite(current, new Rectangle(p.X + margin, p.Y + margin, imageSize.Width, imageSize.Height), zRamp, spriteOffset, channel, BlendMode.Alpha);
p += new int2(imageSize.Width, 0); p += new int2(imageSize.Width + margin, 0);
return rect; return rect;
} }