b7e0ed9b87
When handling the Nodes collection in MiniYaml, individual nodes are located via one of two methods:
// Lookup a single key with linear search.
var node = yaml.Nodes.FirstOrDefault(n => n.Key == "SomeKey");
// Convert to dictionary, expecting many key lookups.
var dict = nodes.ToDictionary();
// Lookup a single key in the dictionary.
var node = dict["SomeKey"];
To simplify lookup of individual keys via linear search, provide helper methods NodeWithKeyOrDefault and NodeWithKey. These helpers do the equivalent of Single{OrDefault} searches. Whilst this requires checking the whole list, it provides a useful correctness check. Two duplicated keys in TS yaml are fixed as a result. We can also optimize the helpers to not use LINQ, avoiding allocation of the delegate to search for a key.
Adjust existing code to use either lnear searches or dictionary lookups based on whether it will be resolving many keys. Resolving few keys can be done with linear searches to avoid building a dictionary. Resolving many keys should be done with a dictionary to avoid quaradtic runtime from repeated linear searches.
67 lines
2.1 KiB
C#
67 lines
2.1 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 System.Collections.Generic;
|
|
using System.Linq;
|
|
using OpenRA.Traits;
|
|
|
|
namespace OpenRA.Graphics
|
|
{
|
|
public sealed class CursorProvider
|
|
{
|
|
public readonly IReadOnlyDictionary<string, CursorSequence> Cursors;
|
|
public readonly IReadOnlyDictionary<string, ImmutablePalette> Palettes;
|
|
|
|
public CursorProvider(ModData modData)
|
|
{
|
|
var fileSystem = modData.DefaultFileSystem;
|
|
var sequenceYaml = MiniYaml.Merge(modData.Manifest.Cursors.Select(
|
|
s => MiniYaml.FromStream(fileSystem.Open(s), s)));
|
|
|
|
var cursorsYaml = new MiniYaml(null, sequenceYaml).NodeWithKey("Cursors").Value;
|
|
|
|
// Overwrite previous definitions if there are duplicates
|
|
var pals = new Dictionary<string, IProvidesCursorPaletteInfo>();
|
|
foreach (var p in modData.DefaultRules.Actors[SystemActors.World].TraitInfos<IProvidesCursorPaletteInfo>())
|
|
if (p.Palette != null)
|
|
pals[p.Palette] = p;
|
|
|
|
Palettes = cursorsYaml.Nodes.Select(n => n.Value.Value)
|
|
.Where(p => p != null)
|
|
.Distinct()
|
|
.ToDictionary(p => p, p => pals[p].ReadPalette(modData.DefaultFileSystem));
|
|
|
|
var frameCache = new FrameCache(fileSystem, modData.SpriteLoaders);
|
|
var cursors = new Dictionary<string, CursorSequence>();
|
|
foreach (var s in cursorsYaml.Nodes)
|
|
foreach (var sequence in s.Value.Nodes)
|
|
cursors.Add(sequence.Key, new CursorSequence(frameCache, sequence.Key, s.Key, s.Value.Value, sequence.Value));
|
|
|
|
Cursors = cursors;
|
|
}
|
|
|
|
public bool HasCursorSequence(string cursor)
|
|
{
|
|
return Cursors.ContainsKey(cursor);
|
|
}
|
|
|
|
public CursorSequence GetCursorSequence(string cursor)
|
|
{
|
|
try { return Cursors[cursor]; }
|
|
catch (KeyNotFoundException)
|
|
{
|
|
throw new InvalidOperationException($"Cursor does not have a sequence `{cursor}`");
|
|
}
|
|
}
|
|
}
|
|
}
|