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

Wrap palette references with a PaletteRef object.

Browse Source
This commit is contained in:
Paul Chote
2013-02-24 11:08:50 +13:00
parent a166815348
commit f0ba0ce2e8
30 changed files with 83 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Effects/FlashTarget.cs
View File

@@ -10,6 +10,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Effects
@@ -39,7 +40,7 @@ namespace OpenRA.Effects
if (remainingTicks % 2 == 0)
foreach (var r in target.Render())
yield return r.WithPalette("highlight");
yield return r.WithPalette(PaletteReference.FromName("highlight"));
}
}
}

2
OpenRA.Game/Graphics/AnimationWithOffset.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Graphics
this.DisableFunc = d;
}
public Renderable Image(Actor self, string pal)
public Renderable Image(Actor self, PaletteReference pal)
{
var p = self.CenterLocation;
var loc = p.ToFloat2() - 0.5f * Animation.Image.size

31
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -17,6 +17,33 @@ using OpenRA.Traits;
namespace OpenRA.Graphics
{
public class PaletteReference
{
string name;
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;
}
}
public class WorldRenderer
{
public readonly World world;
@@ -78,7 +105,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(a.Actor))
r.Sprite.DrawAt(r.Pos, this.GetPaletteIndex(r.Palette), r.Scale);
r.Sprite.DrawAt(r.Pos, r.Palette.RowIndex(this), r.Scale);
foreach (var a in world.Selection.Actors)
if (!a.Destroyed)
@@ -91,7 +118,7 @@ namespace OpenRA.Graphics
world.OrderGenerator.RenderBeforeWorld(this, world);
foreach (var image in SpritesToRender())
image.Sprite.DrawAt(image.Pos, this.GetPaletteIndex(image.Palette), image.Scale);
image.Sprite.DrawAt(image.Pos, image.Palette.RowIndex(this), image.Scale);
// added for contrails
foreach (var a in world.ActorsWithTrait<IPostRender>())

9
OpenRA.Game/Traits/Render/RenderSimple.cs
View File

@@ -27,8 +27,10 @@ namespace OpenRA.Traits
{
var anim = new Animation(RenderSimple.GetImage(building), () => 0);
anim.PlayRepeating("idle");
var pal = Palette ?? (owner != null ? PlayerPalette + owner.InternalName : null);
yield return new Renderable(anim.Image, 0.5f * anim.Image.size * (1 - Scale),
Palette ?? (owner != null ? PlayerPalette + owner.InternalName : null), 0, Scale);
PaletteReference.FromName(pal), 0, Scale);
}
}
@@ -77,7 +79,10 @@ namespace OpenRA.Traits
anim.PlayRepeating("idle");
}
public string Palette(Player p) { return Info.Palette ?? Info.PlayerPalette + p.InternalName; }
public PaletteReference Palette(Player p)
{
return PaletteReference.FromName(Info.Palette ?? Info.PlayerPalette + p.InternalName);
}
public virtual IEnumerable<Renderable> Render(Actor self)
{

10
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -154,12 +154,12 @@ namespace OpenRA.Traits
{
public readonly Sprite Sprite;
public readonly float2 Pos;
public readonly string Palette;
public readonly PaletteReference Palette;
public readonly int Z;
public readonly int ZOffset;
public float Scale;
public Renderable(Sprite sprite, float2 pos, string palette, int z, int zOffset, float scale)
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z, int zOffset, float scale)
{
Sprite = sprite;
Pos = pos;
@@ -169,14 +169,14 @@ namespace OpenRA.Traits
Scale = scale; /* default */
}
public Renderable(Sprite sprite, float2 pos, string palette, int z)
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z)
: this(sprite, pos, palette, z, 0, 1f) { }
public Renderable(Sprite sprite, float2 pos, string palette, int z, float scale)
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z, float scale)
: this(sprite, pos, palette, z, 0, scale) { }
public Renderable WithScale(float newScale) { return new Renderable(Sprite, Pos, Palette, Z, ZOffset, newScale); }
public Renderable WithPalette(string newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); }
public Renderable WithPalette(PaletteReference newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); }
public Renderable WithZOffset(int newOffset) { return new Renderable(Sprite, Pos, Palette, Z, newOffset, Scale); }
public Renderable WithPos(float2 newPos) { return new Renderable(Sprite, newPos, Palette, Z, ZOffset, Scale); }
}

