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

Merge pull request #7979 from Mailaender/d2k-sand-blendmode

Browse Source 
Fixed the Dune 2000 harvester sand out animation
This commit is contained in:
abcdefg30
2015-05-14 19:21:06 +02:00
parent 48a9807273 45ffac350f
commit 70e7b33fd7
9 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs
View File

@@ -246,7 +246,7 @@ namespace OpenRA.Renderer.Sdl2
ErrorHandler.CheckGlError();
}
public void SetBlendMode(BlendMode mode)
public void SetBlendMode(BlendMode mode, float alpha = 1f)
{
GL.BlendEquation(BlendEquationMode.FuncAdd);
ErrorHandler.CheckGlError();
@@ -276,7 +276,7 @@ namespace OpenRA.Renderer.Sdl2
case BlendMode.Multiply:
GL.Enable(EnableCap.Blend);
ErrorHandler.CheckGlError();
GL.BlendFuncSeparate(BlendingFactorSrc.DstColor, BlendingFactorDest.Zero, BlendingFactorSrc.One, BlendingFactorDest.OneMinusSrcAlpha);
GL.BlendFunc(BlendingFactorSrc.DstColor, BlendingFactorDest.OneMinusSrcAlpha);
ErrorHandler.CheckGlError();
break;
case BlendMode.SoftAdditive:
@@ -284,26 +284,11 @@ namespace OpenRA.Renderer.Sdl2
ErrorHandler.CheckGlError();
GL.BlendFunc(BlendingFactorSrc.OneMinusDstColor, BlendingFactorDest.One);
break;
case BlendMode.Translucency25:
case BlendMode.Translucency:
GL.Enable(EnableCap.Blend);
ErrorHandler.CheckGlError();
GL.BlendFunc(BlendingFactorSrc.OneMinusConstantAlpha, BlendingFactorDest.One);
ErrorHandler.CheckGlError();
GL.BlendColor(1f, 1f, 1f, 0.25f);
break;
case BlendMode.Translucency50:
GL.Enable(EnableCap.Blend);
ErrorHandler.CheckGlError();
GL.BlendFunc(BlendingFactorSrc.OneMinusConstantAlpha, BlendingFactorDest.One);
ErrorHandler.CheckGlError();
GL.BlendColor(1f, 1f, 1f, 0.5f);
break;
case BlendMode.Translucency75:
GL.Enable(EnableCap.Blend);
ErrorHandler.CheckGlError();
GL.BlendFunc(BlendingFactorSrc.OneMinusConstantAlpha, BlendingFactorDest.One);
ErrorHandler.CheckGlError();
GL.BlendColor(1f, 1f, 1f, 0.75f);
break;
case BlendMode.Multiplicative:
GL.Enable(EnableCap.Blend);
@@ -317,6 +302,9 @@ namespace OpenRA.Renderer.Sdl2
break;
}
if (alpha != 1f)
GL.BlendColor(1f, 1f, 1f, alpha);
ErrorHandler.CheckGlError();
}