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

N64 - ability to set core type in the front end

This commit is contained in:
adelikat 2014-05-10 17:30:03 +00:00
parent 3e843b2b0f
commit 3488df36c4
6 changed files with 3000 additions and 2938 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -386,7 +386,7 @@
this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
this.MainformMenu.Location = new System.Drawing.Point(0, 0);
this.MainformMenu.Name = "MainformMenu";
this.MainformMenu.Size = new System.Drawing.Size(470, 61);
this.MainformMenu.Size = new System.Drawing.Size(470, 42);
this.MainformMenu.TabIndex = 0;
this.MainformMenu.Text = "menuStrip1";
this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate);
@ -2414,15 +2414,15 @@
//
this.N64PluginSettingsMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsMenuItem.Image")));
this.N64PluginSettingsMenuItem.Name = "N64PluginSettingsMenuItem";
this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(195, 22);
this.N64PluginSettingsMenuItem.Text = "Video Plugin Settings...";
this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(181, 22);
this.N64PluginSettingsMenuItem.Text = "Plugins";
this.N64PluginSettingsMenuItem.Click += new System.EventHandler(this.N64PluginSettingsMenuItem_Click);
//
// N64ControllerSettingsMenuItem
//
this.N64ControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
this.N64ControllerSettingsMenuItem.Name = "N64ControllerSettingsMenuItem";
this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(195, 22);
this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(181, 22);
this.N64ControllerSettingsMenuItem.Text = "Controller Settings...";
this.N64ControllerSettingsMenuItem.Click += new System.EventHandler(this.N64ControllerSettingsMenuItem_Click);
//

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

File diff suppressed because it is too large Load Diff

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

@ -1,8 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Common;
namespace BizHawk.Client.EmuHawk
{
@ -50,6 +55,7 @@ namespace BizHawk.Client.EmuHawk
private void SaveSettings()
{
var s = GetS();
//Global
var video_settings = VideoResolutionComboBox.SelectedItem.ToString();
var strArr = video_settings.Split('x');
@ -280,11 +286,23 @@ namespace BizHawk.Client.EmuHawk
s.Glide64mk2Plugin.read_back_to_screen = Glide64mk2_read_back_to_screen.SelectedIndex;
s.Glide64mk2Plugin.fast_crc = Glide64mk2_fast_crc.Checked;
s.CoreType = EnumHelper.GetValueFromDescription<N64SyncSettings.CORETYPE>(
CoreTypeDropdown.SelectedItem.ToString());
PutS(s);
}
private void N64VideoPluginconfig_Load(object sender, EventArgs e)
{
var n64Settings = (N64SyncSettings)Global.Emulator.GetSyncSettings();
CoreTypeDropdown.Items.Clear();
CoreTypeDropdown.Items.AddRange(
EnumHelper.GetDescriptions<N64SyncSettings.CORETYPE>()
.ToArray());
CoreTypeDropdown.SelectedItem = EnumHelper.GetDescription(n64Settings.CoreType);
var s = GetS();
//Load Variables

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">
<value>17, 17</value>
</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">
<value>Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality).
This is uneffective if Mipmapping is 0.

12
BizHawk.Common/EnumHelper.cs
View File

@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.ComponentModel;
using System.Reflection;
@ -54,5 +56,15 @@ namespace BizHawk.Common
return default(T);
}
public static IEnumerable<string> GetDescriptions<T>()
{
var vals = Enum.GetValues(typeof(T));
foreach (var v in vals)
{
yield return GetDescription(v);
}
}
}
}

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

@ -41,6 +41,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
return new N64SyncSettings
{
CoreType = CoreType,
VidPlugin = VidPlugin,
VideoSizeX = VideoSizeX,
VideoSizeY = VideoSizeY,