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

support custom AR and display client size while resizing. fixes Issue #251 .

This commit is contained in:
zeromus 2014-09-14 00:51:30 +00:00
parent 7fea5f8543
commit 7e3144fd07
6 changed files with 153 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Client.Common/config/Config.cs
View File

@ -105,6 +105,8 @@ namespace BizHawk.Client.Common
}
}
public enum EDispManagerAR { None, System, Custom };
public enum SaveStateTypeE { Default, Binary, Text };
public MovieEndAction MovieEndAction = MovieEndAction.Finish;
@ -200,10 +202,13 @@ namespace BizHawk.Client.Common
public bool DispBlurry = false; // make display look ugly
public bool DispFixAspectRatio = true;
public bool DispFixScaleInteger = true;
public bool DispObeyAR = true;
public bool DispFullscreenHacks = true;
public bool DispSnowyNullEmulator = true;
public EDispManagerAR DispManagerAR = EDispManagerAR.System;
public int DispCustomUserARWidth = 1;
public int DispCustomUserARHeight = 1;
// Sound options
public bool SoundEnabled = true;
public bool MuteFrameAdvance = true;

37
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
View File

@ -298,13 +298,25 @@ namespace BizHawk.Client.EmuHawk
/// </summary>
public Size CalculateClientSize(IVideoProvider videoProvider, int zoom)
{
bool ar_active = Global.Config.DispFixAspectRatio;
bool ar_system = Global.Config.DispManagerAR == Config.EDispManagerAR.System;
bool ar_custom = Global.Config.DispManagerAR == Config.EDispManagerAR.Custom;
bool ar_correct = ar_system || ar_custom;
bool ar_unity = !ar_correct;
bool ar_integer = Global.Config.DispFixScaleInteger;
int bufferWidth = videoProvider.BufferWidth;
int bufferHeight = videoProvider.BufferHeight;
int virtualWidth = videoProvider.VirtualWidth;
int virtualHeight = videoProvider.VirtualHeight;
//test
//Console.WriteLine("DISPZOOM " + zoom);
if (ar_custom)
{
virtualWidth = Global.Config.DispCustomUserARWidth;
virtualHeight = Global.Config.DispCustomUserARHeight;
}
//Console.WriteLine("DISPZOOM " + zoom); //test
//old stuff
var fvp = new FakeVideoProvider();
@ -315,14 +327,9 @@ namespace BizHawk.Client.EmuHawk
Size chain_outsize = new Size(fvp.BufferWidth * zoom, fvp.BufferHeight * zoom);
bool ar_active = Global.Config.DispFixAspectRatio;
bool ar_system = Global.Config.DispObeyAR;
bool ar_unity = !ar_system;
bool ar_integer = Global.Config.DispFixScaleInteger;
if (ar_active)
{
if (ar_system)
if (ar_correct)
{
if (ar_integer)
{
@ -429,10 +436,18 @@ namespace BizHawk.Client.EmuHawk
int vw = videoProvider.BufferWidth;
int vh = videoProvider.BufferHeight;
if (Global.Config.DispObeyAR && Global.Config.DispFixAspectRatio)
if (Global.Config.DispFixAspectRatio)
{
vw = videoProvider.VirtualWidth;
vh = videoProvider.VirtualHeight;
if (Global.Config.DispManagerAR == Config.EDispManagerAR.System)
{
vw = videoProvider.VirtualWidth;
vh = videoProvider.VirtualHeight;
}
if (Global.Config.DispManagerAR == Config.EDispManagerAR.Custom)
{
vw = Global.Config.DispCustomUserARWidth;
vh = Global.Config.DispCustomUserARHeight;
}
}
int[] videoBuffer = videoProvider.GetVideoBuffer();

31
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -166,14 +166,21 @@ namespace BizHawk.Client.EmuHawk
ResizeBegin += (o, e) =>
{
_inResizeLoop = true;
if (GlobalWin.Sound != null)
{
GlobalWin.Sound.StopSound();
}
};
Resize += (o, e) =>
{
SetWindowText();
};
ResizeEnd += (o, e) =>
{
_inResizeLoop = false;
if (GlobalWin.PresentationPanel != null)
{
GlobalWin.PresentationPanel.Resized = true;
@ -1200,6 +1207,7 @@ namespace BizHawk.Client.EmuHawk
private bool _runloopFrameadvance;
private DateTime _runloopSecond;
private bool _runloopLastFf;
private bool _inResizeLoop;
private readonly Throttle _throttle;
private bool _unthrottled;
@ -1237,13 +1245,22 @@ namespace BizHawk.Client.EmuHawk
private void SetWindowText()
{
if (Global.Emulator is NullEmulator)
string str = "";
if (_inResizeLoop)
{
Text = "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty);
return;
var size = GlobalWin.PresentationPanel.NativeSize;
str = str + string.Format("({0}x{1}) - ", size.Width, size.Height);
}
var str = Global.SystemInfo.DisplayName;
if (Global.Emulator is NullEmulator)
{
str = str + "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty);
}
else
{
str = str + Global.SystemInfo.DisplayName;
}
if (VersionInfo.DeveloperBuild)
{
@ -1252,12 +1269,14 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.IsActive)
{
Text = str + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
str = str + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
}
else
{
Text = str + " - " + Global.Game.Name;
str = str + " - " + Global.Game.Name;
}
Text = str;
}
private void ClearAutohold()

92
BizHawk.Client.EmuHawk/config/DisplayConfigLite.Designer.cs generated
View File

@ -54,6 +54,11 @@
this.label2 = new System.Windows.Forms.Label();
this.checkSnowyNullEmulator = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.rbUseCustom = new System.Windows.Forms.RadioButton();
this.txtCustomARWidth = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtCustomARHeight = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tbScanlineIntensity)).BeginInit();
this.grpFinalFilter.SuspendLayout();
@ -65,7 +70,7 @@
//
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(510, 250);
this.btnCancel.Location = new System.Drawing.Point(544, 297);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 5;
@ -75,7 +80,7 @@
// btnOk
//
this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnOk.Location = new System.Drawing.Point(429, 250);
this.btnOk.Location = new System.Drawing.Point(463, 297);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(75, 23);
this.btnOk.TabIndex = 4;
@ -95,7 +100,7 @@
this.groupBox1.Controls.Add(this.rbHq2x);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(173, 132);
this.groupBox1.Size = new System.Drawing.Size(193, 132);
this.groupBox1.TabIndex = 7;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Scaling Filter";
@ -145,7 +150,7 @@
this.tbScanlineIntensity.Location = new System.Drawing.Point(83, 55);
this.tbScanlineIntensity.Maximum = 256;
this.tbScanlineIntensity.Name = "tbScanlineIntensity";
this.tbScanlineIntensity.Size = new System.Drawing.Size(70, 45);
this.tbScanlineIntensity.Size = new System.Drawing.Size(70, 42);
this.tbScanlineIntensity.TabIndex = 3;
this.tbScanlineIntensity.TickFrequency = 32;
this.tbScanlineIntensity.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
@ -199,7 +204,7 @@
// checkPadInteger
//
this.checkPadInteger.AutoSize = true;
this.checkPadInteger.Location = new System.Drawing.Point(21, 254);
this.checkPadInteger.Location = new System.Drawing.Point(21, 290);
this.checkPadInteger.Name = "checkPadInteger";
this.checkPadInteger.Size = new System.Drawing.Size(248, 17);
this.checkPadInteger.TabIndex = 9;
@ -212,9 +217,9 @@
this.grpFinalFilter.Controls.Add(this.rbFinalFilterBicubic);
this.grpFinalFilter.Controls.Add(this.rbFinalFilterNone);
this.grpFinalFilter.Controls.Add(this.rbFinalFilterBilinear);
this.grpFinalFilter.Location = new System.Drawing.Point(191, 12);
this.grpFinalFilter.Location = new System.Drawing.Point(211, 12);
this.grpFinalFilter.Name = "grpFinalFilter";
this.grpFinalFilter.Size = new System.Drawing.Size(173, 132);
this.grpFinalFilter.Size = new System.Drawing.Size(187, 132);
this.grpFinalFilter.TabIndex = 8;
this.grpFinalFilter.TabStop = false;
this.grpFinalFilter.Text = "Final Filter";
@ -267,22 +272,27 @@
// rbUseSystem
//
this.rbUseSystem.AutoSize = true;
this.rbUseSystem.Location = new System.Drawing.Point(6, 42);
this.rbUseSystem.Location = new System.Drawing.Point(26, 58);
this.rbUseSystem.Name = "rbUseSystem";
this.rbUseSystem.Size = new System.Drawing.Size(320, 17);
this.rbUseSystem.Size = new System.Drawing.Size(167, 17);
this.rbUseSystem.TabIndex = 12;
this.rbUseSystem.TabStop = true;
this.rbUseSystem.Text = "Use system\'s recommendation (e.g. 2x1 pixels, for better AR fit)";
this.rbUseSystem.Text = "Use system\'s recommendation";
this.rbUseSystem.UseVisualStyleBackColor = true;
this.rbUseSystem.CheckedChanged += new System.EventHandler(this.rbUseSystem_CheckedChanged);
//
// grpARSelection
//
this.grpARSelection.Controls.Add(this.label4);
this.grpARSelection.Controls.Add(this.txtCustomARHeight);
this.grpARSelection.Controls.Add(this.label3);
this.grpARSelection.Controls.Add(this.txtCustomARWidth);
this.grpARSelection.Controls.Add(this.rbUseCustom);
this.grpARSelection.Controls.Add(this.rbUseRaw);
this.grpARSelection.Controls.Add(this.rbUseSystem);
this.grpARSelection.Location = new System.Drawing.Point(21, 177);
this.grpARSelection.Name = "grpARSelection";
this.grpARSelection.Size = new System.Drawing.Size(342, 71);
this.grpARSelection.Size = new System.Drawing.Size(377, 107);
this.grpARSelection.TabIndex = 13;
this.grpARSelection.TabStop = false;
this.grpARSelection.Text = "Aspect Ratio Selection";
@ -303,16 +313,16 @@
this.groupBox2.Controls.Add(this.checkSnowyNullEmulator);
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.checkFullscreenHacks);
this.groupBox2.Location = new System.Drawing.Point(370, 12);
this.groupBox2.Location = new System.Drawing.Point(404, 12);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(217, 224);
this.groupBox2.Size = new System.Drawing.Size(217, 272);
this.groupBox2.TabIndex = 15;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Misc.";
//
// label2
//
this.label2.Location = new System.Drawing.Point(7, 167);
this.label2.Location = new System.Drawing.Point(7, 190);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(204, 45);
this.label2.TabIndex = 17;
@ -322,7 +332,7 @@
// checkSnowyNullEmulator
//
this.checkSnowyNullEmulator.AutoSize = true;
this.checkSnowyNullEmulator.Location = new System.Drawing.Point(6, 142);
this.checkSnowyNullEmulator.Location = new System.Drawing.Point(6, 165);
this.checkSnowyNullEmulator.Name = "checkSnowyNullEmulator";
this.checkSnowyNullEmulator.Size = new System.Drawing.Size(159, 17);
this.checkSnowyNullEmulator.TabIndex = 16;
@ -333,17 +343,60 @@
//
this.label1.Location = new System.Drawing.Point(7, 42);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(204, 102);
this.label1.Size = new System.Drawing.Size(204, 117);
this.label1.TabIndex = 15;
this.label1.Text = resources.GetString("label1.Text");
//
// rbUseCustom
//
this.rbUseCustom.AutoSize = true;
this.rbUseCustom.Location = new System.Drawing.Point(26, 80);
this.rbUseCustom.Name = "rbUseCustom";
this.rbUseCustom.Size = new System.Drawing.Size(107, 17);
this.rbUseCustom.TabIndex = 13;
this.rbUseCustom.TabStop = true;
this.rbUseCustom.Text = "Use custom Size:";
this.rbUseCustom.UseVisualStyleBackColor = true;
//
// txtCustomARWidth
//
this.txtCustomARWidth.Location = new System.Drawing.Point(134, 79);
this.txtCustomARWidth.Name = "txtCustomARWidth";
this.txtCustomARWidth.Size = new System.Drawing.Size(72, 20);
this.txtCustomARWidth.TabIndex = 14;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(212, 84);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(12, 13);
this.label3.TabIndex = 12;
this.label3.Text = "x";
//
// txtCustomARHeight
//
this.txtCustomARHeight.Location = new System.Drawing.Point(230, 79);
this.txtCustomARHeight.Name = "txtCustomARHeight";
this.txtCustomARHeight.Size = new System.Drawing.Size(72, 20);
this.txtCustomARHeight.TabIndex = 15;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(23, 41);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(257, 13);
this.label4.TabIndex = 12;
this.label4.Text = "Allow pixel distortion (e.g. 2x1 pixels, for better AR fit):";
//
// DisplayConfigLite
//
this.AcceptButton = this.btnOk;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(597, 285);
this.ClientSize = new System.Drawing.Size(631, 332);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.grpARSelection);
this.Controls.Add(this.grpFinalFilter);
@ -397,5 +450,10 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label lblScanlines;
private System.Windows.Forms.TextBox txtCustomARHeight;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtCustomARWidth;
private System.Windows.Forms.RadioButton rbUseCustom;
private System.Windows.Forms.Label label4;
}
}

