Simplify PaletteReference interface.
This commit is contained in:
@@ -19,28 +19,12 @@ namespace OpenRA.Graphics
|
||||
{
|
||||
public class PaletteReference
|
||||
{
|
||||
string name;
|
||||
int index;
|
||||
public readonly string Name;
|
||||
public readonly int Index;
|
||||
public PaletteReference(string name, int index)
|
||||
{
|
||||
this.name = name;
|
||||
this.index = index;
|
||||
}
|
||||
|
||||
public static PaletteReference FromName(string name)
|
||||
{
|
||||
return new PaletteReference(name, -1);
|
||||
}
|
||||
|
||||
public int RowIndex(WorldRenderer wr)
|
||||
{
|
||||
if (index == -1)
|
||||
{
|
||||
// Too spammy to enable by default
|
||||
//Log.Write("perf", "Late resolution of palette reference {0}", name);
|
||||
index = wr.GetPaletteIndex(name);
|
||||
}
|
||||
return index;
|
||||
Name = name;
|
||||
Index = index;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,7 +97,7 @@ namespace OpenRA.Graphics
|
||||
terrainRenderer.Draw(this, Game.viewport);
|
||||
foreach (var a in world.traitDict.ActorsWithTraitMultiple<IRenderAsTerrain>(world))
|
||||
foreach (var r in a.Trait.RenderAsTerrain(this, a.Actor))
|
||||
r.Sprite.DrawAt(r.Pos, r.Palette.RowIndex(this), r.Scale);
|
||||
r.Sprite.DrawAt(r.Pos, r.Palette.Index, r.Scale);
|
||||
|
||||
foreach (var a in world.Selection.Actors)
|
||||
if (!a.Destroyed)
|
||||
@@ -126,7 +110,7 @@ namespace OpenRA.Graphics
|
||||
world.OrderGenerator.RenderBeforeWorld(this, world);
|
||||
|
||||
foreach (var image in SpritesToRender())
|
||||
image.Sprite.DrawAt(image.Pos, image.Palette.RowIndex(this), image.Scale);
|
||||
image.Sprite.DrawAt(image.Pos, image.Palette.Index, image.Scale);
|
||||
|
||||
// added for contrails
|
||||
foreach (var a in world.ActorsWithTrait<IPostRender>())
|
||||
|
||||
Reference in New Issue
Block a user