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

update gliden64 and wire up fxaa

This commit is contained in:
feos 2018-09-15 12:09:27 +03:00
parent 95a68d1497
commit 6af9b6aaa5
6 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs generated
View File

@ -361,6 +361,7 @@
this.SaveButton = new System.Windows.Forms.Button(); this.SaveButton = new System.Windows.Forms.Button();
this.CancelBT = new System.Windows.Forms.Button(); this.CancelBT = new System.Windows.Forms.Button();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.GLideN64_FXAA = new System.Windows.Forms.CheckBox();
this.N64plugintabcontrol.SuspendLayout(); this.N64plugintabcontrol.SuspendLayout();
this.N64vpluginglobaltab.SuspendLayout(); this.N64vpluginglobaltab.SuspendLayout();
this.GLideN64Tab.SuspendLayout(); this.GLideN64Tab.SuspendLayout();
@ -518,7 +519,7 @@
this.label47.AutoSize = true; this.label47.AutoSize = true;
this.label47.Location = new System.Drawing.Point(10, 115); this.label47.Location = new System.Drawing.Point(10, 115);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.Size = new System.Drawing.Size(275, 13); this.label47.Size = new System.Drawing.Size(319, 13);
this.label47.TabIndex = 14; this.label47.TabIndex = 14;
this.label47.Text = "(GLideN64 is the newest pluging and has the highest compatibility)"; this.label47.Text = "(GLideN64 is the newest pluging and has the highest compatibility)";
// //
@ -604,6 +605,7 @@
// //
// tabPage5 // tabPage5
// //
this.tabPage5.Controls.Add(this.GLideN64_FXAA);
this.tabPage5.Controls.Add(this.label88); this.tabPage5.Controls.Add(this.label88);
this.tabPage5.Controls.Add(this.GLideN64_GammaCorrectionLevel); this.tabPage5.Controls.Add(this.GLideN64_GammaCorrectionLevel);
this.tabPage5.Controls.Add(this.GLideN64_ForceGammaCorrection); this.tabPage5.Controls.Add(this.GLideN64_ForceGammaCorrection);
@ -4382,6 +4384,16 @@
this.toolTip1.ReshowDelay = 100; this.toolTip1.ReshowDelay = 100;
this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
// //
// GLideN64_FXAA
//
this.GLideN64_FXAA.AutoSize = true;
this.GLideN64_FXAA.Location = new System.Drawing.Point(6, 237);
this.GLideN64_FXAA.Name = "GLideN64_FXAA";
this.GLideN64_FXAA.Size = new System.Drawing.Size(53, 17);
this.GLideN64_FXAA.TabIndex = 79;
this.GLideN64_FXAA.Text = "FXAA";
this.GLideN64_FXAA.UseVisualStyleBackColor = true;
//
// N64VideoPluginconfig // N64VideoPluginconfig
// //
this.AcceptButton = this.SaveButton; this.AcceptButton = this.SaveButton;
@ -4775,5 +4787,6 @@
private System.Windows.Forms.TextBox GLideN64_GammaCorrectionLevel; private System.Windows.Forms.TextBox GLideN64_GammaCorrectionLevel;
private System.Windows.Forms.Label label89; private System.Windows.Forms.Label label89;
private System.Windows.Forms.TextBox GLideN64_UseNativeResolutionFactor; private System.Windows.Forms.TextBox GLideN64_UseNativeResolutionFactor;
private System.Windows.Forms.CheckBox GLideN64_FXAA;
} }
} }

2
BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs
View File