23
BizHawk.Client.EmuHawk/config/DisplayConfigLite.cs
View File

@ -34,11 +34,19 @@ namespace BizHawk.Client.EmuHawk.config
tbScanlineIntensity.Value = Global.Config.TargetScanlineFilterIntensity;
checkLetterbox.Checked = Global.Config.DispFixAspectRatio;
checkPadInteger.Checked = Global.Config.DispFixScaleInteger;
rbUseSystem.Checked = Global.Config.DispObeyAR;
rbUseRaw.Checked = !Global.Config.DispObeyAR;
checkFullscreenHacks.Checked = Global.Config.DispFullscreenHacks;
checkSnowyNullEmulator.Checked = Global.Config.DispSnowyNullEmulator;
if (Global.Config.DispManagerAR == Config.EDispManagerAR.None)
rbUseRaw.Checked = true;
else if (Global.Config.DispManagerAR == Config.EDispManagerAR.System)
rbUseSystem.Checked = true;
else if (Global.Config.DispManagerAR == Config.EDispManagerAR.Custom)
rbUseCustom.Checked = true;
txtCustomARWidth.Text = Global.Config.DispCustomUserARWidth.ToString();
txtCustomARHeight.Text = Global.Config.DispCustomUserARHeight.ToString();
RefreshAspectRatioOptions();
}
@ -63,10 +71,19 @@ namespace BizHawk.Client.EmuHawk.config
Global.Config.TargetScanlineFilterIntensity = tbScanlineIntensity.Value;
Global.Config.DispFixAspectRatio = checkLetterbox.Checked;
Global.Config.DispFixScaleInteger = checkPadInteger.Checked;
Global.Config.DispObeyAR = rbUseSystem.Checked;
Global.Config.DispFullscreenHacks = checkFullscreenHacks.Checked;
Global.Config.DispSnowyNullEmulator = checkSnowyNullEmulator.Checked;
if (rbUseRaw.Checked)
Global.Config.DispManagerAR = Config.EDispManagerAR.None;
else if (rbUseSystem.Checked)
Global.Config.DispManagerAR = Config.EDispManagerAR.System;
else if (rbUseCustom.Checked)
Global.Config.DispManagerAR = Config.EDispManagerAR.Custom;
int.TryParse(txtCustomARWidth.Text, out Global.Config.DispCustomUserARWidth);
int.TryParse(txtCustomARHeight.Text, out Global.Config.DispCustomUserARHeight);
Global.Config.DispUserFilterPath = PathSelection;
GlobalWin.DisplayManager.RefreshUserShader();

2
BizHawk.Client.EmuHawk/config/DisplayConfigLite.resx
View File

@ -118,6 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="label1.Text" xml:space="preserve">
<value>For Windows operating systems &gt;= Vista, with some video cards, the monitors may flicker when going 'windowed fullscreen' while the system disobeys us and goes actual fullscreen instead. This hack prevents that, but may increase frame latency.</value>
<value>For Windows operating systems &gt;= Vista, with some video cards, the monitors may flicker when going 'windowed fullscreen' while the system disobeys us and goes actual fullscreen instead. This hack prevents that, but may increase frame latency (since in Microsoft's new and disimproved operating systems, windowed mode things may have higher latency)</value>
</data>
</root>