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

comment out all jabo related stuff

This commit is contained in:
zeromus 2017-06-11 17:17:42 -05:00
parent 852b1f8a5e
commit 503261af35
8 changed files with 519 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
BizHawk.Client.EmuHawk/BizBox.Designer.cs generated
View File

@ -35,7 +35,7 @@
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.CoreInfoPanel = new System.Windows.Forms.Panel(); this.CoreInfoPanel = new System.Windows.Forms.Panel();
this.textBox1 = new System.Windows.Forms.TextBox(); //this.textBox1 = new System.Windows.Forms.TextBox();
this.VersionLabel = new System.Windows.Forms.Label(); this.VersionLabel = new System.Windows.Forms.Label();
this.btnCopyHash = new System.Windows.Forms.Button(); this.btnCopyHash = new System.Windows.Forms.Button();
this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.linkLabel2 = new System.Windows.Forms.LinkLabel();
@ -109,19 +109,18 @@
this.CoreInfoPanel.Name = "CoreInfoPanel"; this.CoreInfoPanel.Name = "CoreInfoPanel";
this.CoreInfoPanel.Size = new System.Drawing.Size(423, 259); this.CoreInfoPanel.Size = new System.Drawing.Size(423, 259);
this.CoreInfoPanel.TabIndex = 14; this.CoreInfoPanel.TabIndex = 14;
// ////
// textBox1 //// textBox1
// ////
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) //this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); // | System.Windows.Forms.AnchorStyles.Right)));
this.textBox1.Location = new System.Drawing.Point(13, 462); //this.textBox1.Location = new System.Drawing.Point(13, 462);
this.textBox1.Multiline = true; //this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1"; //this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true; //this.textBox1.ReadOnly = true;
this.textBox1.Size = new System.Drawing.Size(423, 33); //this.textBox1.Size = new System.Drawing.Size(423, 33);
this.textBox1.TabIndex = 16; //this.textBox1.TabIndex = 16;
this.textBox1.Text = "jabo_direct3d8_patched.dll is distributed with the special permission of the auth" + //this.textBox1.Text = "jabo_direct3d8_patched.dll is distributed with the special permission of the author.";
"or.";
// //
// VersionLabel // VersionLabel
// //
@ -189,7 +188,7 @@
this.Controls.Add(this.linkLabel3); this.Controls.Add(this.linkLabel3);
this.Controls.Add(this.linkLabel2); this.Controls.Add(this.linkLabel2);
this.Controls.Add(this.btnCopyHash); this.Controls.Add(this.btnCopyHash);
this.Controls.Add(this.textBox1); //this.Controls.Add(this.textBox1);
this.Controls.Add(this.CoreInfoPanel); this.Controls.Add(this.CoreInfoPanel);
this.Controls.Add(this.VersionLabel); this.Controls.Add(this.VersionLabel);
this.Controls.Add(this.label4); this.Controls.Add(this.label4);
@ -217,7 +216,7 @@
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.Panel CoreInfoPanel; private System.Windows.Forms.Panel CoreInfoPanel;
private System.Windows.Forms.TextBox textBox1; //private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label VersionLabel; private System.Windows.Forms.Label VersionLabel;
private System.Windows.Forms.Button btnCopyHash; private System.Windows.Forms.Button btnCopyHash;
private System.Windows.Forms.LinkLabel linkLabel2; private System.Windows.Forms.LinkLabel linkLabel2;

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