@ -408,6 +408,7 @@ namespace BizHawk.Client.EmuHawk
_ss.GLideN64Plugin.CacheSize = GLideN64_CacheSize.Text.IsSigned() _ss.GLideN64Plugin.CacheSize = GLideN64_CacheSize.Text.IsSigned()
? int.Parse(GLideN64_CacheSize.Text) ? int.Parse(GLideN64_CacheSize.Text)
: 500; : 500;
_ss.GLideN64Plugin.FXAA = GLideN64_FXAA.Checked;
_ss.GLideN64Plugin.EnableNoise = GLideN64_EnableNoise.Checked; _ss.GLideN64Plugin.EnableNoise = GLideN64_EnableNoise.Checked;
_ss.GLideN64Plugin.EnableLOD = GLideN64_EnableLOD.Checked; _ss.GLideN64Plugin.EnableLOD = GLideN64_EnableLOD.Checked;
_ss.GLideN64Plugin.EnableHWLighting = GLideN64_HWLighting.Checked; _ss.GLideN64Plugin.EnableHWLighting = GLideN64_HWLighting.Checked;
@ -748,6 +749,7 @@ namespace BizHawk.Client.EmuHawk
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.bilinearFilteringMode>(_ss.GLideN64Plugin.bilinearMode); .PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.bilinearFilteringMode>(_ss.GLideN64Plugin.bilinearMode);
GLideN64_MaxAnisotropy.Checked = _ss.GLideN64Plugin.MaxAnisotropy; GLideN64_MaxAnisotropy.Checked = _ss.GLideN64Plugin.MaxAnisotropy;
GLideN64_CacheSize.Text = _ss.GLideN64Plugin.CacheSize.ToString(); GLideN64_CacheSize.Text = _ss.GLideN64Plugin.CacheSize.ToString();
GLideN64_FXAA.Checked = _ss.GLideN64Plugin.FXAA;
GLideN64_EnableNoise.Checked = _ss.GLideN64Plugin.EnableNoise; GLideN64_EnableNoise.Checked = _ss.GLideN64Plugin.EnableNoise;
GLideN64_EnableLOD.Checked = _ss.GLideN64Plugin.EnableLOD; GLideN64_EnableLOD.Checked = _ss.GLideN64Plugin.EnableLOD;
GLideN64_HWLighting.Checked = _ss.GLideN64Plugin.EnableHWLighting; GLideN64_HWLighting.Checked = _ss.GLideN64Plugin.EnableHWLighting;

3
BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx
View File

@ -120,6 +120,9 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="AnisotropicFiltering_LB.ToolTip" xml:space="preserve"> <data name="AnisotropicFiltering_LB.ToolTip" xml:space="preserve">
<value>Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality). <value>Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality).
This is uneffective if Mipmapping is 0. This is uneffective if Mipmapping is 0.

6
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs
View File

@ -21,6 +21,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
bilinearMode = bilinearFilteringMode.Standard; bilinearMode = bilinearFilteringMode.Standard;
MaxAnisotropy = false; MaxAnisotropy = false;
CacheSize = 8000; CacheSize = 8000;
FXAA = false;
EnableNoise = true; EnableNoise = true;
EnableLOD = true; EnableLOD = true;
EnableHWLighting = false; EnableHWLighting = false;
@ -133,6 +134,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
[Description("Size of texture cache in megabytes. Good value is VRAM*3/4")] [Description("Size of texture cache in megabytes. Good value is VRAM*3/4")]
public int CacheSize { get; set; } public int CacheSize { get; set; }
[DefaultValue(false)]
[DisplayName("FXAA")]
[Description("Enable Fast Approximate Anti-Aliasing.")]
public bool FXAA { get; set; }
[DefaultValue(true)] [DefaultValue(true)]
[DisplayName("Color noise emulation")] [DisplayName("Color noise emulation")]
[Description("Enable color noise emulation.")] [Description("Enable color noise emulation.")]

2
libmupen64plus/GLideN64

@ -1 +1 @@
Subproject commit fec7309dc945e7c37f707a1f8e96d6e4bff9c63d Subproject commit e222e0cb22b4bc9844d76f82de0af279dd812829

BIN
output/dll/mupen64plus-video-GLideN64.dll
View File

Binary file not shown.