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

no more remap files. just specify what you want in the yaml.

Browse Source
This commit is contained in:
Chris Forbes
2010-02-28 09:45:39 +13:00
parent ae77b596d3
commit 48d12a55f0
31 changed files with 146 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -212,7 +212,6 @@
<Compile Include="Traits\LimitedAmmo.cs" />
<Compile Include="Traits\SupportPowers\NukePower.cs" />
<Compile Include="Traits\World\PaletteFromFile.cs" />
<Compile Include="Traits\World\PaletteFromRemap.cs" />
<Compile Include="Traits\World\PaletteFromRGBA.cs" />
<Compile Include="Traits\Passenger.cs" />
<Compile Include="Traits\Player\PlaceBuilding.cs" />

49
OpenRA.Game/Traits/World/PaletteFromRemap.cs
View File

@@ -1,49 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA.
*
* OpenRA is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* OpenRA is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using OpenRA.FileFormats;
namespace OpenRA.Traits
{
class PaletteFromRemapInfo : ITraitInfo
{
public readonly string Name = null;
public readonly string Theatre = null;
public readonly string BasePalette = null;
public readonly string Remap = null;
public object Create(Actor self) { return new PaletteFromRemap(self, this); }
}
class PaletteFromRemap
{
public PaletteFromRemap(Actor self, PaletteFromRemapInfo info)
{
if (info.Theatre == null ||
info.Theatre.ToLowerInvariant() == self.World.Map.Theater.ToLowerInvariant())
{
Log.Write("Loading palette {0} from theatre {1} with remap {2}", info.Name, info.BasePalette, info.Remap);
var wr = self.World.WorldRenderer;
var pal = wr.GetPalette(info.BasePalette);
var newpal = (info.Remap == null) ? pal : new Palette(pal, new PlayerColorRemap(FileSystem.Open(info.Remap)));
wr.AddPalette(info.Name, newpal);
}
}
}
}

18
OpenRA.Game/Traits/World/PlayerColorPalette.cs
View File

@@ -28,7 +28,11 @@ namespace OpenRA.Traits
public readonly string Name = null;
public readonly string DisplayName = null;
public readonly string BasePalette = null;
public readonly string Remap = null;
public readonly int[] Color1 = { 255, 255, 255 };
public readonly int[] Color2 = { 0, 0, 0 };
public readonly bool SplitRamp = false;
public readonly int[] DisplayColor = null;
public object Create(Actor self) { return new PlayerColorPalette(self, this); }
}
@@ -39,9 +43,17 @@ namespace OpenRA.Traits
{
var wr = self.World.WorldRenderer;
var pal = wr.GetPalette(info.BasePalette);
var newpal = (info.Remap == null) ? pal : new Palette(pal, new PlayerColorRemap(FileSystem.Open(info.Remap)));
var newpal = new Palette(pal, new PlayerColorRemap(
ArrayToColor(info.Color1),
ArrayToColor(info.Color2),
info.SplitRamp));
wr.AddPalette(info.Name, newpal);
Player.RegisterPlayerColor(info.Name, info.DisplayName, Color.FromArgb(info.DisplayColor[0], info.DisplayColor[1], info.DisplayColor[2]));
Player.RegisterPlayerColor(info.Name, info.DisplayName,
ArrayToColor(info.DisplayColor));
}
static Color ArrayToColor(int[] x) { return Color.FromArgb(x[0], x[1], x[2]); }
}
}