@ -275,35 +275,35 @@
this.label58 = new System.Windows.Forms.Label(); this.label58 = new System.Windows.Forms.Label();
this.Glide64mk2_filtering = new System.Windows.Forms.ComboBox(); this.Glide64mk2_filtering = new System.Windows.Forms.ComboBox();
this.Glide64mk2_UseDefaultHacks2 = new System.Windows.Forms.CheckBox(); this.Glide64mk2_UseDefaultHacks2 = new System.Windows.Forms.CheckBox();
this.JaboTab = new System.Windows.Forms.TabPage(); //this.JaboTab = new System.Windows.Forms.TabPage();
this.JaboPerGameHacksGroupBox = new System.Windows.Forms.GroupBox(); //this.JaboPerGameHacksGroupBox = new System.Windows.Forms.GroupBox();
this.label71 = new System.Windows.Forms.Label(); this.label71 = new System.Windows.Forms.Label();
this.label70 = new System.Windows.Forms.Label(); this.label70 = new System.Windows.Forms.Label();
this.JaboClearModeDropDown = new System.Windows.Forms.ComboBox(); //this.JaboClearModeDropDown = new System.Windows.Forms.ComboBox();
this.label69 = new System.Windows.Forms.Label(); this.label69 = new System.Windows.Forms.Label();
this.JaboUseForGameCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboUseForGameCheckbox = new System.Windows.Forms.CheckBox();
this.label68 = new System.Windows.Forms.Label(); this.label68 = new System.Windows.Forms.Label();
this.JaboCopyFrameBufferCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboCopyFrameBufferCheckbox = new System.Windows.Forms.CheckBox();
this.label67 = new System.Windows.Forms.Label(); this.label67 = new System.Windows.Forms.Label();
this.JaboZCompareCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboZCompareCheckbox = new System.Windows.Forms.CheckBox();
this.label66 = new System.Windows.Forms.Label(); this.label66 = new System.Windows.Forms.Label();
this.JaboDirect3DPipelineCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboDirect3DPipelineCheckbox = new System.Windows.Forms.CheckBox();
this.label65 = new System.Windows.Forms.Label(); this.label65 = new System.Windows.Forms.Label();
this.JaboAlphaBlendingCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboAlphaBlendingCheckbox = new System.Windows.Forms.CheckBox();
this.label64 = new System.Windows.Forms.Label(); this.label64 = new System.Windows.Forms.Label();
this.JaboLegacyPixelPipelineCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboLegacyPixelPipelineCheckbox = new System.Windows.Forms.CheckBox();
this.label63 = new System.Windows.Forms.Label(); this.label63 = new System.Windows.Forms.Label();
this.label62 = new System.Windows.Forms.Label(); this.label62 = new System.Windows.Forms.Label();
this.JaboAdjustAspectRatioCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboAdjustAspectRatioCheckbox = new System.Windows.Forms.CheckBox();
this.label61 = new System.Windows.Forms.Label(); this.label61 = new System.Windows.Forms.Label();
this.JaboAntialiasingLevelDropdown = new System.Windows.Forms.ComboBox(); //this.JaboAntialiasingLevelDropdown = new System.Windows.Forms.ComboBox();
this.label60 = new System.Windows.Forms.Label(); this.label60 = new System.Windows.Forms.Label();
this.JaboTextureFilterCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboTextureFilterCheckbox = new System.Windows.Forms.CheckBox();
this.label59 = new System.Windows.Forms.Label(); this.label59 = new System.Windows.Forms.Label();
this.JaboSuper2xsalCheckbox = new System.Windows.Forms.CheckBox(); //this.JaboSuper2xsalCheckbox = new System.Windows.Forms.CheckBox();
this.JaboBrightnessBox = new System.Windows.Forms.NumericUpDown(); //this.JaboBrightnessBox = new System.Windows.Forms.NumericUpDown();
this.label57 = new System.Windows.Forms.Label(); this.label57 = new System.Windows.Forms.Label();
this.JaboAnisotropicFilteringLevelDropdown = new System.Windows.Forms.ComboBox(); //this.JaboAnisotropicFilteringLevelDropdown = new System.Windows.Forms.ComboBox();
this.label51 = new System.Windows.Forms.Label(); this.label51 = new System.Windows.Forms.Label();
this.GLideN64Tab = new System.Windows.Forms.TabPage(); this.GLideN64Tab = new System.Windows.Forms.TabPage();
this.tabControl3 = new System.Windows.Forms.TabControl(); this.tabControl3 = new System.Windows.Forms.TabControl();
@ -376,8 +376,8 @@
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.label89 = new System.Windows.Forms.Label(); this.label89 = new System.Windows.Forms.Label();
this.GLideN64_UseNativeResolutionFactor = new System.Windows.Forms.TextBox(); this.GLideN64_UseNativeResolutionFactor = new System.Windows.Forms.TextBox();
this.JaboResolutionHeightBox = new BizHawk.Client.EmuHawk.WatchValueBox(); //this.JaboResolutionHeightBox = new BizHawk.Client.EmuHawk.WatchValueBox();
this.JaboResolutionWidthBox = new BizHawk.Client.EmuHawk.WatchValueBox(); //this.JaboResolutionWidthBox = new BizHawk.Client.EmuHawk.WatchValueBox();
this.N64plugintabcontrol.SuspendLayout(); this.N64plugintabcontrol.SuspendLayout();
this.N64vpluginglobaltab.SuspendLayout(); this.N64vpluginglobaltab.SuspendLayout();
this.RiceTabPage.SuspendLayout(); this.RiceTabPage.SuspendLayout();
@ -398,9 +398,9 @@
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout(); this.tabPage3.SuspendLayout();
this.JaboTab.SuspendLayout(); //this.JaboTab.SuspendLayout();
this.JaboPerGameHacksGroupBox.SuspendLayout(); //this.JaboPerGameHacksGroupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).BeginInit(); //((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).BeginInit();
this.GLideN64Tab.SuspendLayout(); this.GLideN64Tab.SuspendLayout();
this.tabControl3.SuspendLayout(); this.tabControl3.SuspendLayout();
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
@ -417,7 +417,7 @@
this.N64plugintabcontrol.Controls.Add(this.RiceTabPage); this.N64plugintabcontrol.Controls.Add(this.RiceTabPage);
this.N64plugintabcontrol.Controls.Add(this.Glide64TabPage); this.N64plugintabcontrol.Controls.Add(this.Glide64TabPage);
this.N64plugintabcontrol.Controls.Add(this.Glide64mk2TabPage); this.N64plugintabcontrol.Controls.Add(this.Glide64mk2TabPage);
this.N64plugintabcontrol.Controls.Add(this.JaboTab); //this.N64plugintabcontrol.Controls.Add(this.JaboTab);
this.N64plugintabcontrol.Controls.Add(this.GLideN64Tab); this.N64plugintabcontrol.Controls.Add(this.GLideN64Tab);
this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2); this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2);
this.N64plugintabcontrol.Name = "N64plugintabcontrol"; this.N64plugintabcontrol.Name = "N64plugintabcontrol";
@ -583,7 +583,7 @@
"Rice", "Rice",
"Glide64", "Glide64",
"Glide64mk2", "Glide64mk2",
"Jabo 1.6.1", //"Jabo 1.6.1",
"GLideN64"}); "GLideN64"});
this.PluginComboBox.Location = new System.Drawing.Point(13, 91); this.PluginComboBox.Location = new System.Drawing.Point(13, 91);
this.PluginComboBox.Name = "PluginComboBox"; this.PluginComboBox.Name = "PluginComboBox";
@ -3369,55 +3369,55 @@
this.Glide64mk2_UseDefaultHacks2.Text = "Use defaults for current game"; this.Glide64mk2_UseDefaultHacks2.Text = "Use defaults for current game";
this.Glide64mk2_UseDefaultHacks2.UseVisualStyleBackColor = true; this.Glide64mk2_UseDefaultHacks2.UseVisualStyleBackColor = true;
this.Glide64mk2_UseDefaultHacks2.CheckedChanged += new System.EventHandler(this.Glide64mk2_UseDefaultHacks2_CheckedChanged); this.Glide64mk2_UseDefaultHacks2.CheckedChanged += new System.EventHandler(this.Glide64mk2_UseDefaultHacks2_CheckedChanged);
// ////
// JaboTab //// JaboTab
// ////
this.JaboTab.Controls.Add(this.JaboPerGameHacksGroupBox); //this.JaboTab.Controls.Add(this.JaboPerGameHacksGroupBox);
this.JaboTab.Controls.Add(this.JaboUseForGameCheckbox); //this.JaboTab.Controls.Add(this.JaboUseForGameCheckbox);
this.JaboTab.Controls.Add(this.label68); //this.JaboTab.Controls.Add(this.label68);
this.JaboTab.Controls.Add(this.JaboCopyFrameBufferCheckbox); //this.JaboTab.Controls.Add(this.JaboCopyFrameBufferCheckbox);
this.JaboTab.Controls.Add(this.label67); //this.JaboTab.Controls.Add(this.label67);
this.JaboTab.Controls.Add(this.JaboZCompareCheckbox); //this.JaboTab.Controls.Add(this.JaboZCompareCheckbox);
this.JaboTab.Controls.Add(this.label66); //this.JaboTab.Controls.Add(this.label66);
this.JaboTab.Controls.Add(this.JaboDirect3DPipelineCheckbox); //this.JaboTab.Controls.Add(this.JaboDirect3DPipelineCheckbox);
this.JaboTab.Controls.Add(this.label65); //this.JaboTab.Controls.Add(this.label65);
this.JaboTab.Controls.Add(this.JaboAlphaBlendingCheckbox); //this.JaboTab.Controls.Add(this.JaboAlphaBlendingCheckbox);
this.JaboTab.Controls.Add(this.label64); //this.JaboTab.Controls.Add(this.label64);
this.JaboTab.Controls.Add(this.JaboLegacyPixelPipelineCheckbox); //this.JaboTab.Controls.Add(this.JaboLegacyPixelPipelineCheckbox);
this.JaboTab.Controls.Add(this.label63); //this.JaboTab.Controls.Add(this.label63);
this.JaboTab.Controls.Add(this.label62); //this.JaboTab.Controls.Add(this.label62);
this.JaboTab.Controls.Add(this.JaboAdjustAspectRatioCheckbox); //this.JaboTab.Controls.Add(this.JaboAdjustAspectRatioCheckbox);
this.JaboTab.Controls.Add(this.label61); //this.JaboTab.Controls.Add(this.label61);
this.JaboTab.Controls.Add(this.JaboAntialiasingLevelDropdown); //this.JaboTab.Controls.Add(this.JaboAntialiasingLevelDropdown);
this.JaboTab.Controls.Add(this.label60); //this.JaboTab.Controls.Add(this.label60);
this.JaboTab.Controls.Add(this.JaboTextureFilterCheckbox); //this.JaboTab.Controls.Add(this.JaboTextureFilterCheckbox);
this.JaboTab.Controls.Add(this.label59); //this.JaboTab.Controls.Add(this.label59);
this.JaboTab.Controls.Add(this.JaboSuper2xsalCheckbox); //this.JaboTab.Controls.Add(this.JaboSuper2xsalCheckbox);
this.JaboTab.Controls.Add(this.JaboBrightnessBox); //this.JaboTab.Controls.Add(this.JaboBrightnessBox);
this.JaboTab.Controls.Add(this.label57); //this.JaboTab.Controls.Add(this.label57);
this.JaboTab.Controls.Add(this.JaboAnisotropicFilteringLevelDropdown); //this.JaboTab.Controls.Add(this.JaboAnisotropicFilteringLevelDropdown);
this.JaboTab.Controls.Add(this.label51); //this.JaboTab.Controls.Add(this.label51);
this.JaboTab.Location = new System.Drawing.Point(4, 22); //this.JaboTab.Location = new System.Drawing.Point(4, 22);
this.JaboTab.Name = "JaboTab"; //this.JaboTab.Name = "JaboTab";
this.JaboTab.Size = new System.Drawing.Size(572, 343); //this.JaboTab.Size = new System.Drawing.Size(572, 343);
this.JaboTab.TabIndex = 7; //this.JaboTab.TabIndex = 7;
this.JaboTab.Text = "Jabo"; //this.JaboTab.Text = "Jabo";
this.JaboTab.UseVisualStyleBackColor = true; //this.JaboTab.UseVisualStyleBackColor = true;
// ////
// JaboPerGameHacksGroupBox //// JaboPerGameHacksGroupBox
// ////
this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboResolutionHeightBox); //this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboResolutionHeightBox);
this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboResolutionWidthBox); //this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboResolutionWidthBox);
this.JaboPerGameHacksGroupBox.Controls.Add(this.label71); //this.JaboPerGameHacksGroupBox.Controls.Add(this.label71);
this.JaboPerGameHacksGroupBox.Controls.Add(this.label70); //this.JaboPerGameHacksGroupBox.Controls.Add(this.label70);
this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboClearModeDropDown); //this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboClearModeDropDown);
this.JaboPerGameHacksGroupBox.Controls.Add(this.label69); //this.JaboPerGameHacksGroupBox.Controls.Add(this.label69);
this.JaboPerGameHacksGroupBox.Location = new System.Drawing.Point(292, 36); //this.JaboPerGameHacksGroupBox.Location = new System.Drawing.Point(292, 36);
this.JaboPerGameHacksGroupBox.Name = "JaboPerGameHacksGroupBox"; //this.JaboPerGameHacksGroupBox.Name = "JaboPerGameHacksGroupBox";
this.JaboPerGameHacksGroupBox.Size = new System.Drawing.Size(271, 196); //this.JaboPerGameHacksGroupBox.Size = new System.Drawing.Size(271, 196);
this.JaboPerGameHacksGroupBox.TabIndex = 29; //this.JaboPerGameHacksGroupBox.TabIndex = 29;
this.JaboPerGameHacksGroupBox.TabStop = false; //this.JaboPerGameHacksGroupBox.TabStop = false;
this.JaboPerGameHacksGroupBox.Text = "Per game settings"; //this.JaboPerGameHacksGroupBox.Text = "Per game settings";
// //
// label71 // label71
// //
@ -3436,15 +3436,15 @@
this.label70.Size = new System.Drawing.Size(88, 13); this.label70.Size = new System.Drawing.Size(88, 13);
this.label70.TabIndex = 31; this.label70.TabIndex = 31;
this.label70.Text = "Resolution Width"; this.label70.Text = "Resolution Width";
// ////
// JaboClearModeDropDown //// JaboClearModeDropDown
// ////
this.JaboClearModeDropDown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; //this.JaboClearModeDropDown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.JaboClearModeDropDown.FormattingEnabled = true; //this.JaboClearModeDropDown.FormattingEnabled = true;
this.JaboClearModeDropDown.Location = new System.Drawing.Point(127, 30); //this.JaboClearModeDropDown.Location = new System.Drawing.Point(127, 30);
this.JaboClearModeDropDown.Name = "JaboClearModeDropDown"; //this.JaboClearModeDropDown.Name = "JaboClearModeDropDown";
this.JaboClearModeDropDown.Size = new System.Drawing.Size(138, 21); //this.JaboClearModeDropDown.Size = new System.Drawing.Size(138, 21);
this.JaboClearModeDropDown.TabIndex = 30; //this.JaboClearModeDropDown.TabIndex = 30;
// //
// label69 // label69
// //
@ -3454,17 +3454,17 @@
this.label69.Size = new System.Drawing.Size(106, 13); this.label69.Size = new System.Drawing.Size(106, 13);
this.label69.TabIndex = 0; this.label69.TabIndex = 0;
this.label69.Text = "Direct3D Clear Mode"; this.label69.Text = "Direct3D Clear Mode";
// ////
// JaboUseForGameCheckbox //// JaboUseForGameCheckbox
// ////
this.JaboUseForGameCheckbox.AutoSize = true; //this.JaboUseForGameCheckbox.AutoSize = true;
this.JaboUseForGameCheckbox.Location = new System.Drawing.Point(292, 13); //this.JaboUseForGameCheckbox.Location = new System.Drawing.Point(292, 13);
this.JaboUseForGameCheckbox.Name = "JaboUseForGameCheckbox"; //this.JaboUseForGameCheckbox.Name = "JaboUseForGameCheckbox";
this.JaboUseForGameCheckbox.Size = new System.Drawing.Size(165, 17); //this.JaboUseForGameCheckbox.Size = new System.Drawing.Size(165, 17);
this.JaboUseForGameCheckbox.TabIndex = 28; //this.JaboUseForGameCheckbox.TabIndex = 28;
this.JaboUseForGameCheckbox.Text = "Use defaults for current game"; //this.JaboUseForGameCheckbox.Text = "Use defaults for current game";
this.JaboUseForGameCheckbox.UseVisualStyleBackColor = true; //this.JaboUseForGameCheckbox.UseVisualStyleBackColor = true;
this.JaboUseForGameCheckbox.CheckedChanged += new System.EventHandler(this.JaboUseForGameCheckbox_CheckedChanged); //this.JaboUseForGameCheckbox.CheckedChanged += new System.EventHandler(this.JaboUseForGameCheckbox_CheckedChanged);
// //
// label68 // label68
// //
@ -3474,15 +3474,15 @@
this.label68.Size = new System.Drawing.Size(87, 13); this.label68.Size = new System.Drawing.Size(87, 13);
this.label68.TabIndex = 27; this.label68.TabIndex = 27;
this.label68.Text = "Copy framebuffer"; this.label68.Text = "Copy framebuffer";
// ////
// JaboCopyFrameBufferCheckbox //// JaboCopyFrameBufferCheckbox
// ////
this.JaboCopyFrameBufferCheckbox.AutoSize = true; //this.JaboCopyFrameBufferCheckbox.AutoSize = true;
this.JaboCopyFrameBufferCheckbox.Location = new System.Drawing.Point(154, 315); //this.JaboCopyFrameBufferCheckbox.Location = new System.Drawing.Point(154, 315);
this.JaboCopyFrameBufferCheckbox.Name = "JaboCopyFrameBufferCheckbox"; //this.JaboCopyFrameBufferCheckbox.Name = "JaboCopyFrameBufferCheckbox";
this.JaboCopyFrameBufferCheckbox.Size = new System.Drawing.Size(15, 14); //this.JaboCopyFrameBufferCheckbox.Size = new System.Drawing.Size(15, 14);
this.JaboCopyFrameBufferCheckbox.TabIndex = 26; //this.JaboCopyFrameBufferCheckbox.TabIndex = 26;
this.JaboCopyFrameBufferCheckbox.UseVisualStyleBackColor = true; //this.JaboCopyFrameBufferCheckbox.UseVisualStyleBackColor = true;
// //
// label67 // label67
// //
@ -3492,15 +3492,15 @@
this.label67.Size = new System.Drawing.Size(89, 13); this.label67.Size = new System.Drawing.Size(89, 13);
this.label67.TabIndex = 25; this.label67.TabIndex = 25;
this.label67.Text = "Force Z Compare"; this.label67.Text = "Force Z Compare";
// ////
// JaboZCompareCheckbox //// JaboZCompareCheckbox
// ////
this.JaboZCompareCheckbox.AutoSize = true; //this.JaboZCompareCheckbox.AutoSize = true;
this.JaboZCompareCheckbox.Location = new System.Drawing.Point(154, 285); //this.JaboZCompareCheckbox.Location = new System.Drawing.Point(154, 285);
this.JaboZCompareCheckbox.Name = "JaboZCompareCheckbox"; //this.JaboZCompareCheckbox.Name = "JaboZCompareCheckbox";
this.JaboZCompareCheckbox.Size = new System.Drawing.Size(15, 14); //this.JaboZCompareCheckbox.Size = new System.Drawing.Size(15, 14);
this.JaboZCompareCheckbox.TabIndex = 24; //this.JaboZCompareCheckbox.TabIndex = 24;
this.JaboZCompareCheckbox.UseVisualStyleBackColor = true; //this.JaboZCompareCheckbox.UseVisualStyleBackColor = true;
// //
// label66 // label66
// //
@ -3510,15 +3510,15 @@
this.label66.Size = new System.Drawing.Size(114, 13); this.label66.Size = new System.Drawing.Size(114, 13);
this.label66.TabIndex = 23; this.label66.TabIndex = 23;
this.label66.Text = "Direct3D trans pipeline"; this.label66.Text = "Direct3D trans pipeline";
// ////
// JaboDirect3DPipelineCheckbox //// JaboDirect3DPipelineCheckbox
// ////
this.JaboDirect3DPipelineCheckbox.AutoSize = true; //this.JaboDirect3DPipelineCheckbox.AutoSize = true;
this.JaboDirect3DPipelineCheckbox.Location = new System.Drawing.Point(154, 255); //this.JaboDirect3DPipelineCheckbox.Location = new System.Drawing.Point(154, 255);
this.JaboDirect3DPipelineCheckbox.Name = "JaboDirect3DPipelineCheckbox"; //this.JaboDirect3DPipelineCheckbox.Name = "JaboDirect3DPipelineCheckbox";
this.JaboDirect3DPipelineCheckbox.Size = new System.Drawing.Size(15, 14); //this.JaboDirect3DPipelineCheckbox.Size = new System.Drawing.Size(15, 14);
this.JaboDirect3DPipelineCheckbox.TabIndex = 22; //this.JaboDirect3DPipelineCheckbox.TabIndex = 22;
this.JaboDirect3DPipelineCheckbox.UseVisualStyleBackColor = true; //this.JaboDirect3DPipelineCheckbox.UseVisualStyleBackColor = true;
// //
// label65 // label65
// //
@ -3528,15 +3528,15 @@
this.label65.Size = new System.Drawing.Size(106, 13); this.label65.Size = new System.Drawing.Size(106, 13);
this.label65.TabIndex = 21; this.label65.TabIndex = 21;
this.label65.Text = "Force alpha blending"; this.label65.Text = "Force alpha blending";
// ////
// JaboAlphaBlendingCheckbox //// JaboAlphaBlendingCheckbox
// ////
this.JaboAlphaBlendingCheckbox.AutoSize = true; //this.JaboAlphaBlendingCheckbox.AutoSize = true;
this.JaboAlphaBlendingCheckbox.Location = new System.Drawing.Point(154, 225); //this.JaboAlphaBlendingCheckbox.Location = new System.Drawing.Point(154, 225);
this.JaboAlphaBlendingCheckbox.Name = "JaboAlphaBlendingCheckbox"; //this.JaboAlphaBlendingCheckbox.Name = "JaboAlphaBlendingCheckbox";
this.JaboAlphaBlendingCheckbox.Size = new System.Drawing.Size(15, 14); //this.JaboAlphaBlendingCheckbox.Size = new System.Drawing.Size(15, 14);
this.JaboAlphaBlendingCheckbox.TabIndex = 20; //this.JaboAlphaBlendingCheckbox.TabIndex = 20;
this.JaboAlphaBlendingCheckbox.UseVisualStyleBackColor = true; //this.JaboAlphaBlendingCheckbox.UseVisualStyleBackColor = true;
// //
// label64 // label64
// //
@ -3546,15 +3546,15 @@
this.label64.Size = new System.Drawing.Size(123, 13); this.label64.Size = new System.Drawing.Size(123, 13);
this.label64.TabIndex = 19; this.label64.TabIndex = 19;
this.label64.Text = "Use legacy pixel pipeline"; this.label64.Text = "Use legacy pixel pipeline";
// ////
// JaboLegacyPixelPipelineCheckbox //// JaboLegacyPixelPipelineCheckbox
// ////
this.JaboLegacyPixelPipelineCheckbox.AutoSize = true; //this.JaboLegacyPixelPipelineCheckbox.AutoSize = true;
this.JaboLegacyPixelPipelineCheckbox.Location = new System.Drawing.Point(154, 195); //this.JaboLegacyPixelPipelineCheckbox.Location = new System.Drawing.Point(154, 195);
this.JaboLegacyPixelPipelineCheckbox.Name = "JaboLegacyPixelPipelineCheckbox"; //this.JaboLegacyPixelPipelineCheckbox.Name = "JaboLegacyPixelPipelineCheckbox";
this.JaboLegacyPixelPipelineCheckbox.Size = new System.Drawing.Size(15, 14); //this.JaboLegacyPixelPipelineCheckbox.Size = new System.Drawing.Size(15, 14);
this.JaboLegacyPixelPipelineCheckbox.TabIndex = 18; //this.JaboLegacyPixelPipelineCheckbox.TabIndex = 18;
this.JaboLegacyPixelPipelineCheckbox.UseVisualStyleBackColor = true; //this.JaboLegacyPixelPipelineCheckbox.UseVisualStyleBackColor = true;
// //
// label63 // label63
// //
@ -3573,15 +3573,15 @@
this.label62.Size = new System.Drawing.Size(123, 13); this.label62.Size = new System.Drawing.Size(123, 13);
this.label62.TabIndex = 16; this.label62.TabIndex = 16;
this.label62.Text = "Adjust game aspect ratio"; this.label62.Text = "Adjust game aspect ratio";
// ////
// JaboAdjustAspectRatioCheckbox //// JaboAdjustAspectRatioCheckbox
// ////
this.JaboAdjustAspectRatioCheckbox.AutoSize = true; //this.JaboAdjustAspectRatioCheckbox.AutoSize = true;
this.JaboAdjustAspectRatioCheckbox.Location = new System.Drawing.Point(154, 165); //this.JaboAdjustAspectRatioCheckbox.Location = new System.Drawing.Point(154, 165);
this.JaboAdjustAspectRatioCheckbox.Name = "JaboAdjustAspectRatioCheckbox"; //this.JaboAdjustAspectRatioCheckbox.Name = "JaboAdjustAspectRatioCheckbox";
this.JaboAdjustAspectRatioCheckbox.Size = new System.Drawing.Size(15, 14); //this.JaboAdjustAspectRatioCheckbox.Size = new System.Drawing.Size(15, 14);
this.JaboAdjustAspectRatioCheckbox.TabIndex = 15; //this.JaboAdjustAspectRatioCheckbox.TabIndex = 15;
this.JaboAdjustAspectRatioCheckbox.UseVisualStyleBackColor = true; //this.JaboAdjustAspectRatioCheckbox.UseVisualStyleBackColor = true;
// //
// label61 // label61
// //
@ -3591,15 +3591,15 @@
this.label61.Size = new System.Drawing.Size(89, 13); this.label61.Size = new System.Drawing.Size(89, 13);
this.label61.TabIndex = 14; this.label61.TabIndex = 14;
this.label61.Text = "Antialiasing Level"; this.label61.Text = "Antialiasing Level";
// ////
// JaboAntialiasingLevelDropdown //// JaboAntialiasingLevelDropdown
// ////
this.JaboAntialiasingLevelDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; //this.JaboAntialiasingLevelDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.JaboAntialiasingLevelDropdown.FormattingEnabled = true; //this.JaboAntialiasingLevelDropdown.FormattingEnabled = true;
this.JaboAntialiasingLevelDropdown.Location = new System.Drawing.Point(154, 45); //this.JaboAntialiasingLevelDropdown.Location = new System.Drawing.Point(154, 45);
this.JaboAntialiasingLevelDropdown.Name = "JaboAntialiasingLevelDropdown"; //this.JaboAntialiasingLevelDropdown.Name = "JaboAntialiasingLevelDropdown";
this.JaboAntialiasingLevelDropdown.Size = new System.Drawing.Size(121, 21); //this.JaboAntialiasingLevelDropdown.Size = new System.Drawing.Size(121, 21);
this.JaboAntialiasingLevelDropdown.TabIndex = 13; //this.JaboAntialiasingLevelDropdown.TabIndex = 13;
// //
// label60 // label60
// //
@ -3609,15 +3609,15 @@
this.label60.Size = new System.Drawing.Size(117, 13); this.label60.Size = new System.Drawing.Size(117, 13);
this.label60.TabIndex = 12; this.label60.TabIndex = 12;
this.label60.Text = "Always use texture filter"; this.label60.Text = "Always use texture filter";
// ////
// JaboTextureFilterCheckbox //// JaboTextureFilterCheckbox
// ////
this.JaboTextureFilterCheckbox.AutoSize = true; //this.JaboTextureFilterCheckbox.AutoSize = true;
this.JaboTextureFilterCheckbox.Location = new System.Drawing.Point(154, 135); //this.JaboTextureFilterCheckbox.Location = new System.Drawing.Point(154, 135);
this.JaboTextureFilterCheckbox.Name = "JaboTextureFilterCheckbox"; //this.JaboTextureFilterCheckbox.Name = "JaboTextureFilterCheckbox";
this.JaboTextureFilterCheckbox.Size = new System.Drawing.Size(15, 14); //this.JaboTextureFilterCheckbox.Size = new System.Drawing.Size(15, 14);
this.JaboTextureFilterCheckbox.TabIndex = 11; //this.JaboTextureFilterCheckbox.TabIndex = 11;
this.JaboTextureFilterCheckbox.UseVisualStyleBackColor = true; //this.JaboTextureFilterCheckbox.UseVisualStyleBackColor = true;
// //
// label59 // label59
// //
@ -3627,42 +3627,42 @@
this.label59.Size = new System.Drawing.Size(62, 13); this.label59.Size = new System.Drawing.Size(62, 13);
this.label59.TabIndex = 10; this.label59.TabIndex = 10;
this.label59.Text = "Super 2xsal"; this.label59.Text = "Super 2xsal";
// ////
// JaboSuper2xsalCheckbox //// JaboSuper2xsalCheckbox
// ////
this.JaboSuper2xsalCheckbox.AutoSize = true; //this.JaboSuper2xsalCheckbox.AutoSize = true;
this.JaboSuper2xsalCheckbox.Location = new System.Drawing.Point(154, 105); //this.JaboSuper2xsalCheckbox.Location = new System.Drawing.Point(154, 105);
this.JaboSuper2xsalCheckbox.Name = "JaboSuper2xsalCheckbox"; //this.JaboSuper2xsalCheckbox.Name = "JaboSuper2xsalCheckbox";
this.JaboSuper2xsalCheckbox.Size = new System.Drawing.Size(15, 14); //this.JaboSuper2xsalCheckbox.Size = new System.Drawing.Size(15, 14);
this.JaboSuper2xsalCheckbox.TabIndex = 9; //this.JaboSuper2xsalCheckbox.TabIndex = 9;
this.JaboSuper2xsalCheckbox.UseVisualStyleBackColor = true; //this.JaboSuper2xsalCheckbox.UseVisualStyleBackColor = true;
// ////
// JaboBrightnessBox //// JaboBrightnessBox
// ////
this.JaboBrightnessBox.Increment = new decimal(new int[] { //this.JaboBrightnessBox.Increment = new decimal(new int[] {
3, // 3,
0, // 0,
0, // 0,
0}); // 0});
this.JaboBrightnessBox.Location = new System.Drawing.Point(154, 75); //this.JaboBrightnessBox.Location = new System.Drawing.Point(154, 75);
this.JaboBrightnessBox.Maximum = new decimal(new int[] { //this.JaboBrightnessBox.Maximum = new decimal(new int[] {
190, // 190,
0, // 0,
0, // 0,
0}); // 0});
this.JaboBrightnessBox.Minimum = new decimal(new int[] { //this.JaboBrightnessBox.Minimum = new decimal(new int[] {
100, // 100,
0, // 0,
0, // 0,
0}); // 0});
this.JaboBrightnessBox.Name = "JaboBrightnessBox"; //this.JaboBrightnessBox.Name = "JaboBrightnessBox";
this.JaboBrightnessBox.Size = new System.Drawing.Size(48, 20); //this.JaboBrightnessBox.Size = new System.Drawing.Size(48, 20);
this.JaboBrightnessBox.TabIndex = 8; //this.JaboBrightnessBox.TabIndex = 8;
this.JaboBrightnessBox.Value = new decimal(new int[] { //this.JaboBrightnessBox.Value = new decimal(new int[] {
100, // 100,
0, // 0,
0, // 0,
0}); // 0});
// //
// label57 // label57
// //
@ -3672,15 +3672,15 @@
this.label57.Size = new System.Drawing.Size(56, 13); this.label57.Size = new System.Drawing.Size(56, 13);
this.label57.TabIndex = 7; this.label57.TabIndex = 7;
this.label57.Text = "Brightness"; this.label57.Text = "Brightness";
// ////
// JaboAnisotropicFilteringLevelDropdown //// JaboAnisotropicFilteringLevelDropdown
// ////
this.JaboAnisotropicFilteringLevelDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; //this.JaboAnisotropicFilteringLevelDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.JaboAnisotropicFilteringLevelDropdown.FormattingEnabled = true; //this.JaboAnisotropicFilteringLevelDropdown.FormattingEnabled = true;
this.JaboAnisotropicFilteringLevelDropdown.Location = new System.Drawing.Point(154, 12); //this.JaboAnisotropicFilteringLevelDropdown.Location = new System.Drawing.Point(154, 12);
this.JaboAnisotropicFilteringLevelDropdown.Name = "JaboAnisotropicFilteringLevelDropdown"; //this.JaboAnisotropicFilteringLevelDropdown.Name = "JaboAnisotropicFilteringLevelDropdown";
this.JaboAnisotropicFilteringLevelDropdown.Size = new System.Drawing.Size(121, 21); //this.JaboAnisotropicFilteringLevelDropdown.Size = new System.Drawing.Size(121, 21);
this.JaboAnisotropicFilteringLevelDropdown.TabIndex = 6; //this.JaboAnisotropicFilteringLevelDropdown.TabIndex = 6;
// //
// label51 // label51
// //
@ -4585,32 +4585,32 @@
this.GLideN64_UseNativeResolutionFactor.Name = "GLideN64_UseNativeResolutionFactor"; this.GLideN64_UseNativeResolutionFactor.Name = "GLideN64_UseNativeResolutionFactor";
this.GLideN64_UseNativeResolutionFactor.Size = new System.Drawing.Size(32, 20); this.GLideN64_UseNativeResolutionFactor.Size = new System.Drawing.Size(32, 20);
this.GLideN64_UseNativeResolutionFactor.TabIndex = 77; this.GLideN64_UseNativeResolutionFactor.TabIndex = 77;
// ////
// JaboResolutionHeightBox //// JaboResolutionHeightBox
// ////
this.JaboResolutionHeightBox.ByteSize = BizHawk.Client.Common.WatchSize.Byte; //this.JaboResolutionHeightBox.ByteSize = BizHawk.Client.Common.WatchSize.Byte;
this.JaboResolutionHeightBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; //this.JaboResolutionHeightBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.JaboResolutionHeightBox.Location = new System.Drawing.Point(127, 90); //this.JaboResolutionHeightBox.Location = new System.Drawing.Point(127, 90);
this.JaboResolutionHeightBox.MaxLength = 4; //this.JaboResolutionHeightBox.MaxLength = 4;
this.JaboResolutionHeightBox.Name = "JaboResolutionHeightBox"; //this.JaboResolutionHeightBox.Name = "JaboResolutionHeightBox";
this.JaboResolutionHeightBox.Nullable = false; //this.JaboResolutionHeightBox.Nullable = false;
this.JaboResolutionHeightBox.Size = new System.Drawing.Size(52, 20); //this.JaboResolutionHeightBox.Size = new System.Drawing.Size(52, 20);
this.JaboResolutionHeightBox.TabIndex = 34; //this.JaboResolutionHeightBox.TabIndex = 34;
this.JaboResolutionHeightBox.Text = "0"; //this.JaboResolutionHeightBox.Text = "0";
this.JaboResolutionHeightBox.Type = BizHawk.Client.Common.DisplayType.Signed; //this.JaboResolutionHeightBox.Type = BizHawk.Client.Common.DisplayType.Signed;
// ////
// JaboResolutionWidthBox //// JaboResolutionWidthBox
// ////
this.JaboResolutionWidthBox.ByteSize = BizHawk.Client.Common.WatchSize.Byte; //this.JaboResolutionWidthBox.ByteSize = BizHawk.Client.Common.WatchSize.Byte;
this.JaboResolutionWidthBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; //this.JaboResolutionWidthBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.JaboResolutionWidthBox.Location = new System.Drawing.Point(127, 60); //this.JaboResolutionWidthBox.Location = new System.Drawing.Point(127, 60);
this.JaboResolutionWidthBox.MaxLength = 4; //this.JaboResolutionWidthBox.MaxLength = 4;
this.JaboResolutionWidthBox.Name = "JaboResolutionWidthBox"; //this.JaboResolutionWidthBox.Name = "JaboResolutionWidthBox";
this.JaboResolutionWidthBox.Nullable = false; //this.JaboResolutionWidthBox.Nullable = false;
this.JaboResolutionWidthBox.Size = new System.Drawing.Size(52, 20); //this.JaboResolutionWidthBox.Size = new System.Drawing.Size(52, 20);
this.JaboResolutionWidthBox.TabIndex = 33; //this.JaboResolutionWidthBox.TabIndex = 33;
this.JaboResolutionWidthBox.Text = "0"; //this.JaboResolutionWidthBox.Text = "0";
this.JaboResolutionWidthBox.Type = BizHawk.Client.Common.DisplayType.Signed; //this.JaboResolutionWidthBox.Type = BizHawk.Client.Common.DisplayType.Signed;
// //
// N64VideoPluginconfig // N64VideoPluginconfig
// //
@ -4660,11 +4660,11 @@
this.tabPage2.PerformLayout(); this.tabPage2.PerformLayout();
this.tabPage3.ResumeLayout(false); this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout(); this.tabPage3.PerformLayout();
this.JaboTab.ResumeLayout(false); //this.JaboTab.ResumeLayout(false);
this.JaboTab.PerformLayout(); //this.JaboTab.PerformLayout();
this.JaboPerGameHacksGroupBox.ResumeLayout(false); //this.JaboPerGameHacksGroupBox.ResumeLayout(false);
this.JaboPerGameHacksGroupBox.PerformLayout(); //this.JaboPerGameHacksGroupBox.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).EndInit(); //((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).EndInit();
this.GLideN64Tab.ResumeLayout(false); this.GLideN64Tab.ResumeLayout(false);
this.tabControl3.ResumeLayout(false); this.tabControl3.ResumeLayout(false);
this.tabPage5.ResumeLayout(false); this.tabPage5.ResumeLayout(false);
@ -4923,37 +4923,37 @@
private System.Windows.Forms.ComboBox CoreTypeDropdown; private System.Windows.Forms.ComboBox CoreTypeDropdown;
private System.Windows.Forms.Label label49; private System.Windows.Forms.Label label49;
private System.Windows.Forms.ComboBox RspTypeDropdown; private System.Windows.Forms.ComboBox RspTypeDropdown;
private System.Windows.Forms.TabPage JaboTab; //private System.Windows.Forms.TabPage JaboTab;
private System.Windows.Forms.Label label51; private System.Windows.Forms.Label label51;
private System.Windows.Forms.ComboBox JaboAnisotropicFilteringLevelDropdown; //private System.Windows.Forms.ComboBox JaboAnisotropicFilteringLevelDropdown;
private System.Windows.Forms.Label label57; private System.Windows.Forms.Label label57;
private System.Windows.Forms.NumericUpDown JaboBrightnessBox; //private System.Windows.Forms.NumericUpDown JaboBrightnessBox;
private System.Windows.Forms.Label label59; private System.Windows.Forms.Label label59;
private System.Windows.Forms.CheckBox JaboSuper2xsalCheckbox; //private System.Windows.Forms.CheckBox JaboSuper2xsalCheckbox;
private System.Windows.Forms.Label label60; private System.Windows.Forms.Label label60;
private System.Windows.Forms.CheckBox JaboTextureFilterCheckbox; //private System.Windows.Forms.CheckBox JaboTextureFilterCheckbox;
private System.Windows.Forms.Label label61; private System.Windows.Forms.Label label61;
private System.Windows.Forms.ComboBox JaboAntialiasingLevelDropdown; //private System.Windows.Forms.ComboBox JaboAntialiasingLevelDropdown;
private System.Windows.Forms.CheckBox JaboAdjustAspectRatioCheckbox; //private System.Windows.Forms.CheckBox JaboAdjustAspectRatioCheckbox;
private System.Windows.Forms.Label label62; private System.Windows.Forms.Label label62;
private System.Windows.Forms.Label label63; private System.Windows.Forms.Label label63;
private System.Windows.Forms.Label label64; private System.Windows.Forms.Label label64;
private System.Windows.Forms.CheckBox JaboLegacyPixelPipelineCheckbox; //private System.Windows.Forms.CheckBox JaboLegacyPixelPipelineCheckbox;
private System.Windows.Forms.Label label65; private System.Windows.Forms.Label label65;
private System.Windows.Forms.CheckBox JaboAlphaBlendingCheckbox; //private System.Windows.Forms.CheckBox JaboAlphaBlendingCheckbox;
private System.Windows.Forms.Label label66; private System.Windows.Forms.Label label66;
private System.Windows.Forms.CheckBox JaboDirect3DPipelineCheckbox; //private System.Windows.Forms.CheckBox JaboDirect3DPipelineCheckbox;
private System.Windows.Forms.Label label67; private System.Windows.Forms.Label label67;
private System.Windows.Forms.CheckBox JaboZCompareCheckbox; //private System.Windows.Forms.CheckBox JaboZCompareCheckbox;
private System.Windows.Forms.Label label68; private System.Windows.Forms.Label label68;
private System.Windows.Forms.CheckBox JaboCopyFrameBufferCheckbox; //private System.Windows.Forms.CheckBox JaboCopyFrameBufferCheckbox;
private System.Windows.Forms.GroupBox JaboPerGameHacksGroupBox; //private System.Windows.Forms.GroupBox JaboPerGameHacksGroupBox;
private System.Windows.Forms.CheckBox JaboUseForGameCheckbox; //private System.Windows.Forms.CheckBox JaboUseForGameCheckbox;
private System.Windows.Forms.Label label69; private System.Windows.Forms.Label label69;
private System.Windows.Forms.ComboBox JaboClearModeDropDown; //private System.Windows.Forms.ComboBox JaboClearModeDropDown;
private System.Windows.Forms.Label label70; private System.Windows.Forms.Label label70;
private WatchValueBox JaboResolutionHeightBox; //private WatchValueBox JaboResolutionHeightBox;
private WatchValueBox JaboResolutionWidthBox; //private WatchValueBox JaboResolutionWidthBox;
private System.Windows.Forms.Label label71; private System.Windows.Forms.Label label71;
private System.Windows.Forms.Label LabelVideoResolutionY; private System.Windows.Forms.Label LabelVideoResolutionY;
private System.Windows.Forms.Label LabelVideoResolutionX; private System.Windows.Forms.Label LabelVideoResolutionX;

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

