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

N64 - Add Jabo settings to the old plugin config, remove menu item to the new plugin config, left the new config code still in there, since one day we will fix up things to make it work

This commit is contained in:
adelikat 2014-07-21 00:19:56 +00:00
parent ba91d38222
commit bb4f044f4e
5 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,7 +366,6 @@
this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.newPluginConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout();
this.MainStatusBar.SuspendLayout();
this.MainFormContextMenu.SuspendLayout();
@ -2466,7 +2465,6 @@
//
this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.N64PluginSettingsMenuItem,
this.newPluginConfigToolStripMenuItem,
this.N64ControllerSettingsMenuItem,
this.toolStripSeparator23,
this.N64CircularAnalogRangeMenuItem});
@ -3205,13 +3203,6 @@
this.ShowMenuContextMenuItem.Text = "Show Menu";
this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click);
//
// newPluginConfigToolStripMenuItem
//
this.newPluginConfigToolStripMenuItem.Name = "newPluginConfigToolStripMenuItem";
this.newPluginConfigToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.newPluginConfigToolStripMenuItem.Text = "New Plugin Config";
this.newPluginConfigToolStripMenuItem.Click += new System.EventHandler(this.newPluginConfigToolStripMenuItem_Click);
//
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -3589,7 +3580,6 @@
private System.Windows.Forms.ToolStripMenuItem MovieEndRecordMenuItem;
private System.Windows.Forms.ToolStripMenuItem MovieEndStopMenuItem;
private System.Windows.Forms.ToolStripMenuItem MovieEndPauseMenuItem;
private System.Windows.Forms.ToolStripMenuItem newPluginConfigToolStripMenuItem;
}
}

13
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1750,19 +1750,6 @@ namespace BizHawk.Client.EmuHawk
}
}
private void newPluginConfigToolStripMenuItem_Click(object sender, EventArgs e)
{
if (new NewN64PluginSettings().ShowDialog() == DialogResult.OK)
{
GlobalWin.MainForm.FlagNeedsReboot();
GlobalWin.OSD.AddMessage("Plugin settings saved but a core reboot is required");
}
else
{
GlobalWin.OSD.AddMessage("Plugin settings aborted");
}
}
private void N64ControllerSettingsMenuItem_Click(object sender, EventArgs e)
{
if (new N64ControllersSetup().ShowDialog() == DialogResult.OK)

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

@ -274,6 +274,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.JaboTab = new System.Windows.Forms.TabPage();
this.JaboPropertyGrid = new System.Windows.Forms.PropertyGrid();
this.N64plugintabcontrol.SuspendLayout();
this.N64vpluginglobaltab.SuspendLayout();
this.RiceTabPage.SuspendLayout();
@ -294,6 +296,7 @@
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.JaboTab.SuspendLayout();
this.SuspendLayout();
//
// N64plugintabcontrol
@ -305,6 +308,7 @@
this.N64plugintabcontrol.Controls.Add(this.RiceTabPage);
this.N64plugintabcontrol.Controls.Add(this.Glide64TabPage);
this.N64plugintabcontrol.Controls.Add(this.Glide64mk2TabPage);
this.N64plugintabcontrol.Controls.Add(this.JaboTab);
this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2);
this.N64plugintabcontrol.Name = "N64plugintabcontrol";
this.N64plugintabcontrol.SelectedIndex = 0;
@ -3239,6 +3243,26 @@
this.toolTip1.ReshowDelay = 100;
this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
//
// JaboTab
//
this.JaboTab.Controls.Add(this.JaboPropertyGrid);
this.JaboTab.Location = new System.Drawing.Point(4, 22);
this.JaboTab.Name = "JaboTab";
this.JaboTab.Size = new System.Drawing.Size(572, 343);
this.JaboTab.TabIndex = 7;
this.JaboTab.Text = "Jabo";
this.JaboTab.UseVisualStyleBackColor = true;
//
// JaboPropertyGrid
//
this.JaboPropertyGrid.Dock = System.Windows.Forms.DockStyle.Fill;
this.JaboPropertyGrid.Location = new System.Drawing.Point(0, 0);
this.JaboPropertyGrid.Name = "JaboPropertyGrid";
this.JaboPropertyGrid.PropertySort = System.Windows.Forms.PropertySort.NoSort;
this.JaboPropertyGrid.Size = new System.Drawing.Size(572, 343);
this.JaboPropertyGrid.TabIndex = 4;
this.JaboPropertyGrid.ToolbarVisible = false;
//
// N64VideoPluginconfig
//
this.AcceptButton = this.SaveButton;
@ -3287,6 +3311,7 @@
this.tabPage2.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.JaboTab.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -3537,5 +3562,7 @@
private System.Windows.Forms.ComboBox CoreTypeDropdown;
private System.Windows.Forms.Label label49;
private System.Windows.Forms.ComboBox RspTypeDropdown;
private System.Windows.Forms.TabPage JaboTab;
private System.Windows.Forms.PropertyGrid JaboPropertyGrid;
}
}

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

@ -14,6 +14,9 @@ namespace BizHawk.Client.EmuHawk
{
public partial class N64VideoPluginconfig : Form
{
N64Settings s;
N64SyncSettings ss;
public N64VideoPluginconfig()
{
InitializeComponent();
@ -86,14 +89,11 @@ namespace BizHawk.Client.EmuHawk
private void SaveSettings()
{
var s = GetSettings();
var ss = GetSyncSettings();
//Global
// Global
var video_settings = VideoResolutionComboBox.SelectedItem.ToString();
var strArr = video_settings.Split('x');
s.VideoSizeX = Int32.Parse(strArr[0].Trim());
s.VideoSizeY = Int32.Parse(strArr[1].Trim());
s.VideoSizeX = int.Parse(strArr[0].Trim());
s.VideoSizeY = int.Parse(strArr[1].Trim());
switch (PluginComboBox.Text)
{
case "Rice": ss.VideoPlugin = PluginType.Rice; break;
@ -102,7 +102,7 @@ namespace BizHawk.Client.EmuHawk
case "Jabo 1.6.1": ss.VideoPlugin = PluginType.Jabo; break;
}
//Rice
// Rice
ss.RicePlugin.NormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked;
ss.RicePlugin.FastTextureLoading = RiceFastTextureLoading_CB.Checked;
ss.RicePlugin.AccurateTextureMapping = RiceAccurateTextureMapping_CB.Checked;
@ -335,14 +335,14 @@ namespace BizHawk.Client.EmuHawk
private void N64VideoPluginconfig_Load(object sender, EventArgs e)
{
var s = GetSettings();
var ss = GetSyncSettings();
s = GetSettings();
ss = GetSyncSettings();
CoreTypeDropdown.PopulateFromEnum<N64SyncSettings.CoreType>(ss.Core);
RspTypeDropdown.PopulateFromEnum<N64SyncSettings.RspType>(ss.Rsp);
//Load Variables
//Global
JaboPropertyGrid.SelectedObject = ss.JaboPlugin;
var video_setting = s.VideoSizeX
+ " x "
+ s.VideoSizeY;

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.