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

Fix the frame mapping used to select sprites for the SpriteBounds.

Browse Source
This commit is contained in:
Paul Chote
2018-05-01 18:38:01 +00:00
committed by abcdefg30
parent efc744dec3
commit 94dd83bc13
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
View File

@@ -272,9 +272,9 @@ namespace OpenRA.Mods.Common.Graphics
.F(sequence, animation, ShadowStart, ShadowStart + Facings * Stride - 1, sprites.Length - 1, .F(sequence, animation, ShadowStart, ShadowStart + Facings * Stride - 1, sprites.Length - 1,
info.Nodes[0].Location)); info.Nodes[0].Location));
var boundSprites = SpriteBounds(sprites, Frames, Start, Facings, Length); var boundSprites = SpriteBounds(sprites, Frames, Start, Facings, Length, Stride, transpose);
if (ShadowStart > 0) if (ShadowStart > 0)
boundSprites = boundSprites.Concat(SpriteBounds(sprites, Frames, ShadowStart, Facings, Length)); boundSprites = boundSprites.Concat(SpriteBounds(sprites, Frames, ShadowStart, Facings, Length, Stride, transpose));
if (boundSprites.Any()) if (boundSprites.Any())
{ {
@@ -290,13 +290,14 @@ namespace OpenRA.Mods.Common.Graphics
} }
/// <summary>Returns the bounds of all of the sprites that can appear in this animation</summary> /// <summary>Returns the bounds of all of the sprites that can appear in this animation</summary>
static IEnumerable<Rectangle> SpriteBounds(Sprite[] sprites, int[] frames, int start, int facings, int length) static IEnumerable<Rectangle> SpriteBounds(Sprite[] sprites, int[] frames, int start, int facings, int length, int stride, bool transpose)
{ {
for (var facing = 0; facing < facings; facing++) for (var facing = 0; facing < facings; facing++)
{ {
for (var frame = 0; frame < length; frame++) for (var frame = 0; frame < length; frame++)
{ {
var i = frame * facings + facing; var i = transpose ? (frame % length) * facings + facing :
(facing * stride) + (frame % length);
var s = frames != null ? sprites[frames[i]] : sprites[start + i]; var s = frames != null ? sprites[frames[i]] : sprites[start + i];
if (!s.Bounds.IsEmpty) if (!s.Bounds.IsEmpty)
yield return new Rectangle( yield return new Rectangle(