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

remove some duplication and dead code

Browse Source
This commit is contained in:
Chris Forbes
2011-12-27 14:47:17 +13:00
parent 132c678594
commit 523183431b
9 changed files with 38 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs
View File

@@ -32,6 +32,8 @@ namespace OpenRA.Mods.RA
if (remainingFrames > 0)
remainingFrames--;
}
static List<string> excludePalettes = new List<string>{"cursor", "chrome", "colorpicker", "shroud", "fog"};
public void AdjustPalette(Dictionary<string,Palette> palettes)
{
@@ -39,7 +41,7 @@ namespace OpenRA.Mods.RA
return;
var frac = (float)remainingFrames / chronoEffectLength;
var excludePalettes = new List<string>(){"cursor", "chrome", "colorpicker", "shroud", "fog"};
foreach (var pal in palettes)
{
if (excludePalettes.Contains(pal.Key))
@@ -50,7 +52,7 @@ namespace OpenRA.Mods.RA
var orig = pal.Value.GetColor(x);
var lum = (int)(255 * orig.GetBrightness());
var desat = Color.FromArgb(orig.A, lum, lum, lum);
pal.Value.SetColor(x, OpenRA.Graphics.Util.Lerp(frac, orig, desat));
pal.Value.SetColor(x, Exts.ColorLerp(frac, orig, desat));
}
}
}

2
OpenRA.Mods.RA/Effects/Contrail.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA
public static Color ChooseColor(Actor self)
{
var ownerColor = Color.FromArgb(255, self.Owner.ColorRamp.GetColor(0));
return PlayerColorRemap.ColorLerp(0.5f, ownerColor, Color.White);
return Exts.ColorLerp(0.5f, ownerColor, Color.White);
}
public ContrailHistory(int trailLength, Color color)

5
OpenRA.Mods.RA/NukePaletteEffect.cs
View File

@@ -32,6 +32,8 @@ namespace OpenRA.Mods.RA
if (remainingFrames > 0)
remainingFrames--;
}
static List<string> excludePalettes = new List<string>{ "cursor", "chrome", "colorpicker", "shroud", "fog" };
public void AdjustPalette(Dictionary<string,Palette> palettes)
{
@@ -40,7 +42,6 @@ namespace OpenRA.Mods.RA
var frac = (float)remainingFrames / nukeEffectLength;
var excludePalettes = new List<string>(){"cursor", "chrome", "colorpicker", "shroud", "fog"};
foreach (var pal in palettes)
{
if (excludePalettes.Contains(pal.Key))
@@ -50,7 +51,7 @@ namespace OpenRA.Mods.RA
{
var orig = pal.Value.GetColor(x);
var white = Color.FromArgb(orig.A, 255, 255, 255);
pal.Value.SetColor(x, OpenRA.Graphics.Util.Lerp(frac,orig,white));
pal.Value.SetColor(x, Exts.ColorLerp(frac,orig,white));
}
}
}

2
OpenRA.Mods.RA/Widgets/PowerBinWidget.cs
View File

@@ -77,7 +77,7 @@ namespace OpenRA.Mods.RA.Widgets
var color = GetPowerColor(power);
var colorDark = Graphics.Util.Lerp(0.25f, color, Color.Black);
var colorDark = Exts.ColorLerp(0.25f, color, Color.Black);
for (int i = 0; i < powerSize.Height; i++)
{
color = (i - 1 < powerSize.Height / 2) ? color : colorDark;