Merge pull request #3785 from tgjones/spritebatch-layerdepth

Fix bug using SpriteBatch layerDepth on OpenGL
MonoGame · Apr 29, 2015 · 9d677e4 · 9d677e4 · mgbot · Apr 29, 2015
2 parents 2cb7992 + 5a53c87
commit 9d677e4
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/Build/Projects/MonoGame.Tests.definition b/Build/Projects/MonoGame.Tests.definition
@@ -504,6 +504,9 @@
  </Content>
  <Content Include="Assets\ReferenceImages\SpriteBatch\Draw_with_SpriteSortMode_Texture_.png">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Assets\ReferenceImages\SpriteBatch\DrawWithLayerDepth.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </Content>
  <Content Include="Assets\ReferenceImages\SpriteFont\Draw_with_SpriteEffects_FlipHorizontally_ FlipVertically_.png">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/MonoGame.Framework/Graphics/SpriteBatch.cs b/MonoGame.Framework/Graphics/SpriteBatch.cs
@@ -125,11 +125,9 @@ void Setup()
  var vp = gd.Viewport;
 
  Matrix projection;
-#if PSM || DIRECTX
  Matrix.CreateOrthographicOffCenter(0, vp.Width, vp.Height, 0, -1, 0, out projection);
-#else
+#if !PSM && !DIRECTX
  // GL requires a half pixel offset to match DX.
- Matrix.CreateOrthographicOffCenter(0, vp.Width, vp.Height, 0, 0, 1, out projection);
  projection.M41 += -0.5f * projection.M11;
  projection.M42 += -0.5f * projection.M22;
 #endif

diff --git a/Test/Assets/ReferenceImages/SpriteBatch/DrawWithLayerDepth.png b/Test/Assets/ReferenceImages/SpriteBatch/DrawWithLayerDepth.png
diff --git a/Test/Framework/Visual/SpriteBatchTest.cs b/Test/Framework/Visual/SpriteBatchTest.cs
@@ -306,5 +306,26 @@ public void DrawWithCustomEffectAndTwoTextures()
  };
  Game.Run();
  }
+
+ [Test]
+ public void DrawWithLayerDepth()
+ {
+ Game.DrawWith += (sender, e) =>
+ {
+ _spriteBatch.Begin();
+ _spriteBatch.Draw(
+ _texture, new Vector2(30, 30), null, Color.Red,
+ 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, -1.0f);
+ _spriteBatch.Draw(
+ _texture, new Vector2(40, 40), null, Color.Green,
+ 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.0f);
+ _spriteBatch.Draw(
+ _texture, new Vector2(50, 50), null, Color.Blue,
+ 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 1.0f);
+ _spriteBatch.End();
+ };
+
+ RunSingleFrameTest();
+ }
  }
 }
diff --git a/Test/MonoGame.Tests.XNA.csproj b/Test/MonoGame.Tests.XNA.csproj
@@ -355,6 +355,9 @@
  <Content Include="Assets\ReferenceImages\Shader\Shader__RainbowH__.png">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </Content>
+ <Content Include="Assets\ReferenceImages\SpriteBatch\DrawWithLayerDepth.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
  <Content Include="Assets\ReferenceImages\SpriteBatch\Draw_normal.png">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </Content>