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

fix hovers trait to use heightmap

Browse Source
This commit is contained in:
teees
2015-12-02 15:13:40 +01:00
parent 46133891bb
commit ce5c8fde5c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Render/Hovers.cs
View File

@@ -23,19 +23,19 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Amount of Z axis changes in world units.")] [Desc("Amount of Z axis changes in world units.")]
public readonly int OffsetModifier = -43; public readonly int OffsetModifier = -43;
public readonly int MinHoveringAltitude = 0;
public override object Create(ActorInitializer init) { return new Hovers(this, init.Self); } public override object Create(ActorInitializer init) { return new Hovers(this, init.Self); }
} }
public class Hovers : UpgradableTrait<HoversInfo>, IRenderModifier public class Hovers : UpgradableTrait<HoversInfo>, IRenderModifier
{ {
readonly HoversInfo info; readonly HoversInfo info;
readonly bool aircraft;
public Hovers(HoversInfo info, Actor self) public Hovers(HoversInfo info, Actor self)
: base(info) : base(info)
{ {
this.info = info; this.info = info;
aircraft = self.Info.HasTraitInfo<AircraftInfo>();
} }
public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r) public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
@@ -43,7 +43,9 @@ namespace OpenRA.Mods.Common.Traits
if (self.World.Paused || IsTraitDisabled) if (self.World.Paused || IsTraitDisabled)
return r; return r;
var visualOffset = !aircraft || self.CenterPosition.Z > 0 ? (int)Math.Abs((self.ActorID + Game.LocalTick) / 5 % 4 - 1) - 1 : 0; var visualOffset = self.World.Map.DistanceAboveTerrain(self.CenterPosition).Length >= info.MinHoveringAltitude
? (int)Math.Abs((self.ActorID + Game.LocalTick) / 5 % 4 - 1) - 1
: 0;
var worldVisualOffset = new WVec(0, 0, info.OffsetModifier * visualOffset); var worldVisualOffset = new WVec(0, 0, info.OffsetModifier * visualOffset);
return r.Select(a => a.OffsetBy(worldVisualOffset)); return r.Select(a => a.OffsetBy(worldVisualOffset));