empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Video: Added Prescale 6x/8x/10x filters for high resolution monitors

Browse source
This commit is contained in:
Souryo 2017-03-19 13:26:05 -04:00
parent b9a62d96b7
commit 87dc9ce0ff
13 changed files with 96 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Core/EmulationSettings.h
View file

@ -105,6 +105,9 @@ enum class VideoFilterType
Prescale2x = 19,
Prescale3x = 20,
Prescale4x = 21,
Prescale6x = 22,
Prescale8x = 23,
Prescale10x = 24,
HdPack = 999
};

3
Core/VideoDecoder.cpp
View file

@ -88,6 +88,9 @@ void VideoDecoder::UpdateVideoFilter()
case VideoFilterType::Prescale2x: _videoFilter.reset(new ScaleFilter(ScaleFilterType::Prescale, 2)); break;
case VideoFilterType::Prescale3x: _videoFilter.reset(new ScaleFilter(ScaleFilterType::Prescale, 3)); break;
case VideoFilterType::Prescale4x: _videoFilter.reset(new ScaleFilter(ScaleFilterType::Prescale, 4)); break;
case VideoFilterType::Prescale6x: _videoFilter.reset(new ScaleFilter(ScaleFilterType::Prescale, 6)); break;
case VideoFilterType::Prescale8x: _videoFilter.reset(new ScaleFilter(ScaleFilterType::Prescale, 8)); break;
case VideoFilterType::Prescale10x: _videoFilter.reset(new ScaleFilter(ScaleFilterType::Prescale, 10)); break;
case VideoFilterType::HdPack: _videoFilter.reset(new HdVideoFilter()); break;
}

3
GUI.NET/Dependencies/resources.en.xml
View file

@ -113,6 +113,9 @@
<Value ID="Prescale2x">Prescale 2x</Value>
<Value ID="Prescale3x">Prescale 3x</Value>
<Value ID="Prescale4x">Prescale 4x</Value>
<Value ID="Prescale6x">Prescale 6x</Value>
<Value ID="Prescale8x">Prescale 8x</Value>
<Value ID="Prescale10x">Prescale 10x</Value>
</Enum>
<Enum ID="ConsoleType">
<Value ID="Nes">NES</Value>

3
GUI.NET/Dependencies/resources.es.xml
View file

@ -619,6 +619,9 @@
<Value ID="Prescale2x">Preescala 2x</Value>
<Value ID="Prescale3x">Preescala 3x</Value>
<Value ID="Prescale4x">Preescala 4x</Value>
<Value ID="Prescale6x">Preescala 6x</Value>
<Value ID="Prescale8x">Preescala 8x</Value>
<Value ID="Prescale10x">Preescala 10x</Value>
</Enum>
<Enum ID="ConsoleType">
<Value ID="Nes">NES</Value>

3
GUI.NET/Dependencies/resources.fr.xml
View file

@ -635,6 +635,9 @@
<Value ID="Prescale2x">Prescale 2x</Value>
<Value ID="Prescale3x">Prescale 3x</Value>
<Value ID="Prescale4x">Prescale 4x</Value>
<Value ID="Prescale6x">Prescale 6x</Value>
<Value ID="Prescale8x">Prescale 8x</Value>
<Value ID="Prescale10x">Prescale 10x</Value>
</Enum>
<Enum ID="ConsoleType">
<Value ID="Nes">NES</Value>

3
GUI.NET/Dependencies/resources.ja.xml
View file

@ -617,6 +617,9 @@
<Value ID="Prescale2x">Prescale 2x</Value>
<Value ID="Prescale3x">Prescale 3x</Value>
<Value ID="Prescale4x">Prescale 4x</Value>
<Value ID="Prescale6x">Prescale 6x</Value>
<Value ID="Prescale8x">Prescale 8x</Value>
<Value ID="Prescale10x">Prescale 10x</Value>
</Enum>
<Enum ID="ConsoleType">
<Value ID="Nes">NES</Value>

3
GUI.NET/Dependencies/resources.pt.xml
View file

@ -619,6 +619,9 @@
<Value ID="Prescale2x">Preescala 2x</Value>
<Value ID="Prescale3x">Preescala 3x</Value>
<Value ID="Prescale4x">Preescala 4x</Value>
<Value ID="Prescale6x">Preescala 6x</Value>
<Value ID="Prescale8x">Preescala 8x</Value>
<Value ID="Prescale10x">Preescala 10x</Value>
</Enum>
<Enum ID="ConsoleType">
<Value ID="Nes">NES</Value>

