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

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;