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

Add plumbing for mod-defined terrain loaders.

Browse Source
This commit is contained in:
Paul Chote
2020-10-16 16:36:55 +01:00
committed by reaperrr
parent b86b638700
commit 207e09fea9
10 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Manifest.cs
View File

@@ -20,6 +20,17 @@ namespace OpenRA
{
public interface IGlobalModData { }
public sealed class TerrainFormat : IGlobalModData
{
public readonly string Type;
public readonly IReadOnlyDictionary<string, MiniYaml> Metadata;
public TerrainFormat(MiniYaml yaml)
{
Type = yaml.Value;
Metadata = new ReadOnlyDictionary<string, MiniYaml>(yaml.ToDictionary());
}
}
public sealed class SpriteSequenceFormat : IGlobalModData
{
public readonly string Type;

5
OpenRA.Game/Map/TileSet.cs
View File

@@ -19,6 +19,11 @@ using OpenRA.Traits;
namespace OpenRA
{
public interface ITerrainLoader
{
ITerrainInfo ParseTerrain(IReadOnlyFileSystem fileSystem, string path);
}
public interface ITerrainInfo
{
string Id { get; }

11
OpenRA.Game/ModData.cs
View File

@@ -30,6 +30,7 @@ namespace OpenRA
public readonly IPackageLoader[] PackageLoaders;
public readonly ISoundLoader[] SoundLoaders;
public readonly ISpriteLoader[] SpriteLoaders;
public readonly ITerrainLoader TerrainLoader;
public readonly ISpriteSequenceLoader SpriteSequenceLoader;
public readonly IModelSequenceLoader ModelSequenceLoader;
public readonly IVideoLoader[] VideoLoaders;
@@ -75,6 +76,14 @@ namespace OpenRA
SpriteLoaders = ObjectCreator.GetLoaders<ISpriteLoader>(Manifest.SpriteFormats, "sprite");
VideoLoaders = ObjectCreator.GetLoaders<IVideoLoader>(Manifest.VideoFormats, "video");
var terrainFormat = Manifest.Get<TerrainFormat>();
var terrainLoader = ObjectCreator.FindType(terrainFormat.Type + "Loader");
var terrainCtor = terrainLoader?.GetConstructor(new[] { typeof(ModData) });
if (terrainLoader == null || !terrainLoader.GetInterfaces().Contains(typeof(ITerrainLoader)) || terrainCtor == null)
throw new InvalidOperationException("Unable to find a terrain loader for type '{0}'.".F(terrainFormat.Type));
TerrainLoader = (ITerrainLoader)terrainCtor.Invoke(new[] { this });
var sequenceFormat = Manifest.Get<SpriteSequenceFormat>();
var sequenceLoader = ObjectCreator.FindType(sequenceFormat.Type + "Loader");
var sequenceCtor = sequenceLoader != null ? sequenceLoader.GetConstructor(new[] { typeof(ModData) }) : null;
@@ -101,7 +110,7 @@ namespace OpenRA
foreach (var file in Manifest.TileSets)
{
var t = new TileSet(DefaultFileSystem, file);
var t = TerrainLoader.ParseTerrain(DefaultFileSystem, file);
items.Add(t.Id, t);
}