2
OpenRA.Mods.Cnc/Effects/IonCannon.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Cnc.Effects
{
yield return new Renderable(anim.Image,
target.CenterLocation.ToFloat2() - new float2(.5f * anim.Image.size.X, anim.Image.size.Y - Game.CellSize),
"effect", (int)target.CenterLocation.Y);
PaletteReference.FromName("effect"), (int)target.CenterLocation.Y);
}
void Finish( World world )

2
OpenRA.Mods.RA/Bridge.cs
View File

@@ -138,7 +138,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Renderable> RenderAsTerrain(Actor self)
{
foreach (var t in TileSprites[currentTemplate])
yield return new Renderable(t.Value, t.Key.ToPPos().ToFloat2(), "terrain", Game.CellSize * t.Key.Y);
yield return new Renderable(t.Value, t.Key.ToPPos().ToFloat2(), PaletteReference.FromName("terrain"), Game.CellSize * t.Key.Y);
}
bool IsIntact(Bridge b)

3
OpenRA.Mods.RA/Cloak.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
@@ -73,7 +74,7 @@ namespace OpenRA.Mods.RA
return rs;
if (Cloaked && IsVisible(self))
return rs.Select(a => a.WithPalette(info.Palette));
return rs.Select(a => a.WithPalette(PaletteReference.FromName(info.Palette)));
else
return Nothing;
}

6
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -158,15 +158,15 @@ namespace OpenRA.Mods.RA.Effects
if (Info.High || Info.Angle > 0)
{
if (Info.Shadow)
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "shadow", (int)pos.Y);
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, PaletteReference.FromName("shadow"), (int)pos.Y);
var highPos = pos - new float2(0, GetAltitude());
yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, "effect", (int)pos.Y);
yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, PaletteReference.FromName("effect"), (int)pos.Y);
}
else
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size,
Args.weapon.Underwater ? "shadow" : "effect", (int)pos.Y);
PaletteReference.FromName(Args.weapon.Underwater ? "shadow" : "effect"), (int)pos.Y);
}
}

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

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA.Effects
{
readonly Animation anim;
readonly float2 pos;
readonly string palette;
readonly PaletteReference palette;
public Corpse(Actor fromActor, string sequence)
{

3
OpenRA.Mods.RA/Effects/CrateEffect.cs
View File

@@ -43,7 +43,8 @@ namespace OpenRA.Mods.RA.Effects
{
if (a.IsInWorld)
yield return new Renderable(anim.Image,
a.CenterLocation.ToFloat2() - .5f * anim.Image.size + offset, "effect", (int)a.CenterLocation.Y);
a.CenterLocation.ToFloat2() - .5f * anim.Image.size + offset,
PaletteReference.FromName("effect"), (int)a.CenterLocation.Y);
}
}
}

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

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Effects
{
yield return new Renderable(anim.Image,
pos.ToFloat2() - .5f * anim.Image.size - new int2(0,altitude),
"effect", (int)pos.Y - altitude);
PaletteReference.FromName("effect"), (int)pos.Y - altitude);
}
public Player Owner { get { return null; } }

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

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
yield return new Renderable(anim.Image,offset, "effect", (int)offset.Y);
yield return new Renderable(anim.Image,offset, PaletteReference.FromName("effect"), (int)offset.Y);
}
}
}

4
OpenRA.Mods.RA/Effects/GravityBomb.cs
View File

@@ -53,8 +53,8 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
yield return new Renderable(anim.Image,
Args.dest.ToInt2() - new int2(0, altitude) - .5f * anim.Image.size, "effect", Args.dest.Y);
var pos = Args.dest.ToInt2() - new int2(0, altitude) - .5f * anim.Image.size;
yield return new Renderable(anim.Image, pos, PaletteReference.FromName("effect"), Args.dest.Y);
}
}
}

