diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs index 5afaa53bf6..e0cc7d6a36 100644 --- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs @@ -48,6 +48,7 @@ this.GLideN64Tab = new System.Windows.Forms.TabPage(); this.tabControl3 = new System.Windows.Forms.TabControl(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.GLideN64_FXAA = new System.Windows.Forms.CheckBox(); this.label88 = new System.Windows.Forms.Label(); this.GLideN64_GammaCorrectionLevel = new System.Windows.Forms.TextBox(); this.GLideN64_ForceGammaCorrection = new System.Windows.Forms.CheckBox(); @@ -361,7 +362,8 @@ this.SaveButton = new System.Windows.Forms.Button(); this.CancelBT = new System.Windows.Forms.Button(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.GLideN64_FXAA = new System.Windows.Forms.CheckBox(); + this.GLideN64_ShowInternalResolution = new System.Windows.Forms.CheckBox(); + this.GLideN64_ShowRenderingResolution = new System.Windows.Forms.CheckBox(); this.N64plugintabcontrol.SuspendLayout(); this.N64vpluginglobaltab.SuspendLayout(); this.GLideN64Tab.SuspendLayout(); @@ -605,6 +607,8 @@ // // tabPage5 // + this.tabPage5.Controls.Add(this.GLideN64_ShowRenderingResolution); + this.tabPage5.Controls.Add(this.GLideN64_ShowInternalResolution); this.tabPage5.Controls.Add(this.GLideN64_FXAA); this.tabPage5.Controls.Add(this.label88); this.tabPage5.Controls.Add(this.GLideN64_GammaCorrectionLevel); @@ -637,6 +641,16 @@ this.tabPage5.Text = "General"; this.tabPage5.UseVisualStyleBackColor = true; // + // 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; + // // label88 // this.label88.AutoSize = true; @@ -4384,15 +4398,25 @@ this.toolTip1.ReshowDelay = 100; this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; // - // GLideN64_FXAA + // GLideN64_ShowInternalResolution // - 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; + this.GLideN64_ShowInternalResolution.AutoSize = true; + this.GLideN64_ShowInternalResolution.Location = new System.Drawing.Point(309, 210); + this.GLideN64_ShowInternalResolution.Name = "GLideN64_ShowInternalResolution"; + this.GLideN64_ShowInternalResolution.Size = new System.Drawing.Size(144, 17); + this.GLideN64_ShowInternalResolution.TabIndex = 80; + this.GLideN64_ShowInternalResolution.Text = "Show Internal Resolution"; + this.GLideN64_ShowInternalResolution.UseVisualStyleBackColor = true; + // + // GLideN64_ShowRenderingResolution + // + this.GLideN64_ShowRenderingResolution.AutoSize = true; + this.GLideN64_ShowRenderingResolution.Location = new System.Drawing.Point(309, 234); + this.GLideN64_ShowRenderingResolution.Name = "GLideN64_ShowRenderingResolution"; + this.GLideN64_ShowRenderingResolution.Size = new System.Drawing.Size(158, 17); + this.GLideN64_ShowRenderingResolution.TabIndex = 81; + this.GLideN64_ShowRenderingResolution.Text = "Show Rendering Resolution"; + this.GLideN64_ShowRenderingResolution.UseVisualStyleBackColor = true; // // N64VideoPluginconfig // @@ -4788,5 +4812,7 @@ private System.Windows.Forms.Label label89; private System.Windows.Forms.TextBox GLideN64_UseNativeResolutionFactor; private System.Windows.Forms.CheckBox GLideN64_FXAA; + private System.Windows.Forms.CheckBox GLideN64_ShowRenderingResolution; + private System.Windows.Forms.CheckBox GLideN64_ShowInternalResolution; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs index 569b2ba45e..1c960fd812 100644 --- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs +++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs @@ -408,6 +408,8 @@ namespace BizHawk.Client.EmuHawk _ss.GLideN64Plugin.CacheSize = GLideN64_CacheSize.Text.IsSigned() ? int.Parse(GLideN64_CacheSize.Text) : 500; + _ss.GLideN64Plugin.ShowInternalResolution = GLideN64_ShowInternalResolution.Checked; + _ss.GLideN64Plugin.ShowRenderingResolution = GLideN64_ShowRenderingResolution.Checked; _ss.GLideN64Plugin.FXAA = GLideN64_FXAA.Checked; _ss.GLideN64Plugin.EnableNoise = GLideN64_EnableNoise.Checked; _ss.GLideN64Plugin.EnableLOD = GLideN64_EnableLOD.Checked; @@ -749,6 +751,8 @@ namespace BizHawk.Client.EmuHawk .PopulateFromEnum(_ss.GLideN64Plugin.bilinearMode); GLideN64_MaxAnisotropy.Checked = _ss.GLideN64Plugin.MaxAnisotropy; GLideN64_CacheSize.Text = _ss.GLideN64Plugin.CacheSize.ToString(); + GLideN64_ShowInternalResolution.Checked = _ss.GLideN64Plugin.ShowInternalResolution; + GLideN64_ShowRenderingResolution.Checked = _ss.GLideN64Plugin.ShowRenderingResolution; GLideN64_FXAA.Checked = _ss.GLideN64Plugin.FXAA; GLideN64_EnableNoise.Checked = _ss.GLideN64Plugin.EnableNoise; GLideN64_EnableLOD.Checked = _ss.GLideN64Plugin.EnableLOD; diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx index f1e278dae9..cddb4546e3 100644 --- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx +++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx @@ -136,6 +136,9 @@ This is uneffective if Mipmapping is 0. If the given value is to high to be supported by your graphic card, the value will be the highest value your graphic card can support. Better result with Trilinear filtering + + 36 + diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs index d7fb79f012..1c4f7a199e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs @@ -21,6 +21,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 bilinearMode = bilinearFilteringMode.Standard; MaxAnisotropy = false; CacheSize = 8000; + ShowInternalResolution = false; + ShowRenderingResolution = false; FXAA = false; EnableNoise = true; EnableLOD = true; @@ -134,6 +136,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 [Description("Size of texture cache in megabytes. Good value is VRAM*3/4")] public int CacheSize { get; set; } + [DefaultValue(false)] + [DisplayName("Show Internal Resolution")] + [Description("Show internal resolution.")] + public bool ShowInternalResolution { get; set; } + + [DefaultValue(false)] + [DisplayName("Show Rendering Resolution")] + [Description("Show rendering resolution.")] + public bool ShowRenderingResolution { get; set; } + [DefaultValue(false)] [DisplayName("FXAA")] [Description("Enable Fast Approximate Anti-Aliasing.")]