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

Convert building rendering to world coordinates.

Browse Source
This commit is contained in:
Paul Chote
2013-05-14 22:21:54 +12:00
parent d7e6125dd7
commit 462478afdf
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,14 +44,8 @@ namespace OpenRA.Graphics
Scale = scale;
}
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z, int zOffset, float scale)
: this(sprite, new PPos((int)pos.X, (int)pos.Y).ToWPos(0), z + zOffset, palette, scale) { }
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z)
: this(sprite, pos, palette, z, 0, 1f) { }
public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z, float scale)
: this(sprite, pos, palette, z, 0, scale) { }
: this(sprite, new PPos((int)pos.X, (int)pos.Y).ToWPos(0), z, palette, 1f) { }
public Renderable WithScale(float newScale) { return new Renderable(Sprite, Pos, ZOffset, Palette, newScale); }
public Renderable WithPalette(PaletteReference newPalette) { return new Renderable(Sprite, Pos, ZOffset, newPalette, Scale); }

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

@@ -39,7 +39,7 @@ namespace OpenRA.Traits
var anim = new Animation(RenderSimple.GetImage(ai), () => 0);
anim.PlayRepeating("idle");
yield return new Renderable(anim.Image, 0.5f*anim.Image.size, pr, 0, Scale);
yield return new Renderable(anim.Image, WPos.Zero, 0, pr, 1f);
}
}

9
OpenRA.Mods.RA/Buildings/FootprintUtils.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.FileFormats;
namespace OpenRA.Mods.RA.Buildings
{
@@ -55,10 +56,16 @@ namespace OpenRA.Mods.RA.Buildings
yield return new CVec(x, y);
}
public static CVec AdjustForBuildingSize( BuildingInfo buildingInfo )
public static CVec AdjustForBuildingSize(BuildingInfo buildingInfo)
{
var dim = buildingInfo.Dimensions;
return new CVec(dim.X / 2, dim.Y > 1 ? (dim.Y + 1) / 2 : 0);
}
public static WVec CenterOffset(BuildingInfo buildingInfo)
{
var dim = buildingInfo.Dimensions;
return new CVec(dim.X, dim.Y).ToWVec() / 2;
}
}
}

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

@@ -98,8 +98,9 @@ namespace OpenRA.Mods.RA.Orders
initialized = true;
}
var offset = (topLeft - CPos.Zero).ToWVec() + FootprintUtils.CenterOffset(BuildingInfo);
foreach (var r in preview)
r.WithPxOffset(topLeft.ToPPos().ToFloat2()).Render(wr);
r.WithPos(r.Pos + offset).Render(wr);
var res = world.WorldActor.Trait<ResourceLayer>();
var isCloseEnough = BuildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, Building, topLeft);

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

@@ -11,6 +11,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Effects;
@@ -22,13 +23,14 @@ namespace OpenRA.Mods.RA.Render
public class RenderBuildingInfo : RenderSimpleInfo, Requires<BuildingInfo>, IPlaceBuildingDecoration
{
public readonly bool HasMakeAnimation = true;
public readonly float2 Origin = float2.Zero;
[Desc("Artwork offset in world (not local) coordinates")]
public readonly WVec Origin = WVec.Zero;
public override object Create(ActorInitializer init) { return new RenderBuilding(init, this);}
public override IEnumerable<Renderable> RenderPreview(ActorInfo building, PaletteReference pr)
{
var origin = building.Traits.Get<RenderBuildingInfo>().Origin;
return base.RenderPreview(building, pr).Select(a => a.WithPxOffset(origin));
return base.RenderPreview(building, pr).Select(a => a.WithPos(a.Pos + Origin));
}
public void Render(WorldRenderer wr, World w, ActorInfo ai, PPos centerLocation)
@@ -68,7 +70,7 @@ namespace OpenRA.Mods.RA.Render
var disabled = self.IsDisabled();
foreach (var a in r)
{
var ret = a.WithPxOffset(-Info.Origin);
var ret = a.WithPos(a.Pos + Info.Origin);
yield return ret;
if (disabled)
yield return ret.WithPalette(wr.Palette("disabled")).WithZOffset(1);

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

@@ -33,8 +33,7 @@ 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, 0.5f*anim.Image.size + rb.Origin, pr, 0, Scale);
yield return new Renderable(anim.Image, WPos.Zero + Origin, 0, pr, 1f);
}
}