diff --git a/OpenRA.Game/Graphics/Vertex.cs b/OpenRA.Game/Graphics/Vertex.cs index 0d8df05e3a..206e50051d 100644 --- a/OpenRA.Game/Graphics/Vertex.cs +++ b/OpenRA.Game/Graphics/Vertex.cs @@ -21,9 +21,6 @@ namespace OpenRA.Graphics public Vertex(float3 xyz, float u, float v, float p, float c) : this(xyz.X, xyz.Y, xyz.Z, u, v, p, c) { } - public Vertex(float[] xyz, float u, float v, float p, float c) - : this(xyz[0], xyz[1], xyz[2], u, v, p, c) { } - public Vertex(float x, float y, float z, float u, float v, float p, float c) { X = x; Y = y; Z = z; diff --git a/OpenRA.Game/Graphics/VoxelLoader.cs b/OpenRA.Game/Graphics/VoxelLoader.cs index 7336cecc3c..195ba9fe27 100644 --- a/OpenRA.Game/Graphics/VoxelLoader.cs +++ b/OpenRA.Game/Graphics/VoxelLoader.cs @@ -71,7 +71,7 @@ namespace OpenRA.Graphics sheetBuilder = CreateSheetBuilder(); } - Vertex[] GenerateSlicePlane(int su, int sv, Func first, Func second, Func coord) + Vertex[] GenerateSlicePlane(int su, int sv, Func first, Func second, Func coord) { var colors = new byte[su * sv]; var normals = new byte[su * sv]; @@ -158,21 +158,21 @@ namespace OpenRA.Graphics yield return GenerateSlicePlane(l.Size[1], l.Size[2], (u, v) => get(x, u, v), (u, v) => get(x - 1, u, v), - (u, v) => new float[] { x, u, v }); + (u, v) => new float3(x, u, v)); for (var y = 0; y <= l.Size[1]; y++) if (yPlanes[y]) yield return GenerateSlicePlane(l.Size[0], l.Size[2], (u, v) => get(u, y, v), (u, v) => get(u, y - 1, v), - (u, v) => new float[] { u, y, v }); + (u, v) => new float3(u, y, v)); for (var z = 0; z <= l.Size[2]; z++) if (zPlanes[z]) yield return GenerateSlicePlane(l.Size[0], l.Size[1], (u, v) => get(u, v, z), (u, v) => get(u, v, z - 1), - (u, v) => new float[] { u, v, z }); + (u, v) => new float3(u, v, z)); } public VoxelRenderData GenerateRenderData(VxlLimb l)