3
OpenRA.Mods.RA/Effects/InvulnEffect.cs
View File

@@ -10,6 +10,7 @@
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Effects
@@ -37,7 +38,7 @@ namespace OpenRA.Mods.RA.Effects
yield break;
foreach (var r in a.Render())
yield return r.WithPalette("invuln");
yield return r.WithPalette(PaletteReference.FromName("invuln"));
}
}
}

4
OpenRA.Mods.RA/Effects/LaserZap.cs
View File

@@ -77,8 +77,8 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
if (explosion != null)
yield return new Renderable(explosion.Image,
args.dest.ToFloat2() - .5f * explosion.Image.size, "effect", (int)args.dest.Y);
yield return new Renderable(explosion.Image, args.dest.ToFloat2() - .5f * explosion.Image.size,
PaletteReference.FromName("effect"), (int)args.dest.Y);
if (ticks >= info.BeamDuration)
yield break;

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

@@ -156,7 +156,7 @@ namespace OpenRA.Mods.RA.Effects
{
if (Args.firedBy.World.RenderedShroud.IsVisible(PxPosition.ToCPos()))
yield return new Renderable(anim.Image, PxPosition.ToFloat2() - 0.5f * anim.Image.size - new float2(0, Altitude),
Args.weapon.Underwater ? "shadow" : "effect", PxPosition.Y);
PaletteReference.FromName(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y);
if (Trail != null)
Trail.Render(Args.firedBy);

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

@@ -80,7 +80,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
yield return new Renderable(anim.Image, pos.ToFloat2() - 0.5f * anim.Image.size - new float2(0, altitude),
"effect", (int)pos.Y);
PaletteReference.FromName("effect"), (int)pos.Y);
}
}
}

4
OpenRA.Mods.RA/Effects/Parachute.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA.Effects
public class Parachute : IEffect
{
readonly Animation anim;
readonly string palette;
readonly PaletteReference palette;
readonly Animation paraAnim;
readonly PPos location;
@@ -76,7 +76,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
var pos = location.ToFloat2() - new float2(0, altitude);
yield return new Renderable(anim.Image, location.ToFloat2() - .5f * anim.Image.size, "shadow", 0);
yield return new Renderable(anim.Image, location.ToFloat2() - .5f * anim.Image.size, PaletteReference.FromName("shadow"), 0);
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, palette, 2);
yield return new Renderable(paraAnim.Image, pos - .5f * paraAnim.Image.size + offset, palette, 3);
}

4
OpenRA.Mods.RA/Effects/PowerdownIndicator.cs
View File

@@ -37,8 +37,8 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
if (!a.Destroyed && (a.World.LocalPlayer == null || a.Owner.Stances[a.Owner.World.LocalPlayer] == Stance.Ally))
yield return new Renderable(anim.Image,
a.CenterLocation.ToFloat2() - .5f * anim.Image.size, "chrome", (int)a.CenterLocation.Y);
yield return new Renderable(anim.Image, a.CenterLocation.ToFloat2() - .5f * anim.Image.size,
PaletteReference.FromName("chrome"), (int)a.CenterLocation.Y);
}
}
}

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

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
yield return new Renderable(doors.Image, pos, "effect", (int)doorOffset.Y);
yield return new Renderable(doors.Image, pos, PaletteReference.FromName("effect"), (int)doorOffset.Y);
}
}
}

3
OpenRA.Mods.RA/Effects/Smoke.cs
View File

@@ -35,7 +35,8 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
yield return new Renderable(anim.Image, pos.ToFloat2() - .5f * anim.Image.size, "effect", (int)pos.Y);
yield return new Renderable(anim.Image, pos.ToFloat2() - .5f * anim.Image.size,
PaletteReference.FromName("effect"), (int)pos.Y);
}
}
}

3
OpenRA.Mods.RA/Effects/TeslaZap.cs
View File

