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

Merge pull request #9547 from pchote/aggregate-sequences

Browse Source 
Add support for aggregate sequences
This commit is contained in:
reaperrr
2015-10-18 02:23:23 +02:00
parent 6c94eef763 940bc310c3
commit 380f30ed13
3 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,11 +120,42 @@ namespace OpenRA.Mods.Common.Graphics
var offset = LoadField<float2>(d, "Offset", float2.Zero);
var blendMode = LoadField<BlendMode>(d, "BlendMode", BlendMode.Alpha);
// Apply offset to each sprite in the sequence
// Different sequences may apply different offsets to the same frame
var src = GetSpriteSrc(modData, tileSet, sequence, animation, info.Value, d);
sprites = cache[src].Select(
s => new Sprite(s.Sheet, s.Bounds, s.Offset + offset, s.Channel, blendMode)).ToArray();
MiniYaml combine;
if (d.TryGetValue("Combine", out combine))
{
var combined = Enumerable.Empty<Sprite>();
foreach (var sub in combine.Nodes)
{
var sd = sub.Value.ToDictionary();
// Allow per-sprite offset, start, and length
var subStart = LoadField<int>(sd, "Start", 0);
var subOffset = LoadField<float2>(sd, "Offset", float2.Zero);
var subSrc = GetSpriteSrc(modData, tileSet, sequence, animation, sub.Key, sd);
var subSprites = cache[subSrc].Select(
s => new Sprite(s.Sheet, s.Bounds, s.Offset + subOffset + offset, s.Channel, blendMode));
var subLength = 0;
MiniYaml subLengthYaml;
if (sd.TryGetValue("Length", out subLengthYaml) && subLengthYaml.Value == "*")
subLength = subSprites.Count() - subStart;
else
subLength = LoadField<int>(sd, "Length", 1);
combined = combined.Concat(subSprites.Skip(subStart).Take(subLength));
}
sprites = combined.ToArray();
}
else
{
// Apply offset to each sprite in the sequence
// Different sequences may apply different offsets to the same frame
var src = GetSpriteSrc(modData, tileSet, sequence, animation, info.Value, d);
sprites = cache[src].Select(
s => new Sprite(s.Sheet, s.Bounds, s.Offset + offset, s.Channel, blendMode)).ToArray();
}
MiniYaml length;
if (d.TryGetValue("Length", out length) && length.Value == "*")
@@ -149,14 +180,14 @@ namespace OpenRA.Mods.Common.Graphics
if (Start < 0 || Start + Facings * Stride > sprites.Length)
throw new InvalidOperationException(
"{6}: Sequence {0}.{1} uses frames [{2}..{3}] of SHP `{4}`, but only 0..{5} actually exist"
.F(sequence, animation, Start, Start + Facings * Stride - 1, src, sprites.Length - 1,
"{5}: Sequence {0}.{1} uses frames [{2}..{3}], but only 0..{4} actually exist"
.F(sequence, animation, Start, Start + Facings * Stride - 1, sprites.Length - 1,
info.Nodes[0].Location));
if (ShadowStart + Facings * Stride > sprites.Length)
throw new InvalidOperationException(
"{6}: Sequence {0}.{1}'s shadow frames use frames [{2}..{3}] of SHP `{4}`, but only [0..{5}] actually exist"
.F(sequence, animation, ShadowStart, ShadowStart + Facings * Stride - 1, src, sprites.Length - 1,
"{5}: Sequence {0}.{1}'s shadow frames use frames [{2}..{3}], but only [0..{4}] actually exist"
.F(sequence, animation, ShadowStart, ShadowStart + Facings * Stride - 1, sprites.Length - 1,
info.Nodes[0].Location));
}
catch (FormatException f)

2
mods/cnc/rules/infantry.yaml
View File

@@ -90,10 +90,8 @@ E4:
LocalOffset: 341,0,256
FireDelay: 3
MuzzleSequence: muzzle
MuzzleSplitFacings: 8
AttackFrontal:
WithMuzzleOverlay:
SplitFacings: true
WithInfantryBody:
AttackSequence: shoot

52
mods/cnc/sequences/infantry.yaml
View File

@@ -434,30 +434,34 @@ e4:
Length: 4
Tick: 1600
ZOffset: -511
muzzle0: flame-n
Length: *
Offset: 1,6
muzzle1: flame-nw
Length: *
Offset: 8,7
muzzle2: flame-w
Length: *
Offset: 8,2
muzzle3: flame-sw
Length: *
Offset: 7,-2
muzzle4: flame-s
Length: *
Offset: 1,-2
muzzle5: flame-se
Length: *
Offset: -5,-2
muzzle6: flame-e
Length: *
Offset: -7,2
muzzle7: flame-ne
Length: *
Offset: -7,8
muzzle:
Combine:
flame-n:
Length: *
Offset: 1,6
flame-nw:
Length: *
Offset: 8,7
flame-w:
Length: *
Offset: 8,2
flame-sw:
Length: *
Offset: 7,-2
flame-s:
Length: *
Offset: 1,-2
flame-se:
Length: *
Offset: -5,-2
flame-e:
Length: *
Offset: -7,2
flame-ne:
Length: *
Offset: -7,8
Facings: 8
Length: 13
icon: e4icnh.tem
AddExtension: False