@ -33,21 +33,21 @@ namespace BizHawk.Client.EmuHawk
"Custom" "Custom"
}; };
private static readonly string[] ValidResolutionsJabo = //private static readonly string[] ValidResolutionsJabo =
{ //{
"320 x 240", // "320 x 240",
"400 x 300", // "400 x 300",
"512 x 384", // "512 x 384",
"640 x 480", // "640 x 480",
"800 x 600", // "800 x 600",
"1024 x 768", // "1024 x 768",
"1152 x 864", // "1152 x 864",
"1280 x 960", // "1280 x 960",
"1600 x 1200", // "1600 x 1200",
"848 x 480", // "848 x 480",
"1024 x 576", // "1024 x 576",
"1380 x 768" // "1380 x 768"
}; //};
private bool _programmaticallyChangingPluginComboBox = false; private bool _programmaticallyChangingPluginComboBox = false;
@ -149,40 +149,40 @@ namespace BizHawk.Client.EmuHawk
case "Glide64mk2": case "Glide64mk2":
_ss.VideoPlugin = PluginType.GlideMk2; _ss.VideoPlugin = PluginType.GlideMk2;
break; break;
case "Jabo 1.6.1": //case "Jabo 1.6.1":
_ss.VideoPlugin = PluginType.Jabo; // _ss.VideoPlugin = PluginType.Jabo;
break; // break;
case "GLideN64": case "GLideN64":
_ss.VideoPlugin = PluginType.GLideN64; _ss.VideoPlugin = PluginType.GLideN64;
break; break;
} }
// Jabo //// Jabo
_ss.JaboPlugin.UseDefaultHacks = JaboUseForGameCheckbox.Checked; //_ss.JaboPlugin.UseDefaultHacks = JaboUseForGameCheckbox.Checked;
_ss.JaboPlugin.clear_mode = JaboClearModeDropDown.SelectedItem //_ss.JaboPlugin.clear_mode = JaboClearModeDropDown.SelectedItem
.ToString() // .ToString()
.GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode>(); // .GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode>();
_ss.JaboPlugin.anisotropic_level = JaboAnisotropicFilteringLevelDropdown.SelectedItem //_ss.JaboPlugin.anisotropic_level = JaboAnisotropicFilteringLevelDropdown.SelectedItem
.ToString() // .ToString()
.GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.ANISOTROPIC_FILTERING_LEVEL>(); // .GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.ANISOTROPIC_FILTERING_LEVEL>();
_ss.JaboPlugin.antialiasing_level = JaboAntialiasingLevelDropdown.SelectedItem //_ss.JaboPlugin.antialiasing_level = JaboAntialiasingLevelDropdown.SelectedItem
.ToString() // .ToString()
.GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.ANTIALIASING_LEVEL>(); // .GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.ANTIALIASING_LEVEL>();
_ss.JaboPlugin.brightness = (int)JaboBrightnessBox.Value; //_ss.JaboPlugin.brightness = (int)JaboBrightnessBox.Value;
_ss.JaboPlugin.super2xsal = JaboSuper2xsalCheckbox.Checked; //_ss.JaboPlugin.super2xsal = JaboSuper2xsalCheckbox.Checked;
_ss.JaboPlugin.texture_filter = JaboTextureFilterCheckbox.Checked; //_ss.JaboPlugin.texture_filter = JaboTextureFilterCheckbox.Checked;
_ss.JaboPlugin.adjust_aspect_ratio = JaboAdjustAspectRatioCheckbox.Checked; //_ss.JaboPlugin.adjust_aspect_ratio = JaboAdjustAspectRatioCheckbox.Checked;
_ss.JaboPlugin.legacy_pixel_pipeline = JaboLegacyPixelPipelineCheckbox.Checked; //_ss.JaboPlugin.legacy_pixel_pipeline = JaboLegacyPixelPipelineCheckbox.Checked;
_ss.JaboPlugin.alpha_blending = JaboAlphaBlendingCheckbox.Checked; //_ss.JaboPlugin.alpha_blending = JaboAlphaBlendingCheckbox.Checked;
_ss.JaboPlugin.direct3d_transformation_pipeline = JaboDirect3DPipelineCheckbox.Checked; //_ss.JaboPlugin.direct3d_transformation_pipeline = JaboDirect3DPipelineCheckbox.Checked;
_ss.JaboPlugin.z_compare = JaboZCompareCheckbox.Checked; //_ss.JaboPlugin.z_compare = JaboZCompareCheckbox.Checked;
_ss.JaboPlugin.copy_framebuffer = JaboCopyFrameBufferCheckbox.Checked; //_ss.JaboPlugin.copy_framebuffer = JaboCopyFrameBufferCheckbox.Checked;
_ss.JaboPlugin.resolution_width = JaboResolutionWidthBox.ToRawInt().Value; //_ss.JaboPlugin.resolution_width = JaboResolutionWidthBox.ToRawInt().Value;
_ss.JaboPlugin.resolution_height = JaboResolutionHeightBox.ToRawInt().Value; //_ss.JaboPlugin.resolution_height = JaboResolutionHeightBox.ToRawInt().Value;
// Rice // Rice
_ss.RicePlugin.NormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked; _ss.RicePlugin.NormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked;
@ -540,9 +540,9 @@ namespace BizHawk.Client.EmuHawk
case PluginType.Rice: case PluginType.Rice:
PluginComboBox.Text = "Rice"; PluginComboBox.Text = "Rice";
break; break;
case PluginType.Jabo: //case PluginType.Jabo:
PluginComboBox.Text = "Jabo 1.6.1"; // PluginComboBox.Text = "Jabo 1.6.1";
break; // break;
case PluginType.GLideN64: case PluginType.GLideN64:
PluginComboBox.Text = "GLideN64"; PluginComboBox.Text = "GLideN64";
break; break;
@ -566,28 +566,28 @@ namespace BizHawk.Client.EmuHawk
ShowCustomVideoResolutionControls(); ShowCustomVideoResolutionControls();
} }
// Jabo //// Jabo
JaboUseForGameCheckbox.Checked = _ss.JaboPlugin.UseDefaultHacks; //JaboUseForGameCheckbox.Checked = _ss.JaboPlugin.UseDefaultHacks;
JaboClearModeDropDown //JaboClearModeDropDown
.PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode>(_ss.JaboPlugin.clear_mode); // .PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode>(_ss.JaboPlugin.clear_mode);
JaboResolutionWidthBox.Text = _ss.JaboPlugin.resolution_width.ToString(); //JaboResolutionWidthBox.Text = _ss.JaboPlugin.resolution_width.ToString();
JaboResolutionHeightBox.Text = _ss.JaboPlugin.resolution_height.ToString(); //JaboResolutionHeightBox.Text = _ss.JaboPlugin.resolution_height.ToString();
JaboUpdateHacksSection(); //JaboUpdateHacksSection();
JaboAnisotropicFilteringLevelDropdown //JaboAnisotropicFilteringLevelDropdown
.PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.ANISOTROPIC_FILTERING_LEVEL>(_ss.JaboPlugin.anisotropic_level); // .PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.ANISOTROPIC_FILTERING_LEVEL>(_ss.JaboPlugin.anisotropic_level);
JaboAntialiasingLevelDropdown //JaboAntialiasingLevelDropdown
.PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.ANTIALIASING_LEVEL>(_ss.JaboPlugin.antialiasing_level); // .PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.ANTIALIASING_LEVEL>(_ss.JaboPlugin.antialiasing_level);
JaboBrightnessBox.Value = _ss.JaboPlugin.brightness; //JaboBrightnessBox.Value = _ss.JaboPlugin.brightness;
JaboSuper2xsalCheckbox.Checked = _ss.JaboPlugin.super2xsal; //JaboSuper2xsalCheckbox.Checked = _ss.JaboPlugin.super2xsal;
JaboTextureFilterCheckbox.Checked = _ss.JaboPlugin.texture_filter; //JaboTextureFilterCheckbox.Checked = _ss.JaboPlugin.texture_filter;
JaboAdjustAspectRatioCheckbox.Checked = _ss.JaboPlugin.adjust_aspect_ratio; //JaboAdjustAspectRatioCheckbox.Checked = _ss.JaboPlugin.adjust_aspect_ratio;
JaboLegacyPixelPipelineCheckbox.Checked = _ss.JaboPlugin.legacy_pixel_pipeline; //JaboLegacyPixelPipelineCheckbox.Checked = _ss.JaboPlugin.legacy_pixel_pipeline;
JaboAlphaBlendingCheckbox.Checked = _ss.JaboPlugin.alpha_blending; //JaboAlphaBlendingCheckbox.Checked = _ss.JaboPlugin.alpha_blending;
JaboDirect3DPipelineCheckbox.Checked = _ss.JaboPlugin.direct3d_transformation_pipeline; //JaboDirect3DPipelineCheckbox.Checked = _ss.JaboPlugin.direct3d_transformation_pipeline;
JaboZCompareCheckbox.Checked = _ss.JaboPlugin.z_compare; //JaboZCompareCheckbox.Checked = _ss.JaboPlugin.z_compare;
JaboCopyFrameBufferCheckbox.Checked = _ss.JaboPlugin.copy_framebuffer; //JaboCopyFrameBufferCheckbox.Checked = _ss.JaboPlugin.copy_framebuffer;
// Rice // Rice
RiceNormalAlphaBlender_CB.Checked = _ss.RicePlugin.NormalAlphaBlender; RiceNormalAlphaBlender_CB.Checked = _ss.RicePlugin.NormalAlphaBlender;
@ -1223,13 +1223,13 @@ namespace BizHawk.Client.EmuHawk
oldSizeY = int.Parse(VideoResolutionYTextBox.Text); oldSizeY = int.Parse(VideoResolutionYTextBox.Text);
} }
if (PluginComboBox.Text == "Jabo 1.6.1") //if (PluginComboBox.Text == "Jabo 1.6.1")
{ //{
// Change resolution list to jabo // // Change resolution list to jabo
VideoResolutionComboBox.Items.Clear(); // VideoResolutionComboBox.Items.Clear();
VideoResolutionComboBox.Items.AddRange(ValidResolutionsJabo); // VideoResolutionComboBox.Items.AddRange(ValidResolutionsJabo);
} //}
else //else
{ {
// Change resolution list to the rest // Change resolution list to the rest
VideoResolutionComboBox.Items.Clear(); VideoResolutionComboBox.Items.Clear();
@ -1289,25 +1289,25 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void JaboUseForGameCheckbox_CheckedChanged(object sender, EventArgs e) //private void JaboUseForGameCheckbox_CheckedChanged(object sender, EventArgs e)
{ //{
JaboPerGameHacksGroupBox.Controls // JaboPerGameHacksGroupBox.Controls
.OfType<Control>() // .OfType<Control>()
.ToList() // .ToList()
.ForEach(c => c.Enabled = !JaboUseForGameCheckbox.Checked); // .ForEach(c => c.Enabled = !JaboUseForGameCheckbox.Checked);
JaboUpdateHacksSection(); // JaboUpdateHacksSection();
} //}
private void JaboUpdateHacksSection() //private void JaboUpdateHacksSection()
{ //{
if (JaboUseForGameCheckbox.Checked) // if (JaboUseForGameCheckbox.Checked)
{ // {
JaboResolutionWidthBox.Text = GetIntFromDB("Jabo_Resolution_Width", -1).ToString(); // JaboResolutionWidthBox.Text = GetIntFromDB("Jabo_Resolution_Width", -1).ToString();
JaboResolutionHeightBox.Text = GetIntFromDB("Jabo_Resolution_Height", -1).ToString(); // JaboResolutionHeightBox.Text = GetIntFromDB("Jabo_Resolution_Height", -1).ToString();
JaboClearModeDropDown.SelectedItem = ((N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode)GetIntFromDB("Jabo_Clear_Frame", 0)).GetDescription(); // JaboClearModeDropDown.SelectedItem = ((N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode)GetIntFromDB("Jabo_Clear_Frame", 0)).GetDescription();
} // }
} //}
private void VideoResolutionComboBox_SelectedIndexChanged(object sender, EventArgs e) private void VideoResolutionComboBox_SelectedIndexChanged(object sender, EventArgs e)
{ {

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

@ -94,7 +94,7 @@ namespace BizHawk.Client.EmuHawk
RicePropertyGrid.SelectedObject = _ss.RicePlugin; RicePropertyGrid.SelectedObject = _ss.RicePlugin;
Glidemk2PropertyGrid.SelectedObject = _ss.Glide64mk2Plugin; Glidemk2PropertyGrid.SelectedObject = _ss.Glide64mk2Plugin;
GlidePropertyGrid.SelectedObject = _ss.GlidePlugin; GlidePropertyGrid.SelectedObject = _ss.GlidePlugin;
JaboPropertyGrid.SelectedObject = _ss.JaboPlugin; //JaboPropertyGrid.SelectedObject = _ss.JaboPlugin;
} }
#region Setting Get/Set #region Setting Get/Set

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

@ -1,184 +1,184 @@
using System.Collections.Generic; //using System.Collections.Generic;
using System.ComponentModel; //using System.ComponentModel;
using Newtonsoft.Json; //using Newtonsoft.Json;
using BizHawk.Emulation.Common; //using BizHawk.Emulation.Common;
using System.Reflection; //using System.Reflection;
namespace BizHawk.Emulation.Cores.Nintendo.N64 //namespace BizHawk.Emulation.Cores.Nintendo.N64
{ //{
public partial class N64SyncSettings // public partial class N64SyncSettings
{ // {
public class N64JaboPluginSettings : IPluginSettings // public class N64JaboPluginSettings : IPluginSettings
{ // {
public N64JaboPluginSettings() // public N64JaboPluginSettings()
{ // {
UseDefaultHacks = true; // UseDefaultHacks = true;
anisotropic_level = ANISOTROPIC_FILTERING_LEVEL.FourTimes; // anisotropic_level = ANISOTROPIC_FILTERING_LEVEL.FourTimes;
antialiasing_level = ANTIALIASING_LEVEL.Off; // antialiasing_level = ANTIALIASING_LEVEL.Off;
brightness = 100; // brightness = 100;
super2xsal = false; // super2xsal = false;
texture_filter = false; // texture_filter = false;
adjust_aspect_ratio = false; // adjust_aspect_ratio = false;
legacy_pixel_pipeline = false; // legacy_pixel_pipeline = false;
alpha_blending = false; // alpha_blending = false;
//wireframe = false; // //wireframe = false;
direct3d_transformation_pipeline = false; // direct3d_transformation_pipeline = false;
z_compare = false; // z_compare = false;
copy_framebuffer = false; // copy_framebuffer = false;
// Per game // // Per game
resolution_width = -1; // resolution_width = -1;
resolution_height = -1; // resolution_height = -1;
clear_mode = Direct3DClearMode.Default; // clear_mode = Direct3DClearMode.Default;
} // }
public PluginType GetPluginType() // public PluginType GetPluginType()
{ // {
return PluginType.Jabo; // return PluginType.Jabo;
} // }
public void FillPerGameHacks(GameInfo game) // public void FillPerGameHacks(GameInfo game)
{ // {
if (UseDefaultHacks) // if (UseDefaultHacks)
{ // {
resolution_width = game.GetInt("Jabo_Resolution_Width", -1); // resolution_width = game.GetInt("Jabo_Resolution_Width", -1);
resolution_height = game.GetInt("Jabo_Resolution_Height", -1); // resolution_height = game.GetInt("Jabo_Resolution_Height", -1);
clear_mode = (Direct3DClearMode)game.GetInt("Jabo_Clear_Frame", (int)Direct3DClearMode.Default); // clear_mode = (Direct3DClearMode)game.GetInt("Jabo_Clear_Frame", (int)Direct3DClearMode.Default);
} // }
} // }
public bool UseDefaultHacks { get; set; } // public bool UseDefaultHacks { get; set; }
[DefaultValue(ANISOTROPIC_FILTERING_LEVEL.FourTimes)] // [DefaultValue(ANISOTROPIC_FILTERING_LEVEL.FourTimes)]
[DisplayName("Anisotropic filtering")] // [DisplayName("Anisotropic filtering")]
[Description("Anisotropic filtering level")] // [Description("Anisotropic filtering level")]
public ANISOTROPIC_FILTERING_LEVEL anisotropic_level { get; set; } // public ANISOTROPIC_FILTERING_LEVEL anisotropic_level { get; set; }
[DefaultValue(ANTIALIASING_LEVEL.Off)] // [DefaultValue(ANTIALIASING_LEVEL.Off)]
[DisplayName("Full-Scene Antialiasing")] // [DisplayName("Full-Scene Antialiasing")]
[Description("Full-Scene Antialiasing level")] // [Description("Full-Scene Antialiasing level")]
public ANTIALIASING_LEVEL antialiasing_level { get; set; } // public ANTIALIASING_LEVEL antialiasing_level { get; set; }
// Range: 100-190 in increments of 3, TODO: would be nice to put this in the metadata // // Range: 100-190 in increments of 3, TODO: would be nice to put this in the metadata
[DefaultValue(100)] // [DefaultValue(100)]
[DisplayName("Brightness")] // [DisplayName("Brightness")]
[Description("Brightness level, 100%-190%")] // [Description("Brightness level, 100%-190%")]
public int brightness { get; set; } // public int brightness { get; set; }
[DefaultValue(false)] // [DefaultValue(false)]
[DisplayName("Super2xSal textures")] // [DisplayName("Super2xSal textures")]
[Description("Enables Super2xSal textures")] // [Description("Enables Super2xSal textures")]
public bool super2xsal { get; set; } // public bool super2xsal { get; set; }
[DefaultValue(false)] // [DefaultValue(false)]
[DisplayName("Always use texture filter")] // [DisplayName("Always use texture filter")]
[Description("Always use texture filter")] // [Description("Always use texture filter")]
public bool texture_filter { get; set; } // public bool texture_filter { get; set; }
[DefaultValue(false)] // [DefaultValue(false)]
[DisplayName("Adjust game aspect ratio to match yours")] // [DisplayName("Adjust game aspect ratio to match yours")]
[Description("Adjust game aspect ratio to match yours")] // [Description("Adjust game aspect ratio to match yours")]
public bool adjust_aspect_ratio { get; set; } // public bool adjust_aspect_ratio { get; set; }
[DefaultValue(false)] // [DefaultValue(false)]
[DisplayName("Use legacy pixel pipeline")] // [DisplayName("Use legacy pixel pipeline")]
[Description("Use legacy pixel pipeline")] // [Description("Use legacy pixel pipeline")]
public bool legacy_pixel_pipeline { get; set; } // public bool legacy_pixel_pipeline { get; set; }
[DefaultValue(false)] // [DefaultValue(false)]
[DisplayName("Force alpha blending")] // [DisplayName("Force alpha blending")]
[Description("Force alpha blending")] // [Description("Force alpha blending")]
public bool alpha_blending { get; set; } // public bool alpha_blending { get; set; }
// As far as I can tell there is no way to apply this setting without opening the dll config window // // As far as I can tell there is no way to apply this setting without opening the dll config window
//[DefaultValue(false)] // //[DefaultValue(false)]
//[DisplayName("Wireframe rendering")] // //[DisplayName("Wireframe rendering")]
//[Description("Wireframe rendering")] // //[Description("Wireframe rendering")]
//public bool wireframe { get; set; } // //public bool wireframe { get; set; }
[DefaultValue(false)] // [DefaultValue(false)]
[DisplayName("Use Direct3D trans pipeline")] // [DisplayName("Use Direct3D trans pipeline")]
[Description("Use Direct3D transformation pipeline")] // [Description("Use Direct3D transformation pipeline")]
public bool direct3d_transformation_pipeline { get; set; } // public bool direct3d_transformation_pipeline { get; set; }
[DefaultValue(false)] // [DefaultValue(false)]
[DisplayName("Force Z Compare")] // [DisplayName("Force Z Compare")]
[Description("Force Z Compare")] // [Description("Force Z Compare")]
public bool z_compare { get; set; } // public bool z_compare { get; set; }
[DefaultValue(false)] // [DefaultValue(false)]
[DisplayName("Copy framebuffer")] // [DisplayName("Copy framebuffer")]
[Description("Copy framebuffer to RDRAM")] // [Description("Copy framebuffer to RDRAM")]
public bool copy_framebuffer { get; set; } // public bool copy_framebuffer { get; set; }
[DefaultValue(-1)] // [DefaultValue(-1)]
[DisplayName("Emulated Width")] // [DisplayName("Emulated Width")]
[Description("Emulated Width")] // [Description("Emulated Width")]
public int resolution_width { get; set; } // public int resolution_width { get; set; }
[DefaultValue(-1)] // [DefaultValue(-1)]
[DisplayName("Emulated Height")] // [DisplayName("Emulated Height")]
[Description("Emulated Height")] // [Description("Emulated Height")]
public int resolution_height { get; set; } // public int resolution_height { get; set; }
[DefaultValue(Direct3DClearMode.Default)] // [DefaultValue(Direct3DClearMode.Default)]
[DisplayName("Direct3D Clear Mode")] // [DisplayName("Direct3D Clear Mode")]
[Description("Direct3D Clear Mode")] // [Description("Direct3D Clear Mode")]
public Direct3DClearMode clear_mode { get; set; } // public Direct3DClearMode clear_mode { get; set; }
public enum ANISOTROPIC_FILTERING_LEVEL // public enum ANISOTROPIC_FILTERING_LEVEL
{ // {
[Description("Off")] // [Description("Off")]
Off = 0, // Off = 0,
[Description("2X")] // [Description("2X")]
TwoTimes = 1, // TwoTimes = 1,
[Description("4X")] // [Description("4X")]
FourTimes = 2, // FourTimes = 2,
[Description("8X")] // [Description("8X")]
EightTimes = 3, // EightTimes = 3,
[Description("16X")] // [Description("16X")]
SixteenTimes = 4 // SixteenTimes = 4
} // }
public enum ANTIALIASING_LEVEL // public enum ANTIALIASING_LEVEL
{ // {
[Description("Off")] // [Description("Off")]
Off = 0, // Off = 0,
[Description("2X")] // [Description("2X")]
TwoTimes = 1, // TwoTimes = 1,
[Description("4X")] // [Description("4X")]
FourTimes = 2, // FourTimes = 2,
[Description("8X")] // [Description("8X")]
EightTimes = 3 // EightTimes = 3
} // }
public enum Direct3DClearMode // public enum Direct3DClearMode
{ // {
[Description("Default")] // [Description("Default")]
Default = 0, // Default = 0,
[Description("Only Per Frame")] // [Description("Only Per Frame")]
PerFrame = 1, // PerFrame = 1,
[Description("Always")] // [Description("Always")]
Always = 2 // Always = 2
} // }
public N64JaboPluginSettings Clone() // public N64JaboPluginSettings Clone()
{ // {
return (N64JaboPluginSettings)MemberwiseClone(); // return (N64JaboPluginSettings)MemberwiseClone();
} // }
} // }
} // }
} //}

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

@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
RicePlugin = new N64RicePluginSettings(); RicePlugin = new N64RicePluginSettings();
GlidePlugin = new N64GlidePluginSettings(); GlidePlugin = new N64GlidePluginSettings();
Glide64mk2Plugin = new N64Glide64mk2PluginSettings(); Glide64mk2Plugin = new N64Glide64mk2PluginSettings();
JaboPlugin = new N64JaboPluginSettings(); //JaboPlugin = new N64JaboPluginSettings();
GLideN64Plugin = new N64GLideN64PluginSettings(); GLideN64Plugin = new N64GLideN64PluginSettings();
} }
@ -42,7 +42,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
public N64RicePluginSettings RicePlugin { get; private set; } public N64RicePluginSettings RicePlugin { get; private set; }
public N64GlidePluginSettings GlidePlugin { get; private set; } public N64GlidePluginSettings GlidePlugin { get; private set; }
public N64Glide64mk2PluginSettings Glide64mk2Plugin { get; private set; } public N64Glide64mk2PluginSettings Glide64mk2Plugin { get; private set; }
public N64JaboPluginSettings JaboPlugin { get; private set; } //public N64JaboPluginSettings JaboPlugin { get; private set; }
public N64GLideN64PluginSettings GLideN64Plugin { get; private set; } public N64GLideN64PluginSettings GLideN64Plugin { get; private set; }
public N64SyncSettings Clone() public N64SyncSettings Clone()
@ -56,7 +56,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
RicePlugin = RicePlugin.Clone(), RicePlugin = RicePlugin.Clone(),
GlidePlugin = GlidePlugin.Clone(), GlidePlugin = GlidePlugin.Clone(),
Glide64mk2Plugin = Glide64mk2Plugin.Clone(), Glide64mk2Plugin = Glide64mk2Plugin.Clone(),
JaboPlugin = JaboPlugin.Clone(), //JaboPlugin = JaboPlugin.Clone(),
GLideN64Plugin = GLideN64Plugin.Clone(), GLideN64Plugin = GLideN64Plugin.Clone(),
Controllers = System.Array.ConvertAll(Controllers, a => a.Clone()) Controllers = System.Array.ConvertAll(Controllers, a => a.Clone())
}; };
@ -73,7 +73,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
case PluginType.Glide: ips = GlidePlugin.Clone(); break; case PluginType.Glide: ips = GlidePlugin.Clone(); break;
case PluginType.GlideMk2: ips = Glide64mk2Plugin.Clone(); break; case PluginType.GlideMk2: ips = Glide64mk2Plugin.Clone(); break;
case PluginType.Rice: ips = RicePlugin.Clone(); break; case PluginType.Rice: ips = RicePlugin.Clone(); break;
case PluginType.Jabo: ips = JaboPlugin.Clone(); break; //case PluginType.Jabo: ips = JaboPlugin.Clone(); break;
case PluginType.GLideN64: ips = GLideN64Plugin.Clone(); break; case PluginType.GLideN64: ips = GLideN64Plugin.Clone(); break;
} }
@ -118,8 +118,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
[Description("Glide64 mk2")] [Description("Glide64 mk2")]
GlideMk2, GlideMk2,
[Description("Jabo")] //[Description("Jabo")]
Jabo, //Jabo,
[Description("GLideN64")] [Description("GLideN64")]
GLideN64 GLideN64

