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

Merge pull request #7968 from pchote/ts-tileset-depth

Browse Source 
Load depth data from tmp(ts) sprites.
This commit is contained in:
Oliver Brakmann
2015-05-03 22:31:27 +02:00
parent 536d80a7f3 937d2070cc
commit 622685c8f4
13 changed files with 105 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.D2k/Traits/World/FogPaletteFromR8.cs
View File

@@ -8,9 +8,11 @@
*/
#endregion
using System.Collections.Generic;
using System.IO;
using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits
@@ -29,7 +31,7 @@ namespace OpenRA.Mods.D2k.Traits
public object Create(ActorInitializer init) { return new FogPaletteFromR8(this); }
}
class FogPaletteFromR8 : ILoadsPalettes
class FogPaletteFromR8 : ILoadsPalettes, IProvidesAssetBrowserPalettes
{
readonly FogPaletteFromR8Info info;
public FogPaletteFromR8(FogPaletteFromR8Info info) { this.info = info; }
@@ -55,5 +57,7 @@ namespace OpenRA.Mods.D2k.Traits
wr.AddPalette(info.Name, new ImmutablePalette(colors), info.AllowModifiers);
}
public IEnumerable<string> PaletteNames { get { yield return info.Name; } }
}
}

6
OpenRA.Mods.D2k/Traits/World/PaletteFromR8.cs
View File

@@ -8,9 +8,11 @@
*/
#endregion
using System.Collections.Generic;
using System.IO;
using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits
@@ -29,7 +31,7 @@ namespace OpenRA.Mods.D2k.Traits
public object Create(ActorInitializer init) { return new PaletteFromR8(this); }
}
class PaletteFromR8 : ILoadsPalettes
class PaletteFromR8 : ILoadsPalettes, IProvidesAssetBrowserPalettes
{
readonly PaletteFromR8Info info;
public PaletteFromR8(PaletteFromR8Info info) { this.info = info; }
@@ -53,5 +55,7 @@ namespace OpenRA.Mods.D2k.Traits
wr.AddPalette(info.Name, new ImmutablePalette(colors), info.AllowModifiers);
}
public IEnumerable<string> PaletteNames { get { yield return info.Name; } }
}
}

6
OpenRA.Mods.D2k/Traits/World/PaletteFromScaledPalette.cs
View File

@@ -8,8 +8,10 @@
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits
@@ -35,7 +37,7 @@ namespace OpenRA.Mods.D2k.Traits
public object Create(ActorInitializer init) { return new PaletteFromScaledPalette(this); }
}
class PaletteFromScaledPalette : ILoadsPalettes
class PaletteFromScaledPalette : ILoadsPalettes, IProvidesAssetBrowserPalettes
{
readonly PaletteFromScaledPaletteInfo info;
public PaletteFromScaledPalette(PaletteFromScaledPaletteInfo info) { this.info = info; }
@@ -45,6 +47,8 @@ namespace OpenRA.Mods.D2k.Traits
var remap = new ScaledPaletteRemap(info.Scale, info.Offset);
wr.AddPalette(info.Name, new ImmutablePalette(wr.Palette(info.BasePalette).Palette, remap), info.AllowModifiers);
}
public IEnumerable<string> PaletteNames { get { yield return info.Name; } }
}
class ScaledPaletteRemap : IPaletteRemap