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

Merge pull request #12696 from pchote/fix-preview-rendering

Browse Source 
Fix BGRA channel count.
This commit is contained in:
abcdefg30
2017-02-10 12:13:15 +01:00
committed by GitHub
parent ac9c8b93a2 f6b65c98e4
commit 307f722ef0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Graphics/SheetBuilder.cs
View File

@@ -22,10 +22,12 @@ namespace OpenRA.Graphics
: base(message) { } : base(message) { }
} }
// The enum values indicate the number of channels used by the type
// They are not arbitrary IDs!
public enum SheetType public enum SheetType
{ {
Indexed = 1, Indexed = 1,
BGRA = 2, BGRA = 4,
} }
public sealed class SheetBuilder : IDisposable public sealed class SheetBuilder : IDisposable

3
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -185,7 +185,8 @@ namespace OpenRA.Graphics
.Concat(aboveShroudSelected) .Concat(aboveShroudSelected)
.Concat(aboveShroudEffects) .Concat(aboveShroudEffects)
.Concat(aboveShroudOrderGenerator) .Concat(aboveShroudOrderGenerator)
.Select(r => r.PrepareRender(this)); .Select(r => r.PrepareRender(this))
.ToList();
Game.Renderer.WorldVoxelRenderer.EndFrame(); Game.Renderer.WorldVoxelRenderer.EndFrame();
// HACK: Keep old grouping behaviour // HACK: Keep old grouping behaviour