@@ -104,7 +104,8 @@ namespace OpenRA.Mods.RA.Effects
var step = steps.Where(t => (to - (z + new float2(t[0],t[1]))).LengthSquared < (to - z).LengthSquared )
.OrderBy(t => Math.Abs(float2.Dot(z + new float2(t[0], t[1]), q) + c)).First();
rs.Add(new Renderable(s.GetSprite(step[4]), z + new float2(step[2], step[3]), "effect", (int)from.Y));
rs.Add(new Renderable(s.GetSprite(step[4]), z + new float2(step[2], step[3]),
PaletteReference.FromName("effect"), (int)from.Y));
z += new float2(step[0], step[1]);
if( rs.Count >= 1000 )
break;

4
OpenRA.Mods.RA/GainsExperience.cs
View File

@@ -112,8 +112,8 @@ namespace OpenRA.Mods.RA
RankAnim.Tick(); // HACK
var bounds = self.Bounds.Value;
yield return new Renderable(RankAnim.Image,
new float2(bounds.Right - 6, bounds.Bottom - 8), "effect", self.CenterLocation.Y);
yield return new Renderable(RankAnim.Image, new float2(bounds.Right - 6, bounds.Bottom - 8),
PaletteReference.FromName("effect"), self.CenterLocation.Y);
}
}

2
OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -91,7 +91,7 @@ namespace OpenRA.Mods.RA.Orders
{
foreach (var r in Preview)
r.Sprite.DrawAt(topLeft.ToPPos().ToFloat2() + r.Pos,
wr.GetPaletteIndex(r.Palette),
r.Palette.RowIndex(wr),
r.Scale*r.Sprite.size);
var res = world.WorldActor.Trait<ResourceLayer>();

2
OpenRA.Mods.RA/Render/RenderBuilding.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA.Render
var ret = a.WithPos(a.Pos - Info.Origin);
yield return ret;
if (disabled)
yield return ret.WithPalette("disabled").WithZOffset(1);
yield return ret.WithPalette(PaletteReference.FromName("disabled")).WithZOffset(1);
}
}

3
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -34,7 +34,8 @@ namespace OpenRA.Mods.RA.Render
var anim = new Animation(RenderSimple.GetImage(building), () => 0);
anim.PlayRepeating("idle-top");
var rb = building.Traits.Get<RenderBuildingInfo>();
yield return new Renderable(anim.Image, rb.Origin + 0.5f*anim.Image.size*(1 - Scale), p.First().Palette, 0, Scale);
yield return new Renderable(anim.Image, rb.Origin + 0.5f*anim.Image.size*(1 - Scale),
p.First().Palette, 0, Scale);
}
}

2
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs
View File

@@ -61,7 +61,7 @@ namespace OpenRA.Mods.RA.Render
{
foreach (var a in muzzleFlashes.Values)
if (a.DisableFunc == null || !a.DisableFunc())
yield return a.Image(self, "effect");
yield return a.Image(self, PaletteReference.FromName("effect"));
}
public void Tick(Actor self)

3
OpenRA.Mods.RA/Render/WithShadow.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Move;
@@ -29,7 +30,7 @@ namespace OpenRA.Mods.RA.Render
var visualOffset = ((move is Helicopter || move is Mobile) && move.Altitude > 0)
? Math.Abs((self.ActorID + Game.LocalTick) / 5 % 4 - 1) - 1 : 0;
var shadowSprites = r.Select(a => a.WithPalette("shadow"));
var shadowSprites = r.Select(a => a.WithPalette(PaletteReference.FromName("shadow")));
var flyingSprites = (move.Altitude <= 0) ? r
: r.Select(a => a.WithPos(a.Pos - new float2(0, move.Altitude + visualOffset)).WithZOffset(move.Altitude + a.ZOffset));

2
OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
View File

@@ -245,7 +245,7 @@ namespace OpenRA.Mods.RA
var targetCell = unit.Location + (xy - sourceLocation);
foreach (var r in unit.Render())
r.Sprite.DrawAt(r.Pos - Traits.Util.CenterOfCell(unit.Location).ToFloat2() + Traits.Util.CenterOfCell(targetCell).ToFloat2(),
wr.GetPaletteIndex(r.Palette),
r.Palette.RowIndex(wr),
r.Scale*r.Sprite.size);
}
}