8
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs
View File

@ -659,10 +659,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
{ {
m64pConfigOpenSection("Video-Glide64mk2", ref video_plugin_section); m64pConfigOpenSection("Video-Glide64mk2", ref video_plugin_section);
} }
else if (video_settings.Plugin == PluginType.Jabo) //else if (video_settings.Plugin == PluginType.Jabo)
{ //{
m64pConfigOpenSection("Video-Jabo", ref video_plugin_section); // m64pConfigOpenSection("Video-Jabo", ref video_plugin_section);
} //}
else if (video_settings.Plugin == PluginType.GLideN64) else if (video_settings.Plugin == PluginType.GLideN64)
{ {
m64pConfigOpenSection("Video-GLideN64", ref video_plugin_section); m64pConfigOpenSection("Video-GLideN64", ref video_plugin_section);

6
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusVideoApi.cs
View File

@ -57,9 +57,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
case PluginType.GlideMk2: case PluginType.GlideMk2:
videoplugin = "mupen64plus-video-glide64mk2.dll"; videoplugin = "mupen64plus-video-glide64mk2.dll";
break; break;
case PluginType.Jabo: //case PluginType.Jabo:
videoplugin = "mupen64plus-video-jabo.dll"; // videoplugin = "mupen64plus-video-jabo.dll";
break; // break;
case PluginType.GLideN64: case PluginType.GLideN64:
videoplugin = "mupen64plus-video-GLideN64.dll"; videoplugin = "mupen64plus-video-GLideN64.dll";
break; break;