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

Adjust GetImage plumbing in preparation for race-specific sequences.

Browse Source
This commit is contained in:
Paul Chote
2014-07-09 18:44:25 +12:00
committed by Paul Chote
parent 4c3a95ebc0
commit 00a2146299
18 changed files with 62 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.TS/Traits/Render/RenderVoxels.cs
View File

@@ -46,8 +46,8 @@ namespace OpenRA.Mods.TS.Traits
var body = init.Actor.Traits.Get<BodyOrientationInfo>();
var sequenceProvider = init.World.Map.SequenceProvider;
var image = Image ?? init.Actor.Name;
var facings = body.QuantizedFacings == -1 ? init.Actor.Traits.Get<IQuantizeBodyOrientationInfo>().QuantizedBodyFacings(sequenceProvider, init.Actor) : body.QuantizedFacings;
var palette = init.WorldRenderer.Palette(Palette ?? (init.Owner != null ? PlayerPalette + init.Owner.InternalName : null));
var facings = body.QuantizedFacings == -1 ? init.Actor.Traits.Get<IQuantizeBodyOrientationInfo>().QuantizedBodyFacings(init.Actor, sequenceProvider, init.Owner.Country.Race) : body.QuantizedFacings;
var palette = init.WorldRenderer.Palette(Palette ?? PlayerPalette + init.Owner.InternalName);
var ifacing = init.Actor.Traits.GetOrDefault<IFacingInfo>();
var facing = ifacing != null ? init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : ifacing.GetInitialFacing() : 0;

2
OpenRA.Mods.TS/Traits/Render/WithVoxelBody.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.TS.Traits
() => false, () => 0);
}
public int QuantizedBodyFacings(SequenceProvider sequenceProvider, ActorInfo ai) { return 0; }
public int QuantizedBodyFacings(ActorInfo ai, SequenceProvider sequenceProvider, string race) { return 0; }
}
public class WithVoxelBody : IAutoSelectionSize

2
OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.TS.Traits
() => false, () => 0);
}
public int QuantizedBodyFacings(SequenceProvider sequenceProvider, ActorInfo ai) { return 0; }
public int QuantizedBodyFacings(ActorInfo ai, SequenceProvider sequenceProvider, string race) { return 0; }
}
public class WithVoxelUnloadBody : IAutoSelectionSize

2
OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.TS.Traits
public readonly int TickRate = 5;
public object Create(ActorInitializer init) { return new WithVoxelWalkerBody(init.Self, this); }
public int QuantizedBodyFacings(SequenceProvider sequenceProvider, ActorInfo ai) { return 0; }
public int QuantizedBodyFacings(ActorInfo ai, SequenceProvider sequenceProvider, string race) { return 0; }
}
public class WithVoxelWalkerBody : IAutoSelectionSize, ITick