spaces to tabs and StyleCop cleanup

This commit is contained in:
Matthias Mailänder
2013-09-01 09:54:50 +02:00
parent e59f2df1f1
commit d4ed9702c8

View File

@@ -8,16 +8,22 @@
*/ */
#endregion #endregion
using System;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO; using System.IO;
using System;
using System.Reflection; using System.Reflection;
namespace OpenRA.FileFormats namespace OpenRA.FileFormats
{ {
public class Palette public class Palette
{ {
public static Palette Load(string filename, int[] remap)
{
using (var s = File.OpenRead(filename))
return new Palette(s, remap);
}
uint[] colors; uint[] colors;
public Color GetColor(int index) public Color GetColor(int index)
{ {
@@ -41,8 +47,8 @@ namespace OpenRA.FileFormats
public void ApplyRemap(IPaletteRemap r) public void ApplyRemap(IPaletteRemap r)
{ {
for(int i = 0; i < 256; i++) for (int i = 0; i < 256; i++)
colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)colors[i]),i).ToArgb(); colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)colors[i]), i).ToArgb();
} }
public Palette(Stream s, int[] remapShadow) public Palette(Stream s, int[] remapShadow)
@@ -60,7 +66,7 @@ namespace OpenRA.FileFormats
} }
} }
colors[0] = 0; //convert black background to transparency colors[0] = 0; // convert black background to transparency
foreach (int i in remapShadow) foreach (int i in remapShadow)
colors[i] = 140u << 24; colors[i] = 140u << 24;
} }
@@ -111,15 +117,10 @@ namespace OpenRA.FileFormats
for (var x = 0; x < 256; x++) for (var x = 0; x < 256; x++)
*(c + x) = colors[x]; *(c + x) = colors[x];
} }
b.UnlockBits(data); b.UnlockBits(data);
return b; return b;
} }
public static Palette Load(string filename, int[] remap)
{
using(var s = File.OpenRead(filename))
return new Palette(s, remap);
}
} }
public interface IPaletteRemap { Color GetRemappedColor(Color original, int index); } public interface IPaletteRemap { Color GetRemappedColor(Color original, int index); }