psx - fix some small bugs in PAL support and make psx options dialog update labels with calculated resolutions so you can better understand what the options do
This commit is contained in:
zeromus
parent
215e155b47
commit
8d0205f962
|
|
@ -32,27 +32,27 @@
|
|||
this.btnCancel = new System.Windows.Forms.Button();
|
||||
this.btnOk = new System.Windows.Forms.Button();
|
||||
this.groupBox1 = new System.Windows.Forms.GroupBox();
|
||||
this.label9 = new System.Windows.Forms.Label();
|
||||
this.lblTweakedMednafen = new System.Windows.Forms.Label();
|
||||
this.rbTweakedMednafenMode = new System.Windows.Forms.RadioButton();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.rbDebugMode = new System.Windows.Forms.RadioButton();
|
||||
this.btnNiceDisplayConfig = new System.Windows.Forms.Button();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.lblMednafen = new System.Windows.Forms.Label();
|
||||
this.rbMednafenMode = new System.Windows.Forms.RadioButton();
|
||||
this.label8 = new System.Windows.Forms.Label();
|
||||
this.lblPixelPro = new System.Windows.Forms.Label();
|
||||
this.rbPixelPro = new System.Windows.Forms.RadioButton();
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.groupBox2 = new System.Windows.Forms.GroupBox();
|
||||
this.label6 = new System.Windows.Forms.Label();
|
||||
this.lblPAL = new System.Windows.Forms.Label();
|
||||
this.PAL_LastLineNumeric = new System.Windows.Forms.NumericUpDown();
|
||||
this.PAL_FirstLineNumeric = new System.Windows.Forms.NumericUpDown();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.lblNTSC = new System.Windows.Forms.Label();
|
||||
this.btnAreaFull = new System.Windows.Forms.Button();
|
||||
this.checkClipHorizontal = new System.Windows.Forms.CheckBox();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.NTSC_LastLineNumeric = new System.Windows.Forms.NumericUpDown();
|
||||
this.NTSC_FirstLineNumeric = new System.Windows.Forms.NumericUpDown();
|
||||
this.checkClipHorizontal = new System.Windows.Forms.CheckBox();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.groupBox2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.PAL_LastLineNumeric)).BeginInit();
|
||||
|
|
@ -85,29 +85,29 @@
|
|||
//
|
||||
// groupBox1
|
||||
//
|
||||
this.groupBox1.Controls.Add(this.label9);
|
||||
this.groupBox1.Controls.Add(this.lblTweakedMednafen);
|
||||
this.groupBox1.Controls.Add(this.rbTweakedMednafenMode);
|
||||
this.groupBox1.Controls.Add(this.label3);
|
||||
this.groupBox1.Controls.Add(this.rbDebugMode);
|
||||
this.groupBox1.Controls.Add(this.btnNiceDisplayConfig);
|
||||
this.groupBox1.Controls.Add(this.label2);
|
||||
this.groupBox1.Controls.Add(this.lblMednafen);
|
||||
this.groupBox1.Controls.Add(this.rbMednafenMode);
|
||||
this.groupBox1.Controls.Add(this.label8);
|
||||
this.groupBox1.Controls.Add(this.lblPixelPro);
|
||||
this.groupBox1.Controls.Add(this.rbPixelPro);
|
||||
this.groupBox1.Location = new System.Drawing.Point(12, 7);
|
||||
this.groupBox1.Name = "groupBox1";
|
||||
this.groupBox1.Size = new System.Drawing.Size(474, 256);
|
||||
this.groupBox1.TabIndex = 6;
|
||||
this.groupBox1.TabStop = false;
|
||||
this.groupBox1.Text = "Resolution Management (sample numbers do not reflect Drawing Area choices)";
|
||||
this.groupBox1.Text = "Resolution Management";
|
||||
//
|
||||
// label9
|
||||
// lblTweakedMednafen
|
||||
//
|
||||
this.label9.Location = new System.Drawing.Point(255, 132);
|
||||
this.label9.Name = "label9";
|
||||
this.label9.Size = new System.Drawing.Size(213, 79);
|
||||
this.label9.TabIndex = 28;
|
||||
this.label9.Text = "Displays all content at as multiple of 400x300.\r\n • Correct aspect ratio\r\n • Gene" +
|
||||
this.lblTweakedMednafen.Location = new System.Drawing.Point(255, 132);
|
||||
this.lblTweakedMednafen.Name = "lblTweakedMednafen";
|
||||
this.lblTweakedMednafen.Size = new System.Drawing.Size(213, 79);
|
||||
this.lblTweakedMednafen.TabIndex = 28;
|
||||
this.lblTweakedMednafen.Text = "Displays all content at as multiple of 400x300.\r\n • Correct aspect ratio\r\n • Gene" +
|
||||
"rally enjoyable game presentation\r\n • Detail loss at 1x in fewer cases\r\n • Requi" +
|
||||
"res certain display configuration:\r\n";
|
||||
//
|
||||
|
|
@ -153,13 +153,13 @@
|
|||
this.btnNiceDisplayConfig.UseVisualStyleBackColor = true;
|
||||
this.btnNiceDisplayConfig.Click += new System.EventHandler(this.btnNiceDisplayConfig_Click);
|
||||
//
|
||||
// label2
|
||||
// lblMednafen
|
||||
//
|
||||
this.label2.Location = new System.Drawing.Point(6, 132);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(213, 82);
|
||||
this.label2.TabIndex = 23;
|
||||
this.label2.Text = resources.GetString("label2.Text");
|
||||
this.lblMednafen.Location = new System.Drawing.Point(6, 132);
|
||||
this.lblMednafen.Name = "lblMednafen";
|
||||
this.lblMednafen.Size = new System.Drawing.Size(213, 82);
|
||||
this.lblMednafen.TabIndex = 23;
|
||||
this.lblMednafen.Text = resources.GetString("lblMednafen.Text");
|
||||
//
|
||||
// rbMednafenMode
|
||||
//
|
||||
|
|
@ -172,13 +172,13 @@
|
|||
this.rbMednafenMode.Text = "Mednafen Mode (4:3 AR)";
|
||||
this.rbMednafenMode.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// label8
|
||||
// lblPixelPro
|
||||
//
|
||||
this.label8.Location = new System.Drawing.Point(6, 35);
|
||||
this.label8.Name = "label8";
|
||||
this.label8.Size = new System.Drawing.Size(252, 78);
|
||||
this.label8.TabIndex = 21;
|
||||
this.label8.Text = "Converts content with nearest neighbor to \r\nfit gracefully in a 800x480 window.\r\n" +
|
||||
this.lblPixelPro.Location = new System.Drawing.Point(6, 35);
|
||||
this.lblPixelPro.Name = "lblPixelPro";
|
||||
this.lblPixelPro.Size = new System.Drawing.Size(252, 78);
|
||||
this.lblPixelPro.TabIndex = 21;
|
||||
this.lblPixelPro.Text = "Converts content with nearest neighbor to \r\nfit gracefully in a 800x480 window.\r\n" +
|
||||
" • Content is pixel perfect\r\n • Aspect ratio is usually wrong\r\n • Game may seen " +
|
||||
"to have scale varying by mode\r\n\r\n\r\n";
|
||||
//
|
||||
|
|
@ -205,10 +205,10 @@
|
|||
//
|
||||
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox2.Controls.Add(this.label6);
|
||||
this.groupBox2.Controls.Add(this.lblPAL);
|
||||
this.groupBox2.Controls.Add(this.PAL_LastLineNumeric);
|
||||
this.groupBox2.Controls.Add(this.PAL_FirstLineNumeric);
|
||||
this.groupBox2.Controls.Add(this.label5);
|
||||
this.groupBox2.Controls.Add(this.lblNTSC);
|
||||
this.groupBox2.Controls.Add(this.btnAreaFull);
|
||||
this.groupBox2.Controls.Add(this.checkClipHorizontal);
|
||||
this.groupBox2.Controls.Add(this.label4);
|
||||
|
|
@ -222,14 +222,14 @@
|
|||
this.groupBox2.TabStop = false;
|
||||
this.groupBox2.Text = "Drawing Area";
|
||||
//
|
||||
// label6
|
||||
// lblPAL
|
||||
//
|
||||
this.label6.AutoSize = true;
|
||||
this.label6.Location = new System.Drawing.Point(131, 22);
|
||||
this.label6.Name = "label6";
|
||||
this.label6.Size = new System.Drawing.Size(27, 13);
|
||||
this.label6.TabIndex = 44;
|
||||
this.label6.Text = "PAL";
|
||||
this.lblPAL.AutoSize = true;
|
||||
this.lblPAL.Location = new System.Drawing.Point(131, 22);
|
||||
this.lblPAL.Name = "lblPAL";
|
||||
this.lblPAL.Size = new System.Drawing.Size(27, 13);
|
||||
this.lblPAL.TabIndex = 44;
|
||||
this.lblPAL.Text = "PAL";
|
||||
//
|
||||
// PAL_LastLineNumeric
|
||||
//
|
||||
|
|
@ -247,6 +247,7 @@
|
|||
0,
|
||||
0,
|
||||
0});
|
||||
this.PAL_LastLineNumeric.ValueChanged += new System.EventHandler(this.DrawingArea_ValueChanged);
|
||||
//
|
||||
// PAL_FirstLineNumeric
|
||||
//
|
||||
|
|
@ -259,15 +260,16 @@
|
|||
this.PAL_FirstLineNumeric.Name = "PAL_FirstLineNumeric";
|
||||
this.PAL_FirstLineNumeric.Size = new System.Drawing.Size(47, 20);
|
||||
this.PAL_FirstLineNumeric.TabIndex = 42;
|
||||
this.PAL_FirstLineNumeric.ValueChanged += new System.EventHandler(this.DrawingArea_ValueChanged);
|
||||
//
|
||||
// label5
|
||||
// lblNTSC
|
||||
//
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(62, 22);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(36, 13);
|
||||
this.label5.TabIndex = 41;
|
||||
this.label5.Text = "NTSC";
|
||||
this.lblNTSC.AutoSize = true;
|
||||
this.lblNTSC.Location = new System.Drawing.Point(62, 22);
|
||||
this.lblNTSC.Name = "lblNTSC";
|
||||
this.lblNTSC.Size = new System.Drawing.Size(36, 13);
|
||||
this.lblNTSC.TabIndex = 41;
|
||||
this.lblNTSC.Text = "NTSC";
|
||||
//
|
||||
// btnAreaFull
|
||||
//
|
||||
|
|
@ -279,6 +281,17 @@
|
|||
this.btnAreaFull.UseVisualStyleBackColor = true;
|
||||
this.btnAreaFull.Click += new System.EventHandler(this.btnAreaFull_Click);
|
||||
//
|
||||
// checkClipHorizontal
|
||||
//
|
||||
this.checkClipHorizontal.AutoSize = true;
|
||||
this.checkClipHorizontal.Location = new System.Drawing.Point(7, 127);
|
||||
this.checkClipHorizontal.Name = "checkClipHorizontal";
|
||||
this.checkClipHorizontal.Size = new System.Drawing.Size(142, 17);
|
||||
this.checkClipHorizontal.TabIndex = 30;
|
||||
this.checkClipHorizontal.Text = "Clip Horizontal Overscan";
|
||||
this.checkClipHorizontal.UseVisualStyleBackColor = true;
|
||||
this.checkClipHorizontal.CheckedChanged += new System.EventHandler(this.checkClipHorizontal_CheckedChanged);
|
||||
//
|
||||
// label4
|
||||
//
|
||||
this.label4.AutoSize = true;
|
||||
|
|
@ -313,6 +326,7 @@
|
|||
0,
|
||||
0,
|
||||
0});
|
||||
this.NTSC_LastLineNumeric.ValueChanged += new System.EventHandler(this.DrawingArea_ValueChanged);
|
||||
//
|
||||
// NTSC_FirstLineNumeric
|
||||
//
|
||||
|
|
@ -325,16 +339,7 @@
|
|||
this.NTSC_FirstLineNumeric.Name = "NTSC_FirstLineNumeric";
|
||||
this.NTSC_FirstLineNumeric.Size = new System.Drawing.Size(47, 20);
|
||||
this.NTSC_FirstLineNumeric.TabIndex = 21;
|
||||
//
|
||||
// checkClipHorizontal
|
||||
//
|
||||
this.checkClipHorizontal.AutoSize = true;
|
||||
this.checkClipHorizontal.Location = new System.Drawing.Point(7, 127);
|
||||
this.checkClipHorizontal.Name = "checkClipHorizontal";
|
||||
this.checkClipHorizontal.Size = new System.Drawing.Size(142, 17);
|
||||
this.checkClipHorizontal.TabIndex = 30;
|
||||
this.checkClipHorizontal.Text = "Clip Horizontal Overscan";
|
||||
this.checkClipHorizontal.UseVisualStyleBackColor = true;
|
||||
this.NTSC_FirstLineNumeric.ValueChanged += new System.EventHandler(this.DrawingArea_ValueChanged);
|
||||
//
|
||||
// PSXOptions
|
||||
//
|
||||
|
|
@ -370,19 +375,19 @@
|
|||
private System.Windows.Forms.GroupBox groupBox1;
|
||||
private System.Windows.Forms.RadioButton rbPixelPro;
|
||||
private System.Windows.Forms.Button btnNiceDisplayConfig;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.Label lblMednafen;
|
||||
private System.Windows.Forms.RadioButton rbMednafenMode;
|
||||
private System.Windows.Forms.Label label8;
|
||||
private System.Windows.Forms.Label lblPixelPro;
|
||||
private System.Windows.Forms.Label label7;
|
||||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.RadioButton rbDebugMode;
|
||||
private System.Windows.Forms.Label label9;
|
||||
private System.Windows.Forms.Label lblTweakedMednafen;
|
||||
private System.Windows.Forms.RadioButton rbTweakedMednafenMode;
|
||||
private System.Windows.Forms.GroupBox groupBox2;
|
||||
private System.Windows.Forms.Label label6;
|
||||
private System.Windows.Forms.Label lblPAL;
|
||||
private System.Windows.Forms.NumericUpDown PAL_LastLineNumeric;
|
||||
private System.Windows.Forms.NumericUpDown PAL_FirstLineNumeric;
|
||||
private System.Windows.Forms.Label label5;
|
||||
private System.Windows.Forms.Label lblNTSC;
|
||||
private System.Windows.Forms.Button btnAreaFull;
|
||||
private System.Windows.Forms.CheckBox checkClipHorizontal;
|
||||
private System.Windows.Forms.Label label4;
|
||||
|
|
|
|||
|
|
@ -14,10 +14,23 @@ namespace BizHawk.Client.EmuHawk
|
|||
{
|
||||
public partial class PSXOptions : Form
|
||||
{
|
||||
public PSXOptions(Octoshock.Settings settings)
|
||||
//backups of the labels for string replacing
|
||||
string lblPixelPro_text, lblMednafen_text, lblTweakedMednafen_text;
|
||||
|
||||
public PSXOptions(Octoshock.Settings settings, OctoshockDll.eVidStandard vidStandard, Size currentVideoSize)
|
||||
{
|
||||
InitializeComponent();
|
||||
_settings = settings;
|
||||
_previewVideoStandard = vidStandard;
|
||||
_previewVideoSize = currentVideoSize;
|
||||
|
||||
if (_previewVideoStandard == OctoshockDll.eVidStandard.NTSC)
|
||||
lblNTSC.Font = new System.Drawing.Font(lblNTSC.Font, FontStyle.Bold);
|
||||
else lblPAL.Font = new System.Drawing.Font(lblPAL.Font, FontStyle.Bold);
|
||||
|
||||
lblPixelPro_text = lblPixelPro.Text;
|
||||
lblMednafen_text = lblMednafen.Text;
|
||||
lblTweakedMednafen_text = lblTweakedMednafen.Text;
|
||||
|
||||
rbPixelPro.Checked = _settings.ResolutionMode == Octoshock.eResolutionMode.PixelPro;
|
||||
rbDebugMode.Checked = _settings.ResolutionMode == Octoshock.eResolutionMode.Debug;
|
||||
|
|
@ -31,6 +44,8 @@ namespace BizHawk.Client.EmuHawk
|
|||
PAL_LastLineNumeric.Value = _settings.ScanlineEnd_PAL;
|
||||
}
|
||||
|
||||
Size _previewVideoSize;
|
||||
OctoshockDll.eVidStandard _previewVideoStandard;
|
||||
Octoshock.Settings _settings;
|
||||
bool _dispSettingsSet = false;
|
||||
|
||||
|
|
@ -42,14 +57,32 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
public static DialogResult DoSettingsDialog(IWin32Window owner)
|
||||
{
|
||||
var s = ((Octoshock)Global.Emulator).GetSettings();
|
||||
var ss = ((Octoshock)Global.Emulator).GetSyncSettings();
|
||||
var dlg = new PSXOptions(s);
|
||||
var psx = ((Octoshock)Global.Emulator);
|
||||
var s = psx.GetSettings();
|
||||
var ss = psx.GetSyncSettings();
|
||||
var vid = psx.SystemVidStandard;
|
||||
var size = psx.CurrentVideoSize;
|
||||
var dlg = new PSXOptions(s,vid,size);
|
||||
|
||||
var result = dlg.ShowDialog(owner);
|
||||
return result;
|
||||
}
|
||||
|
||||
void SyncGuiToTheseSettings(Octoshock.Settings settings)
|
||||
{
|
||||
if (rbPixelPro.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.PixelPro;
|
||||
if (rbDebugMode.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.Debug;
|
||||
if (rbMednafenMode.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.Mednafen;
|
||||
if (rbTweakedMednafenMode.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.TweakedMednafen;
|
||||
|
||||
settings.ClipHorizontalOverscan = checkClipHorizontal.Checked;
|
||||
|
||||
settings.ScanlineStart_NTSC = (int)NTSC_FirstLineNumeric.Value;
|
||||
settings.ScanlineEnd_NTSC = (int)NTSC_LastLineNumeric.Value;
|
||||
settings.ScanlineStart_PAL = (int)PAL_FirstLineNumeric.Value;
|
||||
settings.ScanlineEnd_PAL = (int)PAL_LastLineNumeric.Value;
|
||||
}
|
||||
|
||||
private void btnOk_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (_dispSettingsSet)
|
||||
|
|
@ -60,20 +93,8 @@ namespace BizHawk.Client.EmuHawk
|
|||
Global.Config.DispFinalFilter = 1; //bilinear, I hope
|
||||
}
|
||||
|
||||
if(rbPixelPro.Checked) _settings.ResolutionMode = Octoshock.eResolutionMode.PixelPro;
|
||||
if(rbDebugMode.Checked) _settings.ResolutionMode = Octoshock.eResolutionMode.Debug;
|
||||
if(rbMednafenMode.Checked)_settings.ResolutionMode = Octoshock.eResolutionMode.Mednafen;
|
||||
if(rbTweakedMednafenMode.Checked)_settings.ResolutionMode = Octoshock.eResolutionMode.TweakedMednafen;
|
||||
|
||||
_settings.ClipHorizontalOverscan = checkClipHorizontal.Checked;
|
||||
|
||||
_settings.ScanlineStart_NTSC = (int)NTSC_FirstLineNumeric.Value;
|
||||
_settings.ScanlineEnd_NTSC = (int)NTSC_LastLineNumeric.Value;
|
||||
_settings.ScanlineStart_PAL = (int)PAL_FirstLineNumeric.Value;
|
||||
_settings.ScanlineEnd_PAL = (int)PAL_LastLineNumeric.Value;
|
||||
|
||||
SyncGuiToTheseSettings(_settings);
|
||||
_settings.Validate();
|
||||
|
||||
GlobalWin.MainForm.PutCoreSettings(_settings);
|
||||
|
||||
DialogResult = DialogResult.OK;
|
||||
|
|
@ -86,7 +107,40 @@ namespace BizHawk.Client.EmuHawk
|
|||
NTSC_LastLineNumeric.Value = 239;
|
||||
PAL_FirstLineNumeric.Value = 0;
|
||||
PAL_LastLineNumeric.Value = 287;
|
||||
SyncLabels();
|
||||
}
|
||||
|
||||
void SyncLabels()
|
||||
{
|
||||
var temp = _settings.Clone();
|
||||
SyncGuiToTheseSettings(temp);
|
||||
_settings.Validate();
|
||||
|
||||
//actually, I think this is irrelevant. But it's nice in case we want to do some kind of a more detailed simulation later
|
||||
int w = _previewVideoSize.Width;
|
||||
int h = _previewVideoSize.Height;
|
||||
|
||||
temp.ResolutionMode = Octoshock.eResolutionMode.PixelPro;
|
||||
var size = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
|
||||
lblPixelPro.Text = lblPixelPro_text.Replace("800x480", string.Format("{0}x{1}", size.Width, size.Height)); ;
|
||||
|
||||
temp.ResolutionMode = Octoshock.eResolutionMode.Mednafen;
|
||||
size = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
|
||||
lblMednafen.Text = lblMednafen_text.Replace("320x240", string.Format("{0}x{1}", size.Width, size.Height));
|
||||
|
||||
temp.ResolutionMode = Octoshock.eResolutionMode.TweakedMednafen;
|
||||
size = Octoshock.CalculateResolution(_previewVideoStandard, temp, w, h);
|
||||
lblTweakedMednafen.Text = lblTweakedMednafen_text.Replace("400x300", string.Format("{0}x{1}", size.Width, size.Height));
|
||||
}
|
||||
|
||||
private void DrawingArea_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
SyncLabels();
|
||||
}
|
||||
|
||||
private void checkClipHorizontal_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
SyncLabels();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@
|
|||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="label2.Text" xml:space="preserve">
|
||||
<data name="lblMednafen.Text" xml:space="preserve">
|
||||
<value>Displays all content at as multiple of 320x240
|
||||
• Correct aspect ratio
|
||||
• Generally enjoyable game presentation
|
||||
|
|
|
|||
|
|
@ -178,8 +178,9 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
|
|||
List<DiscInterface> discInterfaces = new List<DiscInterface>();
|
||||
DiscInterface currentDiscInterface;
|
||||
|
||||
OctoshockDll.eRegion SystemRegion;
|
||||
OctoshockDll.eVidStandard SystemVidStandard;
|
||||
public OctoshockDll.eRegion SystemRegion { get; private set; }
|
||||
public OctoshockDll.eVidStandard SystemVidStandard { get; private set; }
|
||||
public System.Drawing.Size CurrentVideoSize { get; private set; }
|
||||
|
||||
//note: its annoying that we have to have a disc before constructing this.
|
||||
//might want to change that later. HOWEVER - we need to definitely have a region, at least
|
||||
|
|
@ -203,7 +204,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
|
|||
|
||||
if (discs != null)
|
||||
{
|
||||
foreach(var disc in discs)
|
||||
foreach (var disc in discs)
|
||||
{
|
||||
var discInterface = new DiscInterface(disc,
|
||||
(di) =>
|
||||
|
|
@ -234,10 +235,10 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
|
|||
}
|
||||
|
||||
//see http://problemkaputt.de/psx-spx.htm
|
||||
int CpuClock_n = 44100*768;
|
||||
int CpuClock_n = 44100 * 768;
|
||||
int CpuClock_d = 1;
|
||||
int VidClock_n = CpuClock_n*11;
|
||||
int VidClock_d = CpuClock_d*7;
|
||||
int VidClock_n = CpuClock_n * 11;
|
||||
int VidClock_d = CpuClock_d * 7;
|
||||
if (SystemRegion == OctoshockDll.eRegion.EU)
|
||||
{
|
||||
CoreComm.VsyncNum = VidClock_n;
|
||||
|
|
@ -260,14 +261,22 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
|
|||
|
||||
SetMemoryDomains();
|
||||
|
||||
//TODO - refactor resolution detection and set this accordingly to the first frame of emulation, or at least what the bios is doing first
|
||||
VirtualWidth = 800;
|
||||
VirtualHeight = 480;
|
||||
|
||||
//set a default framebuffer
|
||||
BufferWidth = VirtualWidth;
|
||||
BufferHeight = VirtualHeight;
|
||||
frameBuffer = new int[BufferWidth * BufferHeight];
|
||||
//set a default framebuffer based on the first frame of emulation, to cut down on flickering or whatever
|
||||
//this is probably quixotic, but we have to pick something
|
||||
{
|
||||
BufferWidth = 280;
|
||||
BufferHeight = 240;
|
||||
if (SystemVidStandard == OctoshockDll.eVidStandard.PAL)
|
||||
{
|
||||
BufferWidth = 280;
|
||||
BufferHeight = 288;
|
||||
}
|
||||
CurrentVideoSize = new System.Drawing.Size(BufferWidth, BufferHeight);
|
||||
var size = Octoshock.CalculateResolution(SystemVidStandard, _Settings, BufferWidth, BufferHeight);
|
||||
BufferWidth = VirtualWidth = size.Width;
|
||||
BufferHeight = VirtualHeight = size.Height;
|
||||
frameBuffer = new int[BufferWidth * BufferHeight];
|
||||
}
|
||||
|
||||
if (discInterfaces.Count != 0)
|
||||
{
|
||||
|
|
@ -347,6 +356,42 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
|
|||
OctoshockDll.shock_Peripheral_SetPadInput(psx, 0x01, buttons, left_x, left_y, right_x, right_y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculates what the output resolution would be for the given input resolution and settings
|
||||
/// </summary>
|
||||
public static System.Drawing.Size CalculateResolution(OctoshockDll.eVidStandard standard, Settings settings, int w, int h)
|
||||
{
|
||||
int virtual_width = settings.ClipHorizontalOverscan ? 768 : 800;
|
||||
|
||||
int scanline_start = standard == OctoshockDll.eVidStandard.NTSC ? settings.ScanlineStart_NTSC : settings.ScanlineStart_PAL;
|
||||
int scanline_end = standard == OctoshockDll.eVidStandard.NTSC ? settings.ScanlineEnd_NTSC : settings.ScanlineEnd_PAL;
|
||||
int scanline_num = scanline_end - scanline_start + 1;
|
||||
int real_scanline_num = standard == OctoshockDll.eVidStandard.NTSC ? 240 : 288;
|
||||
|
||||
int VirtualWidth=-1, VirtualHeight=-1;
|
||||
switch (settings.ResolutionMode)
|
||||
{
|
||||
case eResolutionMode.Debug:
|
||||
VirtualWidth = w;
|
||||
VirtualHeight = h;
|
||||
break;
|
||||
case eResolutionMode.Mednafen:
|
||||
VirtualWidth = settings.ClipHorizontalOverscan ? 302 : 320;
|
||||
VirtualHeight = scanline_num;
|
||||
break;
|
||||
case eResolutionMode.PixelPro:
|
||||
VirtualWidth = virtual_width;
|
||||
VirtualHeight = scanline_num * 2;
|
||||
break;
|
||||
case eResolutionMode.TweakedMednafen:
|
||||
VirtualWidth = settings.ClipHorizontalOverscan ? 378 : 400;
|
||||
VirtualHeight = (int)(scanline_num * 300.0f / real_scanline_num);
|
||||
break;
|
||||
}
|
||||
|
||||
return new System.Drawing.Size(VirtualWidth, VirtualHeight);
|
||||
}
|
||||
|
||||
public void FrameAdvance(bool render, bool rendersound)
|
||||
{
|
||||
Frame++;
|
||||
|
|
@ -383,6 +428,11 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
|
|||
if (render == false) return;
|
||||
|
||||
OctoshockDll.ShockFramebufferInfo fb = new OctoshockDll.ShockFramebufferInfo();
|
||||
|
||||
//run this once to get current logical size
|
||||
OctoshockDll.shock_GetFramebuffer(psx, ref fb);
|
||||
CurrentVideoSize = new System.Drawing.Size(fb.width, fb.height);
|
||||
|
||||
if (_Settings.ResolutionMode == eResolutionMode.PixelPro)
|
||||
fb.flags = OctoshockDll.eShockFramebufferFlags.Normalize;
|
||||
|
||||
|
|
@ -393,31 +443,9 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
|
|||
BufferWidth = w;
|
||||
BufferHeight = h;
|
||||
|
||||
int virtual_width = ropts.clipOverscan ? 768 : 800;
|
||||
int scanline_num = ropts.scanline_end - ropts.scanline_start + 1;
|
||||
int real_scanline_num = SystemVidStandard == OctoshockDll.eVidStandard.NTSC ? 240 : 288;
|
||||
|
||||
switch (_Settings.ResolutionMode)
|
||||
{
|
||||
case eResolutionMode.Debug:
|
||||
VirtualWidth = w;
|
||||
VirtualHeight = h;
|
||||
break;
|
||||
case eResolutionMode.Mednafen:
|
||||
VirtualWidth = ropts.clipOverscan ? 302 : 320;
|
||||
VirtualHeight = scanline_num;
|
||||
break;
|
||||
case eResolutionMode.PixelPro:
|
||||
VirtualWidth = virtual_width;
|
||||
VirtualHeight = scanline_num*2;
|
||||
break;
|
||||
case eResolutionMode.TweakedMednafen:
|
||||
{
|
||||
VirtualWidth = ropts.clipOverscan ? 378 : 400;
|
||||
VirtualHeight = (int)(scanline_num * 300.0f / real_scanline_num);
|
||||
}
|
||||
break;
|
||||
}
|
||||
var size = CalculateResolution(this.SystemVidStandard, _Settings, w, h);
|
||||
VirtualWidth = size.Width;
|
||||
VirtualHeight = size.Height;
|
||||
|
||||
int len = w * h;
|
||||
if (frameBuffer.Length != len)
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -33,7 +33,8 @@
|
|||
#include <stdarg.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#define FB_WIDTH 768
|
||||
//we're a bit sloppy right now.. use this to make sure theres adequate room for double-sizing a 400px wide screen
|
||||
#define FB_WIDTH 800
|
||||
#define FB_HEIGHT 576
|
||||
|
||||
//extern MDFNGI EmulatedPSX;
|
||||
|
|
@ -1360,7 +1361,7 @@ EW_EXPORT s32 shock_Step(void* psx, eShockStep step)
|
|||
//new frame, hasnt been normalized
|
||||
s_FramebufferNormalized = false;
|
||||
s_FramebufferCurrent = 0;
|
||||
s_FramebufferCurrentWidth = 768;
|
||||
s_FramebufferCurrentWidth = FB_WIDTH;
|
||||
|
||||
return SHOCK_OK;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue