From d0e9af8f6b6dff3b27e474849d08233bf4e985a6 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 19 Dec 2015 22:22:26 +0000 Subject: [PATCH] Convert VoxelRenderer to TriangleList. --- OpenRA.Game/Graphics/VoxelLoader.cs | 6 ++++-- OpenRA.Game/Graphics/VoxelRenderer.cs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Graphics/VoxelLoader.cs b/OpenRA.Game/Graphics/VoxelLoader.cs index 64630e54a2..4153134c32 100644 --- a/OpenRA.Game/Graphics/VoxelLoader.cs +++ b/OpenRA.Game/Graphics/VoxelLoader.cs @@ -89,12 +89,14 @@ namespace OpenRA.Graphics var channelP = ChannelSelect[(int)s.Channel]; var channelC = ChannelSelect[(int)s.Channel + 1]; - return new Vertex[4] + return new Vertex[6] { new Vertex(coord(0, 0), s.Left, s.Top, channelP, channelC), new Vertex(coord(su, 0), s.Right, s.Top, channelP, channelC), new Vertex(coord(su, sv), s.Right, s.Bottom, channelP, channelC), - new Vertex(coord(0, sv), s.Left, s.Bottom, channelP, channelC) + new Vertex(coord(su, sv), s.Right, s.Bottom, channelP, channelC), + new Vertex(coord(0, sv), s.Left, s.Bottom, channelP, channelC), + new Vertex(coord(0, 0), s.Left, s.Top, channelP, channelC) }; } diff --git a/OpenRA.Game/Graphics/VoxelRenderer.cs b/OpenRA.Game/Graphics/VoxelRenderer.cs index bd25b01345..a7eb0a3ddf 100644 --- a/OpenRA.Game/Graphics/VoxelRenderer.cs +++ b/OpenRA.Game/Graphics/VoxelRenderer.cs @@ -263,7 +263,7 @@ namespace OpenRA.Graphics shader.SetVec("AmbientLight", ambientLight, 3); shader.SetVec("DiffuseLight", diffuseLight, 3); - shader.Render(() => renderer.DrawBatch(Game.ModData.VoxelLoader.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.QuadList)); + shader.Render(() => renderer.DrawBatch(Game.ModData.VoxelLoader.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList)); } public void BeginFrame()