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

fix a bug in point transformation when using system-suggested (non-1.0 AR). Was probably breaking zapper coords when that feature was used, but unproven. Anyway, someone should test that.

This commit is contained in:
zeromus 2014-10-10 00:21:43 +00:00
parent 9b6add0e40
commit ede78865b2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,8 @@ namespace BizHawk.Client.EmuHawk.Filters
int virtualHeight = virtualSize.Height; int virtualHeight = virtualSize.Height;
//zero 02-jun-2014 - we passed these in, but ignored them. kind of weird.. //zero 02-jun-2014 - we passed these in, but ignored them. kind of weird..
int oldSourceWidth = sourceWidth;
int oldSourceHeight = sourceHeight;
sourceWidth = (int)virtualWidth; sourceWidth = (int)virtualWidth;
sourceHeight = (int)virtualHeight; sourceHeight = (int)virtualHeight;
@ -140,8 +142,14 @@ namespace BizHawk.Client.EmuHawk.Filters
//determine letterboxing parameters //determine letterboxing parameters
vx = (targetWidth - vw) / 2; vx = (targetWidth - vw) / 2;
vy = (targetHeight - vh) / 2; vy = (targetHeight - vh) / 2;
WidthScale = widthScale;
HeightScale = heightScale; //zero 09-oct-2014 - changed this for TransformPoint. scenario: basic 1x (but system-specified AR) NES window.
//vw would be 293 but WidthScale would be 1.0. I think it should be something different.
//FinalPresentation doesnt use the LL.WidthScale, so this is unlikely to be breaking anything old that depends on it
//WidthScale = widthScale;
//HeightScale = heightScale;
WidthScale = (float)vw / oldSourceWidth;
HeightScale = (float)vh / oldSourceHeight;
} }
} }
@ -254,8 +262,6 @@ namespace BizHawk.Client.EmuHawk.Filters
GuiRenderer.Begin(OutputSize.Width, OutputSize.Height); GuiRenderer.Begin(OutputSize.Width, OutputSize.Height);
GuiRenderer.SetBlendState(GL.BlendNone); GuiRenderer.SetBlendState(GL.BlendNone);
GuiRenderer.Modelview.Push(); GuiRenderer.Modelview.Push();
//GuiRenderer.Modelview.Translate(LL.vx, LL.vy);
//GuiRenderer.Modelview.Scale(LL.WidthScale, LL.HeightScale);
if(FilterOption != eFilterOption.None) if(FilterOption != eFilterOption.None)
InputTexture.SetFilterLinear(); InputTexture.SetFilterLinear();
else else