From 956ea5197bd1fc220f7fd401e7e3a1cb4c42d1c0 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 4 Feb 2017 17:05:00 +0000 Subject: [PATCH 1/2] Fix BGRA channel count. --- OpenRA.Game/Graphics/SheetBuilder.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Game/Graphics/SheetBuilder.cs b/OpenRA.Game/Graphics/SheetBuilder.cs index c935e9bab9..6c076068dc 100644 --- a/OpenRA.Game/Graphics/SheetBuilder.cs +++ b/OpenRA.Game/Graphics/SheetBuilder.cs @@ -22,10 +22,12 @@ namespace OpenRA.Graphics : base(message) { } } + // The enum values indicate the number of channels used by the type + // They are not arbitrary IDs! public enum SheetType { Indexed = 1, - BGRA = 2, + BGRA = 4, } public sealed class SheetBuilder : IDisposable From f6b65c98e40f008281e9d2708493af930e023584 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 7 Feb 2017 10:05:06 +0000 Subject: [PATCH 2/2] Fix PBOG voxel rendering. --- OpenRA.Game/Graphics/WorldRenderer.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs index ed9b1dd7f5..273016e3c8 100644 --- a/OpenRA.Game/Graphics/WorldRenderer.cs +++ b/OpenRA.Game/Graphics/WorldRenderer.cs @@ -185,7 +185,8 @@ namespace OpenRA.Graphics .Concat(aboveShroudSelected) .Concat(aboveShroudEffects) .Concat(aboveShroudOrderGenerator) - .Select(r => r.PrepareRender(this)); + .Select(r => r.PrepareRender(this)) + .ToList(); Game.Renderer.WorldVoxelRenderer.EndFrame(); // HACK: Keep old grouping behaviour