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

Change renderables to class to avoid boxing

Browse Source
This commit is contained in:
teinarss
2021-01-28 18:46:49 +01:00
committed by abcdefg30
parent 0d8ef1a1dd
commit 58313520f0
20 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Graphics/SpriteRenderable.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Primitives;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
public struct SpriteRenderable : IPalettedRenderable, IModifyableRenderable, IFinalizedRenderable public class SpriteRenderable : IPalettedRenderable, IModifyableRenderable, IFinalizedRenderable
{ {
public static readonly IEnumerable<IRenderable> None = new IRenderable[0]; public static readonly IEnumerable<IRenderable> None = new IRenderable[0];

2
OpenRA.Game/Graphics/TargetLineRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Primitives;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
public struct TargetLineRenderable : IRenderable, IFinalizedRenderable public class TargetLineRenderable : IRenderable, IFinalizedRenderable
{ {
readonly IEnumerable<WPos> waypoints; readonly IEnumerable<WPos> waypoints;
readonly Color color; readonly Color color;

2
OpenRA.Game/Graphics/UISpriteRenderable.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Primitives;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
public struct UISpriteRenderable : IRenderable, IPalettedRenderable, IFinalizedRenderable public class UISpriteRenderable : IRenderable, IPalettedRenderable, IFinalizedRenderable
{ {
readonly Sprite sprite; readonly Sprite sprite;
readonly WPos effectiveWorldPos; readonly WPos effectiveWorldPos;

2
OpenRA.Mods.Cnc/Graphics/TeslaZapRenderable.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Cnc.Graphics namespace OpenRA.Mods.Cnc.Graphics
{ {
struct TeslaZapRenderable : IPalettedRenderable, IFinalizedRenderable class TeslaZapRenderable : IPalettedRenderable, IFinalizedRenderable
{ {
static int[][] steps = new[] static int[][] steps = new[]
{ {

2
OpenRA.Mods.Common/Graphics/BeamRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public enum BeamRenderableShape { Cylindrical, Flat } public enum BeamRenderableShape { Cylindrical, Flat }
public struct BeamRenderable : IRenderable, IFinalizedRenderable public class BeamRenderable : IRenderable, IFinalizedRenderable
{ {
readonly WPos pos; readonly WPos pos;
readonly int zOffset; readonly int zOffset;

2
OpenRA.Mods.Common/Graphics/CircleAnnotationRenderable.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct CircleAnnotationRenderable : IRenderable, IFinalizedRenderable public class CircleAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
const int CircleSegments = 32; const int CircleSegments = 32;
static readonly WVec[] FacingOffsets = Exts.MakeArray(CircleSegments, i => new WVec(1024, 0, 0).Rotate(WRot.FromFacing(i * 256 / CircleSegments))); static readonly WVec[] FacingOffsets = Exts.MakeArray(CircleSegments, i => new WVec(1024, 0, 0).Rotate(WRot.FromFacing(i * 256 / CircleSegments)));

2
OpenRA.Mods.Common/Graphics/ContrailRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct ContrailRenderable : IRenderable, IFinalizedRenderable public class ContrailRenderable : IRenderable, IFinalizedRenderable
{ {
public int Length { get { return trail.Length; } } public int Length { get { return trail.Length; } }

2
OpenRA.Mods.Common/Graphics/DetectionCircleAnnotationRenderable.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct DetectionCircleAnnotationRenderable : IRenderable, IFinalizedRenderable public class DetectionCircleAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
readonly WPos centerPosition; readonly WPos centerPosition;
readonly WDist radius; readonly WDist radius;

3
OpenRA.Mods.Common/Graphics/IsometricSelectionBarsAnnotationRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct IsometricSelectionBarsAnnotationRenderable : IRenderable, IFinalizedRenderable public class IsometricSelectionBarsAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
const int BarWidth = 3; const int BarWidth = 3;
const int BarHeight = 4; const int BarHeight = 4;
@@ -40,7 +40,6 @@ namespace OpenRA.Mods.Common.Graphics
} }
public IsometricSelectionBarsAnnotationRenderable(WPos pos, Actor actor, Polygon bounds) public IsometricSelectionBarsAnnotationRenderable(WPos pos, Actor actor, Polygon bounds)
: this()
{ {
this.pos = pos; this.pos = pos;
this.actor = actor; this.actor = actor;

2
OpenRA.Mods.Common/Graphics/IsometricSelectionBoxAnnotationRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct IsometricSelectionBoxAnnotationRenderable : IRenderable, IFinalizedRenderable public class IsometricSelectionBoxAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
static readonly float2 TLOffset = new float2(-12, -6); static readonly float2 TLOffset = new float2(-12, -6);
static readonly float2 TROffset = new float2(12, -6); static readonly float2 TROffset = new float2(12, -6);

2
OpenRA.Mods.Common/Graphics/LineAnnotationRenderable.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct LineAnnotationRenderable : IRenderable, IFinalizedRenderable public class LineAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
readonly WPos start; readonly WPos start;
readonly WPos end; readonly WPos end;

4
OpenRA.Mods.Common/Graphics/ModelRenderable.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct ModelRenderable : IPalettedRenderable, IModifyableRenderable public class ModelRenderable : IPalettedRenderable, IModifyableRenderable
{ {
readonly IEnumerable<ModelAnimation> models; readonly IEnumerable<ModelAnimation> models;
readonly WPos pos; readonly WPos pos;
@@ -123,7 +123,7 @@ namespace OpenRA.Mods.Common.Graphics
return new FinalizedModelRenderable(wr, this); return new FinalizedModelRenderable(wr, this);
} }
struct FinalizedModelRenderable : IFinalizedRenderable class FinalizedModelRenderable : IFinalizedRenderable
{ {
readonly ModelRenderable model; readonly ModelRenderable model;
readonly ModelRenderProxy renderProxy; readonly ModelRenderProxy renderProxy;

2
OpenRA.Mods.Common/Graphics/PolygonAnnotationRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct PolygonAnnotationRenderable : IRenderable, IFinalizedRenderable public class PolygonAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
readonly WPos[] vertices; readonly WPos[] vertices;
readonly WPos effectivePos; readonly WPos effectivePos;

2
OpenRA.Mods.Common/Graphics/RailgunRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct RailgunHelixRenderable : IRenderable, IFinalizedRenderable public class RailgunHelixRenderable : IRenderable, IFinalizedRenderable
{ {
readonly WPos pos; readonly WPos pos;
readonly int zOffset; readonly int zOffset;

2
OpenRA.Mods.Common/Graphics/RangeCircleAnnotationRenderable.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct RangeCircleAnnotationRenderable : IRenderable, IFinalizedRenderable public class RangeCircleAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
const int RangeCircleSegments = 32; const int RangeCircleSegments = 32;
static readonly Int32Matrix4x4[] RangeCircleStartRotations = Exts.MakeArray(RangeCircleSegments, i => WRot.FromFacing(8 * i).AsMatrix()); static readonly Int32Matrix4x4[] RangeCircleStartRotations = Exts.MakeArray(RangeCircleSegments, i => WRot.FromFacing(8 * i).AsMatrix());

3
OpenRA.Mods.Common/Graphics/SelectionBarsAnnotationRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct SelectionBarsAnnotationRenderable : IRenderable, IFinalizedRenderable public class SelectionBarsAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
readonly WPos pos; readonly WPos pos;
readonly Actor actor; readonly Actor actor;
@@ -31,7 +31,6 @@ namespace OpenRA.Mods.Common.Graphics
} }
public SelectionBarsAnnotationRenderable(WPos pos, Actor actor, Rectangle decorationBounds) public SelectionBarsAnnotationRenderable(WPos pos, Actor actor, Rectangle decorationBounds)
: this()
{ {
this.pos = pos; this.pos = pos;
this.actor = actor; this.actor = actor;

2
OpenRA.Mods.Common/Graphics/SelectionBoxAnnotationRenderable.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct SelectionBoxAnnotationRenderable : IRenderable, IFinalizedRenderable public class SelectionBoxAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
readonly WPos pos; readonly WPos pos;
readonly Rectangle decorationBounds; readonly Rectangle decorationBounds;

2
OpenRA.Mods.Common/Graphics/TextAnnotationRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct TextAnnotationRenderable : IRenderable, IFinalizedRenderable public class TextAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
readonly SpriteFont font; readonly SpriteFont font;
readonly WPos pos; readonly WPos pos;

4
OpenRA.Mods.Common/Graphics/UIModelRenderable.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct UIModelRenderable : IRenderable, IPalettedRenderable public class UIModelRenderable : IRenderable, IPalettedRenderable
{ {
readonly IEnumerable<ModelAnimation> models; readonly IEnumerable<ModelAnimation> models;
readonly WPos effectiveWorldPos; readonly WPos effectiveWorldPos;
@@ -74,7 +74,7 @@ namespace OpenRA.Mods.Common.Graphics
return new FinalizedUIModelRenderable(wr, this); return new FinalizedUIModelRenderable(wr, this);
} }
struct FinalizedUIModelRenderable : IFinalizedRenderable class FinalizedUIModelRenderable : IFinalizedRenderable
{ {
readonly UIModelRenderable model; readonly UIModelRenderable model;
readonly ModelRenderProxy renderProxy; readonly ModelRenderProxy renderProxy;

2
OpenRA.Mods.Common/Graphics/UITextRenderable.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct UITextRenderable : IRenderable, IFinalizedRenderable public class UITextRenderable : IRenderable, IFinalizedRenderable
{ {
readonly SpriteFont font; readonly SpriteFont font;
readonly WPos effectiveWorldPos; readonly WPos effectiveWorldPos;