move MakeArray to FileFormats.Exts

This commit is contained in:
Chris Forbes
2011-12-27 14:52:11 +13:00
parent 523183431b
commit dd88a1269a
7 changed files with 14 additions and 14 deletions

View File

@@ -190,6 +190,15 @@ namespace OpenRA
(int)(t * c2.G + (1 - t) * c1.G),
(int)(t * c2.B + (1 - t) * c1.B));
}
public static T[] MakeArray<T>(int count, Func<int, T> f)
{
T[] result = new T[count];
for (int i = 0; i < count; i++)
result[i] = f(i);
return result;
}
}
public static class Enum<T>

View File

@@ -19,15 +19,6 @@ namespace OpenRA.Graphics
{
public static class Util
{
public static T[] MakeArray<T>(int count, Func<int, T> f)
{
T[] result = new T[count];
for (int i = 0; i < count; i++)
result[i] = f(i);
return result;
}
static float[] channelSelect = { 0.75f, 0.25f, -0.25f, -0.75f };
public static void FastCreateQuad(Vertex[] vertices, float2 o, Sprite r, int palette, int nv, float2 size)

View File

@@ -104,7 +104,7 @@ namespace OpenRA
public static float Gauss1D(this Thirdparty.Random r, int samples)
{
return Graphics.Util.MakeArray(samples, _ => (float)r.NextDouble() * 2 - 1f)
return Exts.MakeArray(samples, _ => (float)r.NextDouble() * 2 - 1f)
.Sum() / samples;
}

View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<PipType> GetPips(Actor self)
{
var pips = Info.PipCount != 0 ? Info.PipCount : Info.Ammo;
return Graphics.Util.MakeArray(pips,
return Exts.MakeArray(pips,
i => (ammo * pips) / Info.Ammo > i ? PipType.Green : PipType.Transparent);
}
}

View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<PipType> GetPips(Actor self)
{
return Graphics.Util.MakeArray( Info.PipCount,
return Exts.MakeArray( Info.PipCount,
i => ( Player.Ore * Info.PipCount > i * Player.OreCapacity )
? Info.PipColor : PipType.Transparent );
}

View File

@@ -98,7 +98,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
return item;
};
var options = Graphics.Util.MakeArray(map.GetSpawnPoints().Length + 1, i => i).ToList();
var options = Exts.MakeArray(map.GetSpawnPoints().Length + 1, i => i).ToList();
dropdown.ShowDropDown("TEAM_DROPDOWN_TEMPLATE", 150, options, setupItem);
}

View File

@@ -201,7 +201,7 @@ namespace OpenRA.Utility
var srcPalette = Palette.Load(args[1].Split(':')[1], false);
var destPalette = Palette.Load(args[2].Split(':')[1], false);
var fullIndexRange = OpenRA.Graphics.Util.MakeArray<int>(256, x => x);
var fullIndexRange = Exts.MakeArray<int>(256, x => x);
for( var i = 0; i < 256; i++ )
if (!remap.ContainsKey(i))