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

Remove unnecessary PPos.FromWPosHackZ() usage.

Browse Source
This commit is contained in:
Paul Chote
2013-03-31 20:00:30 +13:00
parent 2f80cd5f92
commit 34a9675744
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,11 +221,15 @@ namespace OpenRA.Graphics
public int2 ScreenPxPosition(WPos pos)
{
var c = Game.CellSize/1024f;
return new int2((int)(c*pos.X), (int)(c*(pos.Y - pos.Z)));
return new int2(Game.CellSize*pos.X/1024, Game.CellSize*(pos.Y - pos.Z)/1024);
}
public float ScreenZOffset(WPos pos) { return pos.Z*Game.CellSize/1024f; }
public int2 ScreenPxOffset(WVec vec)
{
return new int2(Game.CellSize*vec.X/1024, Game.CellSize*(vec.Y - vec.Z)/1024);
}
public float[] ScreenOffset(WVec vec)
{
var c = Game.CellSize/1024f;

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

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Render
anim.Play("turret");
anims.Add("turret_{0}".F(i++), new AnimationWithOffset(anim,
wr => PPos.FromWPosHackZ(WPos.Zero + t.Position(self)).ToFloat2(), null));
wr => wr.ScreenPxOffset(t.Position(self)), null));
}
}
}

8
OpenRA.Mods.RA/Render/RenderUnitTurreted.cs
View File

@@ -37,11 +37,11 @@ namespace OpenRA.Mods.RA.Render
anim.Play("turret");
anims.Add("turret_{0}".F(i++), new AnimationWithOffset(anim,
wr => TurretPosition(self, turret, facing), null));
wr => TurretPosition(self, wr, turret, facing), null));
}
}
float2 TurretPosition(Actor self, Turreted t, IFacing facing)
float2 TurretPosition(Actor self, WorldRenderer wr, Turreted t, IFacing facing)
{
var recoil = self.TraitsImplementing<Armament>()
.Where(w => w.Info.Turret == t.Name)
@@ -50,9 +50,9 @@ namespace OpenRA.Mods.RA.Render
var localOffset = new WVec(-recoil, WRange.Zero, WRange.Zero);
var bodyOrientation = QuantizeOrientation(self, self.Orientation);
var turretOrientation = QuantizeOrientation(self, t.LocalOrientation(self));
var worldPos = WPos.Zero + t.Position(self) + LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation));
var worldPos = t.Position(self) + LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation));
return PPos.FromWPosHackZ(worldPos).ToFloat2();
return wr.ScreenPxOffset(worldPos);
}
}
}

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

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA.Render
muzzleFlashes.Add("muzzle{0}".F(muzzleFlashes.Count), new AnimationWithOffset(
muzzleFlash,
wr => PPos.FromWPosHackZ(WPos.Zero + a.MuzzleOffset(self, barrel)).ToFloat2(),
wr => wr.ScreenPxOffset(a.MuzzleOffset(self, barrel)),
() => !isShowing));
}
}