ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix more matrix sense snafus

This commit is contained in:
zeromus 2020-04-28 17:19:40 -04:00
parent cb5c21f8d3
commit cb5c49d11b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/DisplayManager/Filters/Gui.cs
View File

@ -388,7 +388,7 @@ namespace BizHawk.Client.EmuHawk.Filters
if (renderTop) if (renderTop)
{ {
GuiRenderer.Modelview.Push(); GuiRenderer.Modelview.Push();
GuiRenderer.Modelview.PostMultiplyMatrix(matTop); GuiRenderer.Modelview.PreMultiplyMatrix(matTop);
GuiRenderer.DrawSubrect(InputTexture, 0, 0, 256, 192, 0.0f, 0.0f, 1.0f, 0.5f); GuiRenderer.DrawSubrect(InputTexture, 0, 0, 256, 192, 0.0f, 0.0f, 1.0f, 0.5f);
GuiRenderer.Modelview.Pop(); GuiRenderer.Modelview.Pop();
} }
@ -396,7 +396,7 @@ namespace BizHawk.Client.EmuHawk.Filters
if (renderBottom) if (renderBottom)
{ {
GuiRenderer.Modelview.Push(); GuiRenderer.Modelview.Push();
GuiRenderer.Modelview.PostMultiplyMatrix(matBot); GuiRenderer.Modelview.PreMultiplyMatrix(matBot);
GuiRenderer.DrawSubrect(InputTexture, 0, 0, 256, 192, 0.0f, 0.5f, 1.0f, 1.0f); GuiRenderer.DrawSubrect(InputTexture, 0, 0, 256, 192, 0.0f, 0.5f, 1.0f, 1.0f);
GuiRenderer.Modelview.Pop(); GuiRenderer.Modelview.Pop();
} }

4
Bizware/BizHawk.Bizware.BizwareGL/MatrixStack.cs
View File

@ -83,7 +83,7 @@ namespace BizHawk.Bizware.BizwareGL
public void Translate(Point pt) { Translate(pt.X, pt.Y, 0); IsDirty = true; } public void Translate(Point pt) { Translate(pt.X, pt.Y, 0); IsDirty = true; }
public void PostMultiplyMatrix(MatrixStack ms) { PostMultiplyMatrix(ms.Top); IsDirty = true; } public void PostMultiplyMatrix(MatrixStack ms) { PostMultiplyMatrix(ms.Top); IsDirty = true; }
public void PostMultiplyMatrix(Matrix4 value) { Top = value * Top; IsDirty = true; } public void PostMultiplyMatrix(Matrix4 value) { Top = Top * value; IsDirty = true; }
public void PreMultiplyMatrix(Matrix4 value) { Top = Top * value; IsDirty = true; } public void PreMultiplyMatrix(Matrix4 value) { Top = value * Top; IsDirty = true; }
} }
} }