04c3cd6ec5
The previous MiniYaml.Merge implementation interacted poorly with yaml inheritance, making it complicated (or impossible) to override certain keys from Defaults. The new implementation is simpler: If a key is defined it will be used. If it isn't, the default (if defined) will be used. Defaults can be masked by making sure the same key is defined (even with an empty value) in the sequence. This also fixes naming within the sequence code to distinguish between images (a group of sequences), sequences (defining a specific sprite/animation), and filenames for a specific sprite/animation.
51 lines
2.0 KiB
C#
51 lines
2.0 KiB
C#
#region Copyright & License Information
|
|
/*
|
|
* Copyright (c) The OpenRA Developers and Contributors
|
|
* This file is part of OpenRA, which is free software. It is made
|
|
* available to you under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, either version 3 of
|
|
* the License, or (at your option) any later version. For more
|
|
* information, see COPYING.
|
|
*/
|
|
#endregion
|
|
|
|
using System;
|
|
using OpenRA.Graphics;
|
|
using OpenRA.Mods.Common.Graphics;
|
|
|
|
namespace OpenRA.Mods.Cnc.Graphics
|
|
{
|
|
public class ClassicSpriteSequenceLoader : DefaultSpriteSequenceLoader
|
|
{
|
|
public ClassicSpriteSequenceLoader(ModData modData)
|
|
: base(modData) { }
|
|
|
|
public override ISpriteSequence CreateSequence(ModData modData, string tileset, SpriteCache cache, string image, string sequence, MiniYaml data, MiniYaml defaults)
|
|
{
|
|
return new ClassicSpriteSequence(modData, tileset, cache, this, image, sequence, data, defaults);
|
|
}
|
|
}
|
|
|
|
[Desc("A sprite sequence that has the oddities that come with first-generation Westwood titles.")]
|
|
public class ClassicSpriteSequence : DefaultSpriteSequence
|
|
{
|
|
[Desc("Incorporate a compensation factor for the rotational distortion present in the first-generation Westwood games.")]
|
|
static readonly SpriteSequenceField<bool> UseClassicFacings = new SpriteSequenceField<bool>(nameof(UseClassicFacings), false);
|
|
readonly bool useClassicFacings;
|
|
|
|
public ClassicSpriteSequence(ModData modData, string tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string image, string sequence, MiniYaml data, MiniYaml defaults)
|
|
: base(modData, tileSet, cache, loader, image, sequence, data, defaults)
|
|
{
|
|
useClassicFacings = LoadField(UseClassicFacings, data, defaults);
|
|
|
|
if (useClassicFacings && facings != 32)
|
|
throw new InvalidOperationException($"Sequence {image}.{sequence}: UseClassicFacings is only valid for 32 facings");
|
|
}
|
|
|
|
protected override int GetFacingFrameOffset(WAngle facing)
|
|
{
|
|
return useClassicFacings ? Util.ClassicIndexFacing(facing, facings) : Common.Util.IndexFacing(facing, facings);
|
|
}
|
|
}
|
|
}
|