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

Rename WorldRenderer.Position -> ProjectedPosition.

Browse Source
This commit is contained in:
Paul Chote
2015-07-04 19:20:15 +01:00
parent e10cb5cd9c
commit 86bf9086d9
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits
var bounds = self.Bounds;
bounds.Offset(pos.X, pos.Y);
var spaceBuffer = (int)(10 / wr.Viewport.Zoom);
var effectPos = wr.Position(new int2(pos.X, bounds.Y - spaceBuffer));
var effectPos = wr.ProjectedPosition(new int2(pos.X, bounds.Y - spaceBuffer));
yield return new TextRenderable(font, effectPos, 0, color, name);
}

2
OpenRA.Mods.Common/Traits/Render/WithDecoration.cs
View File

@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.Traits
pxPos += info.Offset;
// HACK: Because WorldRenderer.Position() does not care about terrain height at the location
var renderPos = wr.Position(pxPos);
var renderPos = wr.ProjectedPosition(pxPos);
renderPos = new WPos(renderPos.X, renderPos.Y + self.CenterPosition.Z, self.CenterPosition.Z);
anim.Tick();

4
OpenRA.Mods.Common/Widgets/RadarWidget.cs
View File

@@ -237,8 +237,8 @@ namespace OpenRA.Mods.Common.Widgets
// Draw viewport rect
if (hasRadar)
{
var tl = CellToMinimapPixel(world.Map.CellContaining(worldRenderer.Position(worldRenderer.Viewport.TopLeft)));
var br = CellToMinimapPixel(world.Map.CellContaining(worldRenderer.Position(worldRenderer.Viewport.BottomRight)));
var tl = CellToMinimapPixel(world.Map.CellContaining(worldRenderer.ProjectedPosition(worldRenderer.Viewport.TopLeft)));
var br = CellToMinimapPixel(world.Map.CellContaining(worldRenderer.ProjectedPosition(worldRenderer.Viewport.BottomRight)));
Game.Renderer.EnableScissor(mapRect);
DrawRadarPings();