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

Remove RenderSprites.Scale.

Browse Source
This commit is contained in:
Paul Chote
2020-12-31 18:03:55 +00:00
committed by teinarss
parent f6b40b2bce
commit 82a9809192
31 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
View File

@@ -193,7 +193,7 @@ namespace OpenRA.Mods.Common.Traits
// Display muzzle flashes
foreach (var m in muzzles)
foreach (var r in m.Render(self, wr, pal, 1f))
foreach (var r in m.Render(self, wr, pal))
yield return r;
}

2
OpenRA.Mods.Common/Traits/Buildings/SequencePlaceBuildingPreview.cs
View File

@@ -87,7 +87,7 @@ namespace OpenRA.Mods.Common.Traits
yield return r;
var centerPosition = wr.World.Map.CenterOfCell(topLeft) + centerOffset;
foreach (var r in preview.Render(centerPosition, WVec.Zero, 0, palette, 1.0f))
foreach (var r in preview.Render(centerPosition, WVec.Zero, 0, palette))
yield return r;
if (info.FootprintOverPreview != PlaceBuildingCellType.None)

13
OpenRA.Mods.Common/Traits/Render/RenderSprites.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{
public interface IRenderActorPreviewSpritesInfo : ITraitInfoInterface
{
IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p);
IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p);
}
[Desc("Render trait fundament that won't work without additional With* render traits.")]
@@ -41,9 +41,6 @@ namespace OpenRA.Mods.Common.Traits.Render
[Desc("Custom PlayerColorPalette: BaseName")]
public readonly string PlayerPalette = "player";
[Desc("Change the sprite image size.")]
public readonly float Scale = 1f;
public override object Create(ActorInitializer init) { return new RenderSprites(init, this); }
public IEnumerable<IActorPreview> RenderPreview(ActorPreviewInitializer init)
@@ -68,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits.Render
}
foreach (var spi in init.Actor.TraitInfos<IRenderActorPreviewSpritesInfo>())
foreach (var preview in spi.RenderPreviewSprites(init, this, image, facings, palette))
foreach (var preview in spi.RenderPreviewSprites(init, image, facings, palette))
yield return preview;
}
@@ -198,7 +195,7 @@ namespace OpenRA.Mods.Common.Traits.Render
a.CachePalette(wr, owner);
}
foreach (var r in a.Animation.Render(self, wr, a.PaletteReference, Info.Scale))
foreach (var r in a.Animation.Render(self, wr, a.PaletteReference))
yield return r;
}
}
@@ -207,7 +204,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{
foreach (var a in anims)
if (a.IsVisible)
yield return a.Animation.ScreenBounds(self, wr, Info.Scale);
yield return a.Animation.ScreenBounds(self, wr);
}
void ITick.Tick(Actor self)
@@ -280,7 +277,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{
return anims.Where(b => b.IsVisible
&& b.Animation.Animation.CurrentSequence != null)
.Select(a => (a.Animation.Animation.Image.Size.XY * a.Animation.Animation.CurrentSequence.Scale * Info.Scale).ToInt2())
.Select(a => (a.Animation.Animation.Image.Size.XY * a.Animation.Animation.CurrentSequence.Scale).ToInt2())
.FirstOrDefault();
}

4
OpenRA.Mods.Common/Traits/Render/WithBridgeSpriteBody.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithBridgeSpriteBody(init, this); }
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequences.First()), () => 0);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
}

4
OpenRA.Mods.Common/Traits/Render/WithChargeSpriteBody.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{
public override object Create(ActorInitializer init) { return new WithChargeSpriteBody(init, this); }
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
}

4
OpenRA.Mods.Common/Traits/Render/WithCrateBody.cs
View File

@@ -38,11 +38,11 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithCrateBody(init.Self, this); }
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
var anim = new Animation(init.World, image);
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), IdleSequence));
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
}

4
OpenRA.Mods.Common/Traits/Render/WithDeadBridgeSpriteBody.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithDeadBridgeSpriteBody(init, this); }
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var sequence = init.World.Type == WorldType.Editor ? EditorSequence : Sequence;
var palette = init.World.Type == WorldType.Editor ? init.WorldRenderer.Palette(EditorPalette) : p;
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), sequence), () => 0);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, palette, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, palette);
}
}

