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

Remove now-redundant blend code.

Browse Source
This commit is contained in:
Paul Chote
2015-05-16 18:44:24 +01:00
parent 4eb76046f4
commit 5532ed4fc9
6 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,6 @@ namespace OpenRA
Additive,
Subtractive,
Multiply,
SoftAdditive,
Translucency,
Multiplicative,
DoubleMultiplicative
}
@@ -70,7 +68,7 @@ namespace OpenRA
void EnableDepthBuffer();
void DisableDepthBuffer();
void SetBlendMode(BlendMode mode, float alpha = 1f);
void SetBlendMode(BlendMode mode);
void GrabWindowMouseFocus();
void ReleaseWindowMouseFocus();

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

@@ -17,7 +17,6 @@ namespace OpenRA.Graphics
public readonly Rectangle Bounds;
public readonly Sheet Sheet;
public readonly BlendMode BlendMode;
public readonly float Alpha;
public readonly TextureChannel Channel;
public readonly float2 Size;
public readonly float2 Offset;
@@ -27,7 +26,7 @@ namespace OpenRA.Graphics
public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
: this(sheet, bounds, float2.Zero, channel) { }
public Sprite(Sheet sheet, Rectangle bounds, float2 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha, float alpha = 1f)
public Sprite(Sheet sheet, Rectangle bounds, float2 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha)
{
Sheet = sheet;
Bounds = bounds;
@@ -35,7 +34,6 @@ namespace OpenRA.Graphics
Channel = channel;
Size = new float2(bounds.Size);
BlendMode = blendMode;
Alpha = alpha;
FractionalOffset = offset / Size;

8
OpenRA.Game/Graphics/SpriteRenderer.cs
View File

@@ -21,7 +21,6 @@ namespace OpenRA.Graphics
readonly Vertex[] vertices;
Sheet currentSheet;
BlendMode currentBlend = BlendMode.Alpha;
float currentAlpha = 1f;
int nv = 0;
public SpriteRenderer(Renderer renderer, IShader shader)
@@ -37,14 +36,14 @@ namespace OpenRA.Graphics
{
shader.SetTexture("DiffuseTexture", currentSheet.GetTexture());
renderer.Device.SetBlendMode(currentBlend, currentAlpha);
renderer.Device.SetBlendMode(currentBlend);
shader.Render(() =>
{
var vb = renderer.GetTempVertexBuffer();
vb.SetData(vertices, nv);
renderer.DrawBatch(vb, 0, nv, PrimitiveType.QuadList);
});
renderer.Device.SetBlendMode(BlendMode.None, currentAlpha);
renderer.Device.SetBlendMode(BlendMode.None);
nv = 0;
currentSheet = null;
@@ -55,10 +54,9 @@ namespace OpenRA.Graphics
{
renderer.CurrentBatchRenderer = this;
if (s.Alpha != currentAlpha || s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 4 > renderer.TempBufferSize)
if (s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 4 > renderer.TempBufferSize)
Flush();
currentAlpha = s.Alpha;
currentBlend = s.BlendMode;
currentSheet = s.Sheet;
}