3
GUI.NET/Dependencies/resources.ru.xml
View file

@ -625,6 +625,9 @@
<Value ID="Prescale2x">Prescale 2x</Value>
<Value ID="Prescale3x">Prescale 3x</Value>
<Value ID="Prescale4x">Prescale 4x</Value>
<Value ID="Prescale6x">Prescale 6x</Value>
<Value ID="Prescale8x">Prescale 8x</Value>
<Value ID="Prescale10x">Prescale 10x</Value>
</Enum>
<Enum ID="ConsoleType">
<Value ID="Nes">NES</Value>

3
GUI.NET/Dependencies/resources.uk.xml
View file

@ -624,6 +624,9 @@
<Value ID="Prescale2x">Prescale 2x</Value>
<Value ID="Prescale3x">Prescale 3x</Value>
<Value ID="Prescale4x">Prescale 4x</Value>
<Value ID="Prescale6x">Prescale 6x</Value>
<Value ID="Prescale8x">Prescale 8x</Value>
<Value ID="Prescale10x">Prescale 10x</Value>
</Enum>
<Enum ID="ConsoleType">
<Value ID="Nes">NES</Value>

60
GUI.NET/Forms/frmMain.Designer.cs generated
View file

@ -111,6 +111,9 @@ namespace Mesen.GUI.Forms
this.mnuPrescale2xFilter = new System.Windows.Forms.ToolStripMenuItem();
this.mnuPrescale3xFilter = new System.Windows.Forms.ToolStripMenuItem();
this.mnuPrescale4xFilter = new System.Windows.Forms.ToolStripMenuItem();
this.mnuPrescale6xFilter = new System.Windows.Forms.ToolStripMenuItem();
this.mnuPrescale8xFilter = new System.Windows.Forms.ToolStripMenuItem();
this.mnuPrescale10xFilter = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem19 = new System.Windows.Forms.ToolStripSeparator();
this.mnuBilinearInterpolation = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRegion = new System.Windows.Forms.ToolStripMenuItem();
@ -458,7 +461,7 @@ namespace Mesen.GUI.Forms
this.mnuShowFPS});
this.mnuEmulationSpeed.Image = global::Mesen.GUI.Properties.Resources.Speed;
this.mnuEmulationSpeed.Name = "mnuEmulationSpeed";
this.mnuEmulationSpeed.Size = new System.Drawing.Size(135, 22);
this.mnuEmulationSpeed.Size = new System.Drawing.Size(152, 22);
this.mnuEmulationSpeed.Text = "Speed";
this.mnuEmulationSpeed.DropDownOpening += new System.EventHandler(this.mnuEmulationSpeed_DropDownOpening);
//
@ -560,7 +563,7 @@ namespace Mesen.GUI.Forms
this.mnuFullscreen});
this.mnuVideoScale.Image = global::Mesen.GUI.Properties.Resources.Fullscreen;
this.mnuVideoScale.Name = "mnuVideoScale";
this.mnuVideoScale.Size = new System.Drawing.Size(135, 22);
this.mnuVideoScale.Size = new System.Drawing.Size(152, 22);
this.mnuVideoScale.Text = "Video Size";
//
// mnuScale1x
@ -669,10 +672,13 @@ namespace Mesen.GUI.Forms
this.mnuPrescale2xFilter,
this.mnuPrescale3xFilter,
this.mnuPrescale4xFilter,
this.mnuPrescale6xFilter,
this.mnuPrescale8xFilter,
this.mnuPrescale10xFilter,
this.toolStripMenuItem19,
this.mnuBilinearInterpolation});
this.mnuVideoFilter.Name = "mnuVideoFilter";
this.mnuVideoFilter.Size = new System.Drawing.Size(135, 22);
this.mnuVideoFilter.Size = new System.Drawing.Size(152, 22);
this.mnuVideoFilter.Text = "Video Filter";
//
// mnuNoneFilter
@ -859,6 +865,27 @@ namespace Mesen.GUI.Forms
this.mnuPrescale4xFilter.Text = "Prescale 4x";
this.mnuPrescale4xFilter.Click += new System.EventHandler(this.mnuPrescale4xFilter_Click);
//
// mnuPrescale6xFilter
//
this.mnuPrescale6xFilter.Name = "mnuPrescale6xFilter";
this.mnuPrescale6xFilter.Size = new System.Drawing.Size(206, 22);
this.mnuPrescale6xFilter.Text = "Prescale 6x";
this.mnuPrescale6xFilter.Click += new System.EventHandler(this.mnuPrescale6xFilter_Click);
//
// mnuPrescale8xFilter
//
this.mnuPrescale8xFilter.Name = "mnuPrescale8xFilter";
this.mnuPrescale8xFilter.Size = new System.Drawing.Size(206, 22);
this.mnuPrescale8xFilter.Text = "Prescale 8x";
this.mnuPrescale8xFilter.Click += new System.EventHandler(this.mnuPrescale8xFilter_Click);
//
// mnuPrescale10xFilter
//
this.mnuPrescale10xFilter.Name = "mnuPrescale10xFilter";
this.mnuPrescale10xFilter.Size = new System.Drawing.Size(206, 22);
this.mnuPrescale10xFilter.Text = "Prescale 10x";
this.mnuPrescale10xFilter.Click += new System.EventHandler(this.mnuPrescale10xFilter_Click);
//
// toolStripMenuItem19
//
this.toolStripMenuItem19.Name = "toolStripMenuItem19";
@ -881,47 +908,47 @@ namespace Mesen.GUI.Forms
this.mnuRegionDendy});
this.mnuRegion.Image = global::Mesen.GUI.Properties.Resources.Globe;
this.mnuRegion.Name = "mnuRegion";
this.mnuRegion.Size = new System.Drawing.Size(135, 22);
this.mnuRegion.Size = new System.Drawing.Size(152, 22);
this.mnuRegion.Text = "Region";
//
// mnuRegionAuto
//
this.mnuRegionAuto.Name = "mnuRegionAuto";
this.mnuRegionAuto.Size = new System.Drawing.Size(108, 22);
this.mnuRegionAuto.Size = new System.Drawing.Size(152, 22);
this.mnuRegionAuto.Text = "Auto";
this.mnuRegionAuto.Click += new System.EventHandler(this.mnuRegion_Click);
//
// mnuRegionNtsc
//
this.mnuRegionNtsc.Name = "mnuRegionNtsc";
this.mnuRegionNtsc.Size = new System.Drawing.Size(108, 22);
this.mnuRegionNtsc.Size = new System.Drawing.Size(152, 22);
this.mnuRegionNtsc.Text = "NTSC";
this.mnuRegionNtsc.Click += new System.EventHandler(this.mnuRegion_Click);
//
// mnuRegionPal
//
this.mnuRegionPal.Name = "mnuRegionPal";
this.mnuRegionPal.Size = new System.Drawing.Size(108, 22);
this.mnuRegionPal.Size = new System.Drawing.Size(152, 22);
this.mnuRegionPal.Text = "PAL";
this.mnuRegionPal.Click += new System.EventHandler(this.mnuRegion_Click);
//
// mnuRegionDendy
//
this.mnuRegionDendy.Name = "mnuRegionDendy";
this.mnuRegionDendy.Size = new System.Drawing.Size(108, 22);
this.mnuRegionDendy.Size = new System.Drawing.Size(152, 22);
this.mnuRegionDendy.Text = "Dendy";
this.mnuRegionDendy.Click += new System.EventHandler(this.mnuRegion_Click);
//
// toolStripMenuItem10
//
this.toolStripMenuItem10.Name = "toolStripMenuItem10";
this.toolStripMenuItem10.Size = new System.Drawing.Size(132, 6);
this.toolStripMenuItem10.Size = new System.Drawing.Size(149, 6);
//
// mnuAudioConfig
//
this.mnuAudioConfig.Image = global::Mesen.GUI.Properties.Resources.Audio;
this.mnuAudioConfig.Name = "mnuAudioConfig";
this.mnuAudioConfig.Size = new System.Drawing.Size(135, 22);
this.mnuAudioConfig.Size = new System.Drawing.Size(152, 22);
this.mnuAudioConfig.Text = "Audio";
this.mnuAudioConfig.Click += new System.EventHandler(this.mnuAudioConfig_Click);
//
@ -929,7 +956,7 @@ namespace Mesen.GUI.Forms
//
this.mnuInput.Image = global::Mesen.GUI.Properties.Resources.Controller;
this.mnuInput.Name = "mnuInput";
this.mnuInput.Size = new System.Drawing.Size(135, 22);
this.mnuInput.Size = new System.Drawing.Size(152, 22);
this.mnuInput.Text = "Input";
this.mnuInput.Click += new System.EventHandler(this.mnuInput_Click);
//
@ -937,7 +964,7 @@ namespace Mesen.GUI.Forms
//
this.mnuVideoConfig.Image = global::Mesen.GUI.Properties.Resources.Video;
this.mnuVideoConfig.Name = "mnuVideoConfig";
this.mnuVideoConfig.Size = new System.Drawing.Size(135, 22);
this.mnuVideoConfig.Size = new System.Drawing.Size(152, 22);
this.mnuVideoConfig.Text = "Video";
this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click);
//
@ -945,20 +972,20 @@ namespace Mesen.GUI.Forms
//
this.mnuEmulationConfig.Image = global::Mesen.GUI.Properties.Resources.DipSwitches;
this.mnuEmulationConfig.Name = "mnuEmulationConfig";
this.mnuEmulationConfig.Size = new System.Drawing.Size(135, 22);
this.mnuEmulationConfig.Size = new System.Drawing.Size(152, 22);
this.mnuEmulationConfig.Text = "Emulation";
this.mnuEmulationConfig.Click += new System.EventHandler(this.mnuEmulationConfig_Click);
//
// toolStripMenuItem11
//
this.toolStripMenuItem11.Name = "toolStripMenuItem11";
this.toolStripMenuItem11.Size = new System.Drawing.Size(132, 6);
this.toolStripMenuItem11.Size = new System.Drawing.Size(149, 6);
//
// mnuPreferences
//
this.mnuPreferences.Image = global::Mesen.GUI.Properties.Resources.Cog;
this.mnuPreferences.Name = "mnuPreferences";
this.mnuPreferences.Size = new System.Drawing.Size(135, 22);
this.mnuPreferences.Size = new System.Drawing.Size(152, 22);
this.mnuPreferences.Text = "Preferences";
this.mnuPreferences.Click += new System.EventHandler(this.mnuPreferences_Click);
//
@ -1550,6 +1577,9 @@ namespace Mesen.GUI.Forms
private System.Windows.Forms.ToolStripMenuItem mnuAviRecord;
private System.Windows.Forms.ToolStripMenuItem mnuAviStop;
private System.Windows.Forms.ToolStripMenuItem mnuHelpWindow;
private System.Windows.Forms.ToolStripMenuItem mnuPrescale6xFilter;
private System.Windows.Forms.ToolStripMenuItem mnuPrescale8xFilter;
private System.Windows.Forms.ToolStripMenuItem mnuPrescale10xFilter;
}
}