4
OpenRA.Mods.Common/Traits/Render/WithFacingSpriteBody.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{
public override object Create(ActorInitializer init) { return new WithFacingSpriteBody(init, this); }
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var anim = new Animation(init.World, image, init.GetFacing());
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
}

4
OpenRA.Mods.Common/Traits/Render/WithGateSpriteBody.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithGateSpriteBody(init, this); }
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
string IWallConnectorInfo.GetWallConnectionType()

4
OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithIdleOverlay(init.Self, this); }
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -76,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits.Render
return tmpOffset.Y + tmpOffset.Z + 1;
};
yield return new SpriteActorPreview(anim, offset, zOffset, p, rs.Scale);
yield return new SpriteActorPreview(anim, offset, zOffset, p);
}
}

4
OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithInfantryBody(init, this); }
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Traits.Render
else if (Palette != null)
p = init.WorldRenderer.Palette(Palette);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
}

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

@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (anim.DisableFunc != null && anim.DisableFunc())
continue;
foreach (var r in anim.Render(self, wr, palette, 1f))
foreach (var r in anim.Render(self, wr, palette))
yield return r;
}
}

6
OpenRA.Mods.Common/Traits/Render/WithParachute.cs
View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithParachute(init.Self, this); }
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -99,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits.Render
return tmpOffset.Y + tmpOffset.Z + 1;
};
yield return new SpriteActorPreview(anim, offset, zOffset, p, rs.Scale);
yield return new SpriteActorPreview(anim, offset, zOffset, p);
}
}
@@ -193,7 +193,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var dat = self.World.Map.DistanceAboveTerrain(self.CenterPosition);
var pos = self.CenterPosition - new WVec(0, 0, dat.Length);
return new Rectangle[] { shadow.ScreenBounds(wr, pos, info.ShadowOffset, 1) };
return new Rectangle[] { shadow.ScreenBounds(wr, pos, info.ShadowOffset) };
}
}
}

4
OpenRA.Mods.Common/Traits/Render/WithProductionDoorOverlay.cs
View File

@@ -22,14 +22,14 @@ namespace OpenRA.Mods.Common.Traits.Render
[SequenceReference]
public readonly string Sequence = "build-door";
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);
var bi = init.Actor.TraitInfo<BuildingInfo>();
var offset = bi.CenterOffset(init.World).Y + 512; // Additional 512 units move from center -> top of cell
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => offset, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => offset, p);
}
public override object Create(ActorInitializer init) { return new WithProductionDoorOverlay(init.Self, this); }

4
OpenRA.Mods.Common/Traits/Render/WithResourceLevelSpriteBody.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithResourceLevelSpriteBody(init, this); }
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
}

4
OpenRA.Mods.Common/Traits/Render/WithSpriteBarrel.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithSpriteBarrel(init.Self, this); }
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.Common.Traits.Render
return -(tmpOffset.Y + tmpOffset.Z) + 1;
};
yield return new SpriteActorPreview(anim, turretOffset, zOffset, p, rs.Scale);
yield return new SpriteActorPreview(anim, turretOffset, zOffset, p);
}
}

6
OpenRA.Mods.Common/Traits/Render/WithSpriteBody.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithSpriteBody(init, this); }
public virtual IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public virtual IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var anim = new Animation(init.World, image);
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
}
@@ -133,7 +133,7 @@ namespace OpenRA.Mods.Common.Traits.Render
Rectangle IAutoMouseBounds.AutoMouseoverBounds(Actor self, WorldRenderer wr)
{
return boundsAnimation.ScreenBounds(wr, self.CenterPosition, WVec.Zero, rs.Info.Scale);
return boundsAnimation.ScreenBounds(wr, self.CenterPosition, WVec.Zero);
}
}
}

4
OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithSpriteTurret(init.Self, this); }
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits.Render
else if (Palette != null)
p = init.WorldRenderer.Palette(Palette);
yield return new SpriteActorPreview(anim, offset, zOffset, p, rs.Scale);
yield return new SpriteActorPreview(anim, offset, zOffset, p);
}
}

4
OpenRA.Mods.Common/Traits/Render/WithWallSpriteBody.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithWallSpriteBody(init, this); }
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, string image, int facings, PaletteReference p)
{
if (!EnabledByDefault)
yield break;
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => adjacent);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p);
}
string IWallConnectorInfo.GetWallConnectionType()