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

Merge pull request #10611 from reaperrr/flip-offsets1

Browse Source 
Make FlipX/FlipY flip respective embedded offsets as well
This commit is contained in:
Matthias Mailänder
2016-01-31 18:27:50 +01:00
parent 8291cffb1c fd632baa5b
commit f6c669d6d4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ namespace OpenRA.Mods.Common.Graphics
{ {
var sd = sub.Value.ToDictionary(); var sd = sub.Value.ToDictionary();
// Allow per-sprite offset, start, and length // Allow per-sprite offset, flipping, start, and length
var subStart = LoadField(sd, "Start", 0); var subStart = LoadField(sd, "Start", 0);
var subOffset = LoadField(sd, "Offset", float2.Zero); var subOffset = LoadField(sd, "Offset", float2.Zero);
var subFlipX = LoadField(sd, "FlipX", false); var subFlipX = LoadField(sd, "FlipX", false);
@@ -157,7 +157,10 @@ namespace OpenRA.Mods.Common.Graphics
var subSrc = GetSpriteSrc(modData, tileSet, sequence, animation, sub.Key, sd); var subSrc = GetSpriteSrc(modData, tileSet, sequence, animation, sub.Key, sd);
var subSprites = cache[subSrc].Select( var subSprites = cache[subSrc].Select(
s => new Sprite(s.Sheet, FlipRectangle(s.Bounds, subFlipX, subFlipY), s.Offset + subOffset + offset, s.Channel, blendMode)); s => new Sprite(s.Sheet,
FlipRectangle(s.Bounds, subFlipX, subFlipY),
new float2(subFlipX ? -s.Offset.X : s.Offset.X, subFlipY ? -s.Offset.Y : s.Offset.Y) + subOffset + offset,
s.Channel, blendMode));
var subLength = 0; var subLength = 0;
MiniYaml subLengthYaml; MiniYaml subLengthYaml;
@@ -177,7 +180,10 @@ namespace OpenRA.Mods.Common.Graphics
// Different sequences may apply different offsets to the same frame // Different sequences may apply different offsets to the same frame
var src = GetSpriteSrc(modData, tileSet, sequence, animation, info.Value, d); var src = GetSpriteSrc(modData, tileSet, sequence, animation, info.Value, d);
sprites = cache[src].Select( sprites = cache[src].Select(
s => new Sprite(s.Sheet, FlipRectangle(s.Bounds, flipX, flipY), s.Offset + offset, s.Channel, blendMode)).ToArray(); s => new Sprite(s.Sheet,
FlipRectangle(s.Bounds, flipX, flipY),
new float2(flipX ? -s.Offset.X : s.Offset.X, flipY ? -s.Offset.Y : s.Offset.Y) + offset,
s.Channel, blendMode)).ToArray();
} }
MiniYaml length; MiniYaml length;