18
GUI.NET/Forms/frmMain.cs
View file

@ -1202,6 +1202,9 @@ namespace Mesen.GUI.Forms
mnuPrescale2xFilter.Checked = (filterType == VideoFilterType.Prescale2x);
mnuPrescale3xFilter.Checked = (filterType == VideoFilterType.Prescale3x);
mnuPrescale4xFilter.Checked = (filterType == VideoFilterType.Prescale4x);
mnuPrescale6xFilter.Checked = (filterType == VideoFilterType.Prescale6x);
mnuPrescale8xFilter.Checked = (filterType == VideoFilterType.Prescale8x);
mnuPrescale10xFilter.Checked = (filterType == VideoFilterType.Prescale10x);
ConfigManager.Config.VideoInfo.VideoFilter = filterType;
ConfigManager.ApplyChanges();
@ -1325,6 +1328,21 @@ namespace Mesen.GUI.Forms
SetVideoFilter(VideoFilterType.Prescale4x);
}
private void mnuPrescale6xFilter_Click(object sender, EventArgs e)
{
SetVideoFilter(VideoFilterType.Prescale6x);
}
private void mnuPrescale8xFilter_Click(object sender, EventArgs e)
{
SetVideoFilter(VideoFilterType.Prescale8x);
}
private void mnuPrescale10xFilter_Click(object sender, EventArgs e)
{
SetVideoFilter(VideoFilterType.Prescale10x);
}
private void mnuNtscBisqwitFullFilter_Click(object sender, EventArgs e)
{
SetVideoFilter(VideoFilterType.BisqwitNtsc);

3
GUI.NET/InteropEmu.cs
View file

@ -1270,6 +1270,9 @@ namespace Mesen.GUI
Prescale2x = 19,
Prescale3x = 20,
Prescale4x = 21,
Prescale6x = 22,
Prescale8x = 23,
Prescale10x = 24,
}
public enum VideoResizeFilter

3
PGOHelper/PGOHelper.cpp
View file

@ -27,6 +27,9 @@ enum class VideoFilterType
Prescale2x = 19,
Prescale3x = 20,
Prescale4x = 21,
Prescale6x = 22,
Prescale8x = 23,
Prescale10x = 24,
HdPack = 999
};