From 503261af35f5c19dde77f3c33b44a166db476fa9 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 11 Jun 2017 17:17:42 -0500 Subject: [PATCH] comment out all jabo related stuff --- BizHawk.Client.EmuHawk/BizBox.Designer.cs | 31 +- .../N64/N64VideoPluginconfig.Designer.cs | 512 +++++++++--------- .../config/N64/N64VideoPluginconfig.cs | 174 +++--- .../config/N64/NewN64PluginSettings.cs | 2 +- .../Nintendo/N64/N64SyncSettings.Jabo.cs | 294 +++++----- .../Consoles/Nintendo/N64/N64SyncSettings.cs | 12 +- .../N64/NativeAPI/mupen64plusCoreApi.cs | 8 +- .../N64/NativeAPI/mupen64plusVideoApi.cs | 6 +- 8 files changed, 519 insertions(+), 520 deletions(-) diff --git a/BizHawk.Client.EmuHawk/BizBox.Designer.cs b/BizHawk.Client.EmuHawk/BizBox.Designer.cs index aefb76b681..5d19cf9d03 100644 --- a/BizHawk.Client.EmuHawk/BizBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/BizBox.Designer.cs @@ -35,7 +35,7 @@ this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); 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.btnCopyHash = new System.Windows.Forms.Button(); this.linkLabel2 = new System.Windows.Forms.LinkLabel(); @@ -109,19 +109,18 @@ this.CoreInfoPanel.Name = "CoreInfoPanel"; this.CoreInfoPanel.Size = new System.Drawing.Size(423, 259); this.CoreInfoPanel.TabIndex = 14; - // - // textBox1 - // - this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBox1.Location = new System.Drawing.Point(13, 462); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(423, 33); - this.textBox1.TabIndex = 16; - this.textBox1.Text = "jabo_direct3d8_patched.dll is distributed with the special permission of the auth" + - "or."; + //// + //// textBox1 + //// + //this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + // | System.Windows.Forms.AnchorStyles.Right))); + //this.textBox1.Location = new System.Drawing.Point(13, 462); + //this.textBox1.Multiline = true; + //this.textBox1.Name = "textBox1"; + //this.textBox1.ReadOnly = true; + //this.textBox1.Size = new System.Drawing.Size(423, 33); + //this.textBox1.TabIndex = 16; + //this.textBox1.Text = "jabo_direct3d8_patched.dll is distributed with the special permission of the author."; // // VersionLabel // @@ -189,7 +188,7 @@ this.Controls.Add(this.linkLabel3); this.Controls.Add(this.linkLabel2); this.Controls.Add(this.btnCopyHash); - this.Controls.Add(this.textBox1); + //this.Controls.Add(this.textBox1); this.Controls.Add(this.CoreInfoPanel); this.Controls.Add(this.VersionLabel); this.Controls.Add(this.label4); @@ -217,7 +216,7 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label4; 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.Button btnCopyHash; private System.Windows.Forms.LinkLabel linkLabel2; diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs index c3fa141691..f54976c2e4 100644 --- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs @@ -275,35 +275,35 @@ this.label58 = new System.Windows.Forms.Label(); this.Glide64mk2_filtering = new System.Windows.Forms.ComboBox(); this.Glide64mk2_UseDefaultHacks2 = new System.Windows.Forms.CheckBox(); - this.JaboTab = new System.Windows.Forms.TabPage(); - this.JaboPerGameHacksGroupBox = new System.Windows.Forms.GroupBox(); + //this.JaboTab = new System.Windows.Forms.TabPage(); + //this.JaboPerGameHacksGroupBox = new System.Windows.Forms.GroupBox(); this.label71 = 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.JaboUseForGameCheckbox = new System.Windows.Forms.CheckBox(); + //this.JaboUseForGameCheckbox = new System.Windows.Forms.CheckBox(); 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.JaboZCompareCheckbox = new System.Windows.Forms.CheckBox(); + //this.JaboZCompareCheckbox = new System.Windows.Forms.CheckBox(); 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.JaboAlphaBlendingCheckbox = new System.Windows.Forms.CheckBox(); + //this.JaboAlphaBlendingCheckbox = new System.Windows.Forms.CheckBox(); 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.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.JaboAntialiasingLevelDropdown = new System.Windows.Forms.ComboBox(); + //this.JaboAntialiasingLevelDropdown = new System.Windows.Forms.ComboBox(); 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.JaboSuper2xsalCheckbox = new System.Windows.Forms.CheckBox(); - this.JaboBrightnessBox = new System.Windows.Forms.NumericUpDown(); + //this.JaboSuper2xsalCheckbox = new System.Windows.Forms.CheckBox(); + //this.JaboBrightnessBox = new System.Windows.Forms.NumericUpDown(); 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.GLideN64Tab = new System.Windows.Forms.TabPage(); this.tabControl3 = new System.Windows.Forms.TabControl(); @@ -376,8 +376,8 @@ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.label89 = new System.Windows.Forms.Label(); this.GLideN64_UseNativeResolutionFactor = new System.Windows.Forms.TextBox(); - this.JaboResolutionHeightBox = new BizHawk.Client.EmuHawk.WatchValueBox(); - this.JaboResolutionWidthBox = new BizHawk.Client.EmuHawk.WatchValueBox(); + //this.JaboResolutionHeightBox = new BizHawk.Client.EmuHawk.WatchValueBox(); + //this.JaboResolutionWidthBox = new BizHawk.Client.EmuHawk.WatchValueBox(); this.N64plugintabcontrol.SuspendLayout(); this.N64vpluginglobaltab.SuspendLayout(); this.RiceTabPage.SuspendLayout(); @@ -398,9 +398,9 @@ this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabPage3.SuspendLayout(); - this.JaboTab.SuspendLayout(); - this.JaboPerGameHacksGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).BeginInit(); + //this.JaboTab.SuspendLayout(); + //this.JaboPerGameHacksGroupBox.SuspendLayout(); + //((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).BeginInit(); this.GLideN64Tab.SuspendLayout(); this.tabControl3.SuspendLayout(); this.tabPage5.SuspendLayout(); @@ -417,7 +417,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.Controls.Add(this.JaboTab); this.N64plugintabcontrol.Controls.Add(this.GLideN64Tab); this.N64plugintabcontrol.Location = new System.Drawing.Point(-2, -2); this.N64plugintabcontrol.Name = "N64plugintabcontrol"; @@ -583,7 +583,7 @@ "Rice", "Glide64", "Glide64mk2", - "Jabo 1.6.1", + //"Jabo 1.6.1", "GLideN64"}); this.PluginComboBox.Location = new System.Drawing.Point(13, 91); this.PluginComboBox.Name = "PluginComboBox"; @@ -3369,55 +3369,55 @@ this.Glide64mk2_UseDefaultHacks2.Text = "Use defaults for current game"; this.Glide64mk2_UseDefaultHacks2.UseVisualStyleBackColor = true; this.Glide64mk2_UseDefaultHacks2.CheckedChanged += new System.EventHandler(this.Glide64mk2_UseDefaultHacks2_CheckedChanged); - // - // JaboTab - // - this.JaboTab.Controls.Add(this.JaboPerGameHacksGroupBox); - this.JaboTab.Controls.Add(this.JaboUseForGameCheckbox); - this.JaboTab.Controls.Add(this.label68); - this.JaboTab.Controls.Add(this.JaboCopyFrameBufferCheckbox); - this.JaboTab.Controls.Add(this.label67); - this.JaboTab.Controls.Add(this.JaboZCompareCheckbox); - this.JaboTab.Controls.Add(this.label66); - this.JaboTab.Controls.Add(this.JaboDirect3DPipelineCheckbox); - this.JaboTab.Controls.Add(this.label65); - this.JaboTab.Controls.Add(this.JaboAlphaBlendingCheckbox); - this.JaboTab.Controls.Add(this.label64); - this.JaboTab.Controls.Add(this.JaboLegacyPixelPipelineCheckbox); - this.JaboTab.Controls.Add(this.label63); - this.JaboTab.Controls.Add(this.label62); - this.JaboTab.Controls.Add(this.JaboAdjustAspectRatioCheckbox); - this.JaboTab.Controls.Add(this.label61); - this.JaboTab.Controls.Add(this.JaboAntialiasingLevelDropdown); - this.JaboTab.Controls.Add(this.label60); - this.JaboTab.Controls.Add(this.JaboTextureFilterCheckbox); - this.JaboTab.Controls.Add(this.label59); - this.JaboTab.Controls.Add(this.JaboSuper2xsalCheckbox); - this.JaboTab.Controls.Add(this.JaboBrightnessBox); - this.JaboTab.Controls.Add(this.label57); - this.JaboTab.Controls.Add(this.JaboAnisotropicFilteringLevelDropdown); - this.JaboTab.Controls.Add(this.label51); - 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; - // - // JaboPerGameHacksGroupBox - // - this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboResolutionHeightBox); - this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboResolutionWidthBox); - this.JaboPerGameHacksGroupBox.Controls.Add(this.label71); - this.JaboPerGameHacksGroupBox.Controls.Add(this.label70); - this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboClearModeDropDown); - this.JaboPerGameHacksGroupBox.Controls.Add(this.label69); - this.JaboPerGameHacksGroupBox.Location = new System.Drawing.Point(292, 36); - this.JaboPerGameHacksGroupBox.Name = "JaboPerGameHacksGroupBox"; - this.JaboPerGameHacksGroupBox.Size = new System.Drawing.Size(271, 196); - this.JaboPerGameHacksGroupBox.TabIndex = 29; - this.JaboPerGameHacksGroupBox.TabStop = false; - this.JaboPerGameHacksGroupBox.Text = "Per game settings"; + //// + //// JaboTab + //// + //this.JaboTab.Controls.Add(this.JaboPerGameHacksGroupBox); + //this.JaboTab.Controls.Add(this.JaboUseForGameCheckbox); + //this.JaboTab.Controls.Add(this.label68); + //this.JaboTab.Controls.Add(this.JaboCopyFrameBufferCheckbox); + //this.JaboTab.Controls.Add(this.label67); + //this.JaboTab.Controls.Add(this.JaboZCompareCheckbox); + //this.JaboTab.Controls.Add(this.label66); + //this.JaboTab.Controls.Add(this.JaboDirect3DPipelineCheckbox); + //this.JaboTab.Controls.Add(this.label65); + //this.JaboTab.Controls.Add(this.JaboAlphaBlendingCheckbox); + //this.JaboTab.Controls.Add(this.label64); + //this.JaboTab.Controls.Add(this.JaboLegacyPixelPipelineCheckbox); + //this.JaboTab.Controls.Add(this.label63); + //this.JaboTab.Controls.Add(this.label62); + //this.JaboTab.Controls.Add(this.JaboAdjustAspectRatioCheckbox); + //this.JaboTab.Controls.Add(this.label61); + //this.JaboTab.Controls.Add(this.JaboAntialiasingLevelDropdown); + //this.JaboTab.Controls.Add(this.label60); + //this.JaboTab.Controls.Add(this.JaboTextureFilterCheckbox); + //this.JaboTab.Controls.Add(this.label59); + //this.JaboTab.Controls.Add(this.JaboSuper2xsalCheckbox); + //this.JaboTab.Controls.Add(this.JaboBrightnessBox); + //this.JaboTab.Controls.Add(this.label57); + //this.JaboTab.Controls.Add(this.JaboAnisotropicFilteringLevelDropdown); + //this.JaboTab.Controls.Add(this.label51); + //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; + //// + //// JaboPerGameHacksGroupBox + //// + //this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboResolutionHeightBox); + //this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboResolutionWidthBox); + //this.JaboPerGameHacksGroupBox.Controls.Add(this.label71); + //this.JaboPerGameHacksGroupBox.Controls.Add(this.label70); + //this.JaboPerGameHacksGroupBox.Controls.Add(this.JaboClearModeDropDown); + //this.JaboPerGameHacksGroupBox.Controls.Add(this.label69); + //this.JaboPerGameHacksGroupBox.Location = new System.Drawing.Point(292, 36); + //this.JaboPerGameHacksGroupBox.Name = "JaboPerGameHacksGroupBox"; + //this.JaboPerGameHacksGroupBox.Size = new System.Drawing.Size(271, 196); + //this.JaboPerGameHacksGroupBox.TabIndex = 29; + //this.JaboPerGameHacksGroupBox.TabStop = false; + //this.JaboPerGameHacksGroupBox.Text = "Per game settings"; // // label71 // @@ -3436,15 +3436,15 @@ this.label70.Size = new System.Drawing.Size(88, 13); this.label70.TabIndex = 31; this.label70.Text = "Resolution Width"; - // - // JaboClearModeDropDown - // - this.JaboClearModeDropDown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.JaboClearModeDropDown.FormattingEnabled = true; - this.JaboClearModeDropDown.Location = new System.Drawing.Point(127, 30); - this.JaboClearModeDropDown.Name = "JaboClearModeDropDown"; - this.JaboClearModeDropDown.Size = new System.Drawing.Size(138, 21); - this.JaboClearModeDropDown.TabIndex = 30; + //// + //// JaboClearModeDropDown + //// + //this.JaboClearModeDropDown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + //this.JaboClearModeDropDown.FormattingEnabled = true; + //this.JaboClearModeDropDown.Location = new System.Drawing.Point(127, 30); + //this.JaboClearModeDropDown.Name = "JaboClearModeDropDown"; + //this.JaboClearModeDropDown.Size = new System.Drawing.Size(138, 21); + //this.JaboClearModeDropDown.TabIndex = 30; // // label69 // @@ -3454,17 +3454,17 @@ this.label69.Size = new System.Drawing.Size(106, 13); this.label69.TabIndex = 0; this.label69.Text = "Direct3D Clear Mode"; - // - // JaboUseForGameCheckbox - // - this.JaboUseForGameCheckbox.AutoSize = true; - this.JaboUseForGameCheckbox.Location = new System.Drawing.Point(292, 13); - this.JaboUseForGameCheckbox.Name = "JaboUseForGameCheckbox"; - this.JaboUseForGameCheckbox.Size = new System.Drawing.Size(165, 17); - this.JaboUseForGameCheckbox.TabIndex = 28; - this.JaboUseForGameCheckbox.Text = "Use defaults for current game"; - this.JaboUseForGameCheckbox.UseVisualStyleBackColor = true; - this.JaboUseForGameCheckbox.CheckedChanged += new System.EventHandler(this.JaboUseForGameCheckbox_CheckedChanged); + //// + //// JaboUseForGameCheckbox + //// + //this.JaboUseForGameCheckbox.AutoSize = true; + //this.JaboUseForGameCheckbox.Location = new System.Drawing.Point(292, 13); + //this.JaboUseForGameCheckbox.Name = "JaboUseForGameCheckbox"; + //this.JaboUseForGameCheckbox.Size = new System.Drawing.Size(165, 17); + //this.JaboUseForGameCheckbox.TabIndex = 28; + //this.JaboUseForGameCheckbox.Text = "Use defaults for current game"; + //this.JaboUseForGameCheckbox.UseVisualStyleBackColor = true; + //this.JaboUseForGameCheckbox.CheckedChanged += new System.EventHandler(this.JaboUseForGameCheckbox_CheckedChanged); // // label68 // @@ -3474,15 +3474,15 @@ this.label68.Size = new System.Drawing.Size(87, 13); this.label68.TabIndex = 27; this.label68.Text = "Copy framebuffer"; - // - // JaboCopyFrameBufferCheckbox - // - this.JaboCopyFrameBufferCheckbox.AutoSize = true; - this.JaboCopyFrameBufferCheckbox.Location = new System.Drawing.Point(154, 315); - this.JaboCopyFrameBufferCheckbox.Name = "JaboCopyFrameBufferCheckbox"; - this.JaboCopyFrameBufferCheckbox.Size = new System.Drawing.Size(15, 14); - this.JaboCopyFrameBufferCheckbox.TabIndex = 26; - this.JaboCopyFrameBufferCheckbox.UseVisualStyleBackColor = true; + //// + //// JaboCopyFrameBufferCheckbox + //// + //this.JaboCopyFrameBufferCheckbox.AutoSize = true; + //this.JaboCopyFrameBufferCheckbox.Location = new System.Drawing.Point(154, 315); + //this.JaboCopyFrameBufferCheckbox.Name = "JaboCopyFrameBufferCheckbox"; + //this.JaboCopyFrameBufferCheckbox.Size = new System.Drawing.Size(15, 14); + //this.JaboCopyFrameBufferCheckbox.TabIndex = 26; + //this.JaboCopyFrameBufferCheckbox.UseVisualStyleBackColor = true; // // label67 // @@ -3492,15 +3492,15 @@ this.label67.Size = new System.Drawing.Size(89, 13); this.label67.TabIndex = 25; this.label67.Text = "Force Z Compare"; - // - // JaboZCompareCheckbox - // - this.JaboZCompareCheckbox.AutoSize = true; - this.JaboZCompareCheckbox.Location = new System.Drawing.Point(154, 285); - this.JaboZCompareCheckbox.Name = "JaboZCompareCheckbox"; - this.JaboZCompareCheckbox.Size = new System.Drawing.Size(15, 14); - this.JaboZCompareCheckbox.TabIndex = 24; - this.JaboZCompareCheckbox.UseVisualStyleBackColor = true; + //// + //// JaboZCompareCheckbox + //// + //this.JaboZCompareCheckbox.AutoSize = true; + //this.JaboZCompareCheckbox.Location = new System.Drawing.Point(154, 285); + //this.JaboZCompareCheckbox.Name = "JaboZCompareCheckbox"; + //this.JaboZCompareCheckbox.Size = new System.Drawing.Size(15, 14); + //this.JaboZCompareCheckbox.TabIndex = 24; + //this.JaboZCompareCheckbox.UseVisualStyleBackColor = true; // // label66 // @@ -3510,15 +3510,15 @@ this.label66.Size = new System.Drawing.Size(114, 13); this.label66.TabIndex = 23; this.label66.Text = "Direct3D trans pipeline"; - // - // JaboDirect3DPipelineCheckbox - // - this.JaboDirect3DPipelineCheckbox.AutoSize = true; - this.JaboDirect3DPipelineCheckbox.Location = new System.Drawing.Point(154, 255); - this.JaboDirect3DPipelineCheckbox.Name = "JaboDirect3DPipelineCheckbox"; - this.JaboDirect3DPipelineCheckbox.Size = new System.Drawing.Size(15, 14); - this.JaboDirect3DPipelineCheckbox.TabIndex = 22; - this.JaboDirect3DPipelineCheckbox.UseVisualStyleBackColor = true; + //// + //// JaboDirect3DPipelineCheckbox + //// + //this.JaboDirect3DPipelineCheckbox.AutoSize = true; + //this.JaboDirect3DPipelineCheckbox.Location = new System.Drawing.Point(154, 255); + //this.JaboDirect3DPipelineCheckbox.Name = "JaboDirect3DPipelineCheckbox"; + //this.JaboDirect3DPipelineCheckbox.Size = new System.Drawing.Size(15, 14); + //this.JaboDirect3DPipelineCheckbox.TabIndex = 22; + //this.JaboDirect3DPipelineCheckbox.UseVisualStyleBackColor = true; // // label65 // @@ -3528,15 +3528,15 @@ this.label65.Size = new System.Drawing.Size(106, 13); this.label65.TabIndex = 21; this.label65.Text = "Force alpha blending"; - // - // JaboAlphaBlendingCheckbox - // - this.JaboAlphaBlendingCheckbox.AutoSize = true; - this.JaboAlphaBlendingCheckbox.Location = new System.Drawing.Point(154, 225); - this.JaboAlphaBlendingCheckbox.Name = "JaboAlphaBlendingCheckbox"; - this.JaboAlphaBlendingCheckbox.Size = new System.Drawing.Size(15, 14); - this.JaboAlphaBlendingCheckbox.TabIndex = 20; - this.JaboAlphaBlendingCheckbox.UseVisualStyleBackColor = true; + //// + //// JaboAlphaBlendingCheckbox + //// + //this.JaboAlphaBlendingCheckbox.AutoSize = true; + //this.JaboAlphaBlendingCheckbox.Location = new System.Drawing.Point(154, 225); + //this.JaboAlphaBlendingCheckbox.Name = "JaboAlphaBlendingCheckbox"; + //this.JaboAlphaBlendingCheckbox.Size = new System.Drawing.Size(15, 14); + //this.JaboAlphaBlendingCheckbox.TabIndex = 20; + //this.JaboAlphaBlendingCheckbox.UseVisualStyleBackColor = true; // // label64 // @@ -3546,15 +3546,15 @@ this.label64.Size = new System.Drawing.Size(123, 13); this.label64.TabIndex = 19; this.label64.Text = "Use legacy pixel pipeline"; - // - // JaboLegacyPixelPipelineCheckbox - // - this.JaboLegacyPixelPipelineCheckbox.AutoSize = true; - this.JaboLegacyPixelPipelineCheckbox.Location = new System.Drawing.Point(154, 195); - this.JaboLegacyPixelPipelineCheckbox.Name = "JaboLegacyPixelPipelineCheckbox"; - this.JaboLegacyPixelPipelineCheckbox.Size = new System.Drawing.Size(15, 14); - this.JaboLegacyPixelPipelineCheckbox.TabIndex = 18; - this.JaboLegacyPixelPipelineCheckbox.UseVisualStyleBackColor = true; + //// + //// JaboLegacyPixelPipelineCheckbox + //// + //this.JaboLegacyPixelPipelineCheckbox.AutoSize = true; + //this.JaboLegacyPixelPipelineCheckbox.Location = new System.Drawing.Point(154, 195); + //this.JaboLegacyPixelPipelineCheckbox.Name = "JaboLegacyPixelPipelineCheckbox"; + //this.JaboLegacyPixelPipelineCheckbox.Size = new System.Drawing.Size(15, 14); + //this.JaboLegacyPixelPipelineCheckbox.TabIndex = 18; + //this.JaboLegacyPixelPipelineCheckbox.UseVisualStyleBackColor = true; // // label63 // @@ -3573,15 +3573,15 @@ this.label62.Size = new System.Drawing.Size(123, 13); this.label62.TabIndex = 16; this.label62.Text = "Adjust game aspect ratio"; - // - // JaboAdjustAspectRatioCheckbox - // - this.JaboAdjustAspectRatioCheckbox.AutoSize = true; - this.JaboAdjustAspectRatioCheckbox.Location = new System.Drawing.Point(154, 165); - this.JaboAdjustAspectRatioCheckbox.Name = "JaboAdjustAspectRatioCheckbox"; - this.JaboAdjustAspectRatioCheckbox.Size = new System.Drawing.Size(15, 14); - this.JaboAdjustAspectRatioCheckbox.TabIndex = 15; - this.JaboAdjustAspectRatioCheckbox.UseVisualStyleBackColor = true; + //// + //// JaboAdjustAspectRatioCheckbox + //// + //this.JaboAdjustAspectRatioCheckbox.AutoSize = true; + //this.JaboAdjustAspectRatioCheckbox.Location = new System.Drawing.Point(154, 165); + //this.JaboAdjustAspectRatioCheckbox.Name = "JaboAdjustAspectRatioCheckbox"; + //this.JaboAdjustAspectRatioCheckbox.Size = new System.Drawing.Size(15, 14); + //this.JaboAdjustAspectRatioCheckbox.TabIndex = 15; + //this.JaboAdjustAspectRatioCheckbox.UseVisualStyleBackColor = true; // // label61 // @@ -3591,15 +3591,15 @@ this.label61.Size = new System.Drawing.Size(89, 13); this.label61.TabIndex = 14; this.label61.Text = "Antialiasing Level"; - // - // JaboAntialiasingLevelDropdown - // - this.JaboAntialiasingLevelDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.JaboAntialiasingLevelDropdown.FormattingEnabled = true; - this.JaboAntialiasingLevelDropdown.Location = new System.Drawing.Point(154, 45); - this.JaboAntialiasingLevelDropdown.Name = "JaboAntialiasingLevelDropdown"; - this.JaboAntialiasingLevelDropdown.Size = new System.Drawing.Size(121, 21); - this.JaboAntialiasingLevelDropdown.TabIndex = 13; + //// + //// JaboAntialiasingLevelDropdown + //// + //this.JaboAntialiasingLevelDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + //this.JaboAntialiasingLevelDropdown.FormattingEnabled = true; + //this.JaboAntialiasingLevelDropdown.Location = new System.Drawing.Point(154, 45); + //this.JaboAntialiasingLevelDropdown.Name = "JaboAntialiasingLevelDropdown"; + //this.JaboAntialiasingLevelDropdown.Size = new System.Drawing.Size(121, 21); + //this.JaboAntialiasingLevelDropdown.TabIndex = 13; // // label60 // @@ -3609,15 +3609,15 @@ this.label60.Size = new System.Drawing.Size(117, 13); this.label60.TabIndex = 12; this.label60.Text = "Always use texture filter"; - // - // JaboTextureFilterCheckbox - // - this.JaboTextureFilterCheckbox.AutoSize = true; - this.JaboTextureFilterCheckbox.Location = new System.Drawing.Point(154, 135); - this.JaboTextureFilterCheckbox.Name = "JaboTextureFilterCheckbox"; - this.JaboTextureFilterCheckbox.Size = new System.Drawing.Size(15, 14); - this.JaboTextureFilterCheckbox.TabIndex = 11; - this.JaboTextureFilterCheckbox.UseVisualStyleBackColor = true; + //// + //// JaboTextureFilterCheckbox + //// + //this.JaboTextureFilterCheckbox.AutoSize = true; + //this.JaboTextureFilterCheckbox.Location = new System.Drawing.Point(154, 135); + //this.JaboTextureFilterCheckbox.Name = "JaboTextureFilterCheckbox"; + //this.JaboTextureFilterCheckbox.Size = new System.Drawing.Size(15, 14); + //this.JaboTextureFilterCheckbox.TabIndex = 11; + //this.JaboTextureFilterCheckbox.UseVisualStyleBackColor = true; // // label59 // @@ -3627,42 +3627,42 @@ this.label59.Size = new System.Drawing.Size(62, 13); this.label59.TabIndex = 10; this.label59.Text = "Super 2xsal"; - // - // JaboSuper2xsalCheckbox - // - this.JaboSuper2xsalCheckbox.AutoSize = true; - this.JaboSuper2xsalCheckbox.Location = new System.Drawing.Point(154, 105); - this.JaboSuper2xsalCheckbox.Name = "JaboSuper2xsalCheckbox"; - this.JaboSuper2xsalCheckbox.Size = new System.Drawing.Size(15, 14); - this.JaboSuper2xsalCheckbox.TabIndex = 9; - this.JaboSuper2xsalCheckbox.UseVisualStyleBackColor = true; - // - // JaboBrightnessBox - // - this.JaboBrightnessBox.Increment = new decimal(new int[] { - 3, - 0, - 0, - 0}); - this.JaboBrightnessBox.Location = new System.Drawing.Point(154, 75); - this.JaboBrightnessBox.Maximum = new decimal(new int[] { - 190, - 0, - 0, - 0}); - this.JaboBrightnessBox.Minimum = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.JaboBrightnessBox.Name = "JaboBrightnessBox"; - this.JaboBrightnessBox.Size = new System.Drawing.Size(48, 20); - this.JaboBrightnessBox.TabIndex = 8; - this.JaboBrightnessBox.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); + //// + //// JaboSuper2xsalCheckbox + //// + //this.JaboSuper2xsalCheckbox.AutoSize = true; + //this.JaboSuper2xsalCheckbox.Location = new System.Drawing.Point(154, 105); + //this.JaboSuper2xsalCheckbox.Name = "JaboSuper2xsalCheckbox"; + //this.JaboSuper2xsalCheckbox.Size = new System.Drawing.Size(15, 14); + //this.JaboSuper2xsalCheckbox.TabIndex = 9; + //this.JaboSuper2xsalCheckbox.UseVisualStyleBackColor = true; + //// + //// JaboBrightnessBox + //// + //this.JaboBrightnessBox.Increment = new decimal(new int[] { + // 3, + // 0, + // 0, + // 0}); + //this.JaboBrightnessBox.Location = new System.Drawing.Point(154, 75); + //this.JaboBrightnessBox.Maximum = new decimal(new int[] { + // 190, + // 0, + // 0, + // 0}); + //this.JaboBrightnessBox.Minimum = new decimal(new int[] { + // 100, + // 0, + // 0, + // 0}); + //this.JaboBrightnessBox.Name = "JaboBrightnessBox"; + //this.JaboBrightnessBox.Size = new System.Drawing.Size(48, 20); + //this.JaboBrightnessBox.TabIndex = 8; + //this.JaboBrightnessBox.Value = new decimal(new int[] { + // 100, + // 0, + // 0, + // 0}); // // label57 // @@ -3672,15 +3672,15 @@ this.label57.Size = new System.Drawing.Size(56, 13); this.label57.TabIndex = 7; this.label57.Text = "Brightness"; - // - // JaboAnisotropicFilteringLevelDropdown - // - this.JaboAnisotropicFilteringLevelDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.JaboAnisotropicFilteringLevelDropdown.FormattingEnabled = true; - this.JaboAnisotropicFilteringLevelDropdown.Location = new System.Drawing.Point(154, 12); - this.JaboAnisotropicFilteringLevelDropdown.Name = "JaboAnisotropicFilteringLevelDropdown"; - this.JaboAnisotropicFilteringLevelDropdown.Size = new System.Drawing.Size(121, 21); - this.JaboAnisotropicFilteringLevelDropdown.TabIndex = 6; + //// + //// JaboAnisotropicFilteringLevelDropdown + //// + //this.JaboAnisotropicFilteringLevelDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + //this.JaboAnisotropicFilteringLevelDropdown.FormattingEnabled = true; + //this.JaboAnisotropicFilteringLevelDropdown.Location = new System.Drawing.Point(154, 12); + //this.JaboAnisotropicFilteringLevelDropdown.Name = "JaboAnisotropicFilteringLevelDropdown"; + //this.JaboAnisotropicFilteringLevelDropdown.Size = new System.Drawing.Size(121, 21); + //this.JaboAnisotropicFilteringLevelDropdown.TabIndex = 6; // // label51 // @@ -4585,32 +4585,32 @@ this.GLideN64_UseNativeResolutionFactor.Name = "GLideN64_UseNativeResolutionFactor"; this.GLideN64_UseNativeResolutionFactor.Size = new System.Drawing.Size(32, 20); this.GLideN64_UseNativeResolutionFactor.TabIndex = 77; - // - // JaboResolutionHeightBox - // - this.JaboResolutionHeightBox.ByteSize = BizHawk.Client.Common.WatchSize.Byte; - this.JaboResolutionHeightBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.JaboResolutionHeightBox.Location = new System.Drawing.Point(127, 90); - this.JaboResolutionHeightBox.MaxLength = 4; - this.JaboResolutionHeightBox.Name = "JaboResolutionHeightBox"; - this.JaboResolutionHeightBox.Nullable = false; - this.JaboResolutionHeightBox.Size = new System.Drawing.Size(52, 20); - this.JaboResolutionHeightBox.TabIndex = 34; - this.JaboResolutionHeightBox.Text = "0"; - this.JaboResolutionHeightBox.Type = BizHawk.Client.Common.DisplayType.Signed; - // - // JaboResolutionWidthBox - // - this.JaboResolutionWidthBox.ByteSize = BizHawk.Client.Common.WatchSize.Byte; - this.JaboResolutionWidthBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.JaboResolutionWidthBox.Location = new System.Drawing.Point(127, 60); - this.JaboResolutionWidthBox.MaxLength = 4; - this.JaboResolutionWidthBox.Name = "JaboResolutionWidthBox"; - this.JaboResolutionWidthBox.Nullable = false; - this.JaboResolutionWidthBox.Size = new System.Drawing.Size(52, 20); - this.JaboResolutionWidthBox.TabIndex = 33; - this.JaboResolutionWidthBox.Text = "0"; - this.JaboResolutionWidthBox.Type = BizHawk.Client.Common.DisplayType.Signed; + //// + //// JaboResolutionHeightBox + //// + //this.JaboResolutionHeightBox.ByteSize = BizHawk.Client.Common.WatchSize.Byte; + //this.JaboResolutionHeightBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + //this.JaboResolutionHeightBox.Location = new System.Drawing.Point(127, 90); + //this.JaboResolutionHeightBox.MaxLength = 4; + //this.JaboResolutionHeightBox.Name = "JaboResolutionHeightBox"; + //this.JaboResolutionHeightBox.Nullable = false; + //this.JaboResolutionHeightBox.Size = new System.Drawing.Size(52, 20); + //this.JaboResolutionHeightBox.TabIndex = 34; + //this.JaboResolutionHeightBox.Text = "0"; + //this.JaboResolutionHeightBox.Type = BizHawk.Client.Common.DisplayType.Signed; + //// + //// JaboResolutionWidthBox + //// + //this.JaboResolutionWidthBox.ByteSize = BizHawk.Client.Common.WatchSize.Byte; + //this.JaboResolutionWidthBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + //this.JaboResolutionWidthBox.Location = new System.Drawing.Point(127, 60); + //this.JaboResolutionWidthBox.MaxLength = 4; + //this.JaboResolutionWidthBox.Name = "JaboResolutionWidthBox"; + //this.JaboResolutionWidthBox.Nullable = false; + //this.JaboResolutionWidthBox.Size = new System.Drawing.Size(52, 20); + //this.JaboResolutionWidthBox.TabIndex = 33; + //this.JaboResolutionWidthBox.Text = "0"; + //this.JaboResolutionWidthBox.Type = BizHawk.Client.Common.DisplayType.Signed; // // N64VideoPluginconfig // @@ -4660,11 +4660,11 @@ this.tabPage2.PerformLayout(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); - this.JaboTab.ResumeLayout(false); - this.JaboTab.PerformLayout(); - this.JaboPerGameHacksGroupBox.ResumeLayout(false); - this.JaboPerGameHacksGroupBox.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).EndInit(); + //this.JaboTab.ResumeLayout(false); + //this.JaboTab.PerformLayout(); + //this.JaboPerGameHacksGroupBox.ResumeLayout(false); + //this.JaboPerGameHacksGroupBox.PerformLayout(); + //((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).EndInit(); this.GLideN64Tab.ResumeLayout(false); this.tabControl3.ResumeLayout(false); this.tabPage5.ResumeLayout(false); @@ -4923,37 +4923,37 @@ 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.TabPage JaboTab; 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.NumericUpDown JaboBrightnessBox; + //private System.Windows.Forms.NumericUpDown JaboBrightnessBox; 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.CheckBox JaboTextureFilterCheckbox; + //private System.Windows.Forms.CheckBox JaboTextureFilterCheckbox; private System.Windows.Forms.Label label61; - private System.Windows.Forms.ComboBox JaboAntialiasingLevelDropdown; - private System.Windows.Forms.CheckBox JaboAdjustAspectRatioCheckbox; + //private System.Windows.Forms.ComboBox JaboAntialiasingLevelDropdown; + //private System.Windows.Forms.CheckBox JaboAdjustAspectRatioCheckbox; private System.Windows.Forms.Label label62; private System.Windows.Forms.Label label63; 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.CheckBox JaboAlphaBlendingCheckbox; + //private System.Windows.Forms.CheckBox JaboAlphaBlendingCheckbox; 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.CheckBox JaboZCompareCheckbox; + //private System.Windows.Forms.CheckBox JaboZCompareCheckbox; private System.Windows.Forms.Label label68; - private System.Windows.Forms.CheckBox JaboCopyFrameBufferCheckbox; - private System.Windows.Forms.GroupBox JaboPerGameHacksGroupBox; - private System.Windows.Forms.CheckBox JaboUseForGameCheckbox; + //private System.Windows.Forms.CheckBox JaboCopyFrameBufferCheckbox; + //private System.Windows.Forms.GroupBox JaboPerGameHacksGroupBox; + //private System.Windows.Forms.CheckBox JaboUseForGameCheckbox; 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 WatchValueBox JaboResolutionHeightBox; - private WatchValueBox JaboResolutionWidthBox; + //private WatchValueBox JaboResolutionHeightBox; + //private WatchValueBox JaboResolutionWidthBox; private System.Windows.Forms.Label label71; private System.Windows.Forms.Label LabelVideoResolutionY; private System.Windows.Forms.Label LabelVideoResolutionX; diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs index 4ff6839470..bece84c06f 100644 --- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs +++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs @@ -33,21 +33,21 @@ namespace BizHawk.Client.EmuHawk "Custom" }; - private static readonly string[] ValidResolutionsJabo = - { - "320 x 240", - "400 x 300", - "512 x 384", - "640 x 480", - "800 x 600", - "1024 x 768", - "1152 x 864", - "1280 x 960", - "1600 x 1200", - "848 x 480", - "1024 x 576", - "1380 x 768" - }; + //private static readonly string[] ValidResolutionsJabo = + //{ + // "320 x 240", + // "400 x 300", + // "512 x 384", + // "640 x 480", + // "800 x 600", + // "1024 x 768", + // "1152 x 864", + // "1280 x 960", + // "1600 x 1200", + // "848 x 480", + // "1024 x 576", + // "1380 x 768" + //}; private bool _programmaticallyChangingPluginComboBox = false; @@ -149,40 +149,40 @@ namespace BizHawk.Client.EmuHawk case "Glide64mk2": _ss.VideoPlugin = PluginType.GlideMk2; break; - case "Jabo 1.6.1": - _ss.VideoPlugin = PluginType.Jabo; - break; + //case "Jabo 1.6.1": + // _ss.VideoPlugin = PluginType.Jabo; + // break; case "GLideN64": _ss.VideoPlugin = PluginType.GLideN64; break; } - // Jabo - _ss.JaboPlugin.UseDefaultHacks = JaboUseForGameCheckbox.Checked; + //// Jabo + //_ss.JaboPlugin.UseDefaultHacks = JaboUseForGameCheckbox.Checked; - _ss.JaboPlugin.clear_mode = JaboClearModeDropDown.SelectedItem - .ToString() - .GetEnumFromDescription(); + //_ss.JaboPlugin.clear_mode = JaboClearModeDropDown.SelectedItem + // .ToString() + // .GetEnumFromDescription(); - _ss.JaboPlugin.anisotropic_level = JaboAnisotropicFilteringLevelDropdown.SelectedItem - .ToString() - .GetEnumFromDescription(); + //_ss.JaboPlugin.anisotropic_level = JaboAnisotropicFilteringLevelDropdown.SelectedItem + // .ToString() + // .GetEnumFromDescription(); - _ss.JaboPlugin.antialiasing_level = JaboAntialiasingLevelDropdown.SelectedItem - .ToString() - .GetEnumFromDescription(); + //_ss.JaboPlugin.antialiasing_level = JaboAntialiasingLevelDropdown.SelectedItem + // .ToString() + // .GetEnumFromDescription(); - _ss.JaboPlugin.brightness = (int)JaboBrightnessBox.Value; - _ss.JaboPlugin.super2xsal = JaboSuper2xsalCheckbox.Checked; - _ss.JaboPlugin.texture_filter = JaboTextureFilterCheckbox.Checked; - _ss.JaboPlugin.adjust_aspect_ratio = JaboAdjustAspectRatioCheckbox.Checked; - _ss.JaboPlugin.legacy_pixel_pipeline = JaboLegacyPixelPipelineCheckbox.Checked; - _ss.JaboPlugin.alpha_blending = JaboAlphaBlendingCheckbox.Checked; - _ss.JaboPlugin.direct3d_transformation_pipeline = JaboDirect3DPipelineCheckbox.Checked; - _ss.JaboPlugin.z_compare = JaboZCompareCheckbox.Checked; - _ss.JaboPlugin.copy_framebuffer = JaboCopyFrameBufferCheckbox.Checked; - _ss.JaboPlugin.resolution_width = JaboResolutionWidthBox.ToRawInt().Value; - _ss.JaboPlugin.resolution_height = JaboResolutionHeightBox.ToRawInt().Value; + //_ss.JaboPlugin.brightness = (int)JaboBrightnessBox.Value; + //_ss.JaboPlugin.super2xsal = JaboSuper2xsalCheckbox.Checked; + //_ss.JaboPlugin.texture_filter = JaboTextureFilterCheckbox.Checked; + //_ss.JaboPlugin.adjust_aspect_ratio = JaboAdjustAspectRatioCheckbox.Checked; + //_ss.JaboPlugin.legacy_pixel_pipeline = JaboLegacyPixelPipelineCheckbox.Checked; + //_ss.JaboPlugin.alpha_blending = JaboAlphaBlendingCheckbox.Checked; + //_ss.JaboPlugin.direct3d_transformation_pipeline = JaboDirect3DPipelineCheckbox.Checked; + //_ss.JaboPlugin.z_compare = JaboZCompareCheckbox.Checked; + //_ss.JaboPlugin.copy_framebuffer = JaboCopyFrameBufferCheckbox.Checked; + //_ss.JaboPlugin.resolution_width = JaboResolutionWidthBox.ToRawInt().Value; + //_ss.JaboPlugin.resolution_height = JaboResolutionHeightBox.ToRawInt().Value; // Rice _ss.RicePlugin.NormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked; @@ -540,9 +540,9 @@ namespace BizHawk.Client.EmuHawk case PluginType.Rice: PluginComboBox.Text = "Rice"; break; - case PluginType.Jabo: - PluginComboBox.Text = "Jabo 1.6.1"; - break; + //case PluginType.Jabo: + // PluginComboBox.Text = "Jabo 1.6.1"; + // break; case PluginType.GLideN64: PluginComboBox.Text = "GLideN64"; break; @@ -566,28 +566,28 @@ namespace BizHawk.Client.EmuHawk ShowCustomVideoResolutionControls(); } - // Jabo - JaboUseForGameCheckbox.Checked = _ss.JaboPlugin.UseDefaultHacks; - JaboClearModeDropDown - .PopulateFromEnum(_ss.JaboPlugin.clear_mode); - JaboResolutionWidthBox.Text = _ss.JaboPlugin.resolution_width.ToString(); - JaboResolutionHeightBox.Text = _ss.JaboPlugin.resolution_height.ToString(); + //// Jabo + //JaboUseForGameCheckbox.Checked = _ss.JaboPlugin.UseDefaultHacks; + //JaboClearModeDropDown + // .PopulateFromEnum(_ss.JaboPlugin.clear_mode); + //JaboResolutionWidthBox.Text = _ss.JaboPlugin.resolution_width.ToString(); + //JaboResolutionHeightBox.Text = _ss.JaboPlugin.resolution_height.ToString(); - JaboUpdateHacksSection(); + //JaboUpdateHacksSection(); - JaboAnisotropicFilteringLevelDropdown - .PopulateFromEnum(_ss.JaboPlugin.anisotropic_level); - JaboAntialiasingLevelDropdown - .PopulateFromEnum(_ss.JaboPlugin.antialiasing_level); - JaboBrightnessBox.Value = _ss.JaboPlugin.brightness; - JaboSuper2xsalCheckbox.Checked = _ss.JaboPlugin.super2xsal; - JaboTextureFilterCheckbox.Checked = _ss.JaboPlugin.texture_filter; - JaboAdjustAspectRatioCheckbox.Checked = _ss.JaboPlugin.adjust_aspect_ratio; - JaboLegacyPixelPipelineCheckbox.Checked = _ss.JaboPlugin.legacy_pixel_pipeline; - JaboAlphaBlendingCheckbox.Checked = _ss.JaboPlugin.alpha_blending; - JaboDirect3DPipelineCheckbox.Checked = _ss.JaboPlugin.direct3d_transformation_pipeline; - JaboZCompareCheckbox.Checked = _ss.JaboPlugin.z_compare; - JaboCopyFrameBufferCheckbox.Checked = _ss.JaboPlugin.copy_framebuffer; + //JaboAnisotropicFilteringLevelDropdown + // .PopulateFromEnum(_ss.JaboPlugin.anisotropic_level); + //JaboAntialiasingLevelDropdown + // .PopulateFromEnum(_ss.JaboPlugin.antialiasing_level); + //JaboBrightnessBox.Value = _ss.JaboPlugin.brightness; + //JaboSuper2xsalCheckbox.Checked = _ss.JaboPlugin.super2xsal; + //JaboTextureFilterCheckbox.Checked = _ss.JaboPlugin.texture_filter; + //JaboAdjustAspectRatioCheckbox.Checked = _ss.JaboPlugin.adjust_aspect_ratio; + //JaboLegacyPixelPipelineCheckbox.Checked = _ss.JaboPlugin.legacy_pixel_pipeline; + //JaboAlphaBlendingCheckbox.Checked = _ss.JaboPlugin.alpha_blending; + //JaboDirect3DPipelineCheckbox.Checked = _ss.JaboPlugin.direct3d_transformation_pipeline; + //JaboZCompareCheckbox.Checked = _ss.JaboPlugin.z_compare; + //JaboCopyFrameBufferCheckbox.Checked = _ss.JaboPlugin.copy_framebuffer; // Rice RiceNormalAlphaBlender_CB.Checked = _ss.RicePlugin.NormalAlphaBlender; @@ -1223,13 +1223,13 @@ namespace BizHawk.Client.EmuHawk oldSizeY = int.Parse(VideoResolutionYTextBox.Text); } - if (PluginComboBox.Text == "Jabo 1.6.1") - { - // Change resolution list to jabo - VideoResolutionComboBox.Items.Clear(); - VideoResolutionComboBox.Items.AddRange(ValidResolutionsJabo); - } - else + //if (PluginComboBox.Text == "Jabo 1.6.1") + //{ + // // Change resolution list to jabo + // VideoResolutionComboBox.Items.Clear(); + // VideoResolutionComboBox.Items.AddRange(ValidResolutionsJabo); + //} + //else { // Change resolution list to the rest VideoResolutionComboBox.Items.Clear(); @@ -1289,25 +1289,25 @@ namespace BizHawk.Client.EmuHawk } } - private void JaboUseForGameCheckbox_CheckedChanged(object sender, EventArgs e) - { - JaboPerGameHacksGroupBox.Controls - .OfType() - .ToList() - .ForEach(c => c.Enabled = !JaboUseForGameCheckbox.Checked); + //private void JaboUseForGameCheckbox_CheckedChanged(object sender, EventArgs e) + //{ + // JaboPerGameHacksGroupBox.Controls + // .OfType() + // .ToList() + // .ForEach(c => c.Enabled = !JaboUseForGameCheckbox.Checked); - JaboUpdateHacksSection(); - } + // JaboUpdateHacksSection(); + //} - private void JaboUpdateHacksSection() - { - if (JaboUseForGameCheckbox.Checked) - { - JaboResolutionWidthBox.Text = GetIntFromDB("Jabo_Resolution_Width", -1).ToString(); - JaboResolutionHeightBox.Text = GetIntFromDB("Jabo_Resolution_Height", -1).ToString(); - JaboClearModeDropDown.SelectedItem = ((N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode)GetIntFromDB("Jabo_Clear_Frame", 0)).GetDescription(); - } - } + //private void JaboUpdateHacksSection() + //{ + // if (JaboUseForGameCheckbox.Checked) + // { + // JaboResolutionWidthBox.Text = GetIntFromDB("Jabo_Resolution_Width", -1).ToString(); + // JaboResolutionHeightBox.Text = GetIntFromDB("Jabo_Resolution_Height", -1).ToString(); + // JaboClearModeDropDown.SelectedItem = ((N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode)GetIntFromDB("Jabo_Clear_Frame", 0)).GetDescription(); + // } + //} private void VideoResolutionComboBox_SelectedIndexChanged(object sender, EventArgs e) { diff --git a/BizHawk.Client.EmuHawk/config/N64/NewN64PluginSettings.cs b/BizHawk.Client.EmuHawk/config/N64/NewN64PluginSettings.cs index 3c797cf439..bda45ff0fc 100644 --- a/BizHawk.Client.EmuHawk/config/N64/NewN64PluginSettings.cs +++ b/BizHawk.Client.EmuHawk/config/N64/NewN64PluginSettings.cs @@ -94,7 +94,7 @@ namespace BizHawk.Client.EmuHawk RicePropertyGrid.SelectedObject = _ss.RicePlugin; Glidemk2PropertyGrid.SelectedObject = _ss.Glide64mk2Plugin; GlidePropertyGrid.SelectedObject = _ss.GlidePlugin; - JaboPropertyGrid.SelectedObject = _ss.JaboPlugin; + //JaboPropertyGrid.SelectedObject = _ss.JaboPlugin; } #region Setting Get/Set diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs index 91f396c31d..d3bbbe2d68 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs @@ -1,184 +1,184 @@ -using System.Collections.Generic; -using System.ComponentModel; -using Newtonsoft.Json; +//using System.Collections.Generic; +//using System.ComponentModel; +//using Newtonsoft.Json; -using BizHawk.Emulation.Common; -using System.Reflection; +//using BizHawk.Emulation.Common; +//using System.Reflection; -namespace BizHawk.Emulation.Cores.Nintendo.N64 -{ - public partial class N64SyncSettings - { - public class N64JaboPluginSettings : IPluginSettings - { - public N64JaboPluginSettings() - { - UseDefaultHacks = true; +//namespace BizHawk.Emulation.Cores.Nintendo.N64 +//{ +// public partial class N64SyncSettings +// { +// public class N64JaboPluginSettings : IPluginSettings +// { +// public N64JaboPluginSettings() +// { +// UseDefaultHacks = true; - anisotropic_level = ANISOTROPIC_FILTERING_LEVEL.FourTimes; - antialiasing_level = ANTIALIASING_LEVEL.Off; - brightness = 100; - super2xsal = false; - texture_filter = false; +// anisotropic_level = ANISOTROPIC_FILTERING_LEVEL.FourTimes; +// antialiasing_level = ANTIALIASING_LEVEL.Off; +// brightness = 100; +// super2xsal = false; +// texture_filter = false; - adjust_aspect_ratio = false; - legacy_pixel_pipeline = false; - alpha_blending = false; - //wireframe = false; - direct3d_transformation_pipeline = false; - z_compare = false; - copy_framebuffer = false; +// adjust_aspect_ratio = false; +// legacy_pixel_pipeline = false; +// alpha_blending = false; +// //wireframe = false; +// direct3d_transformation_pipeline = false; +// z_compare = false; +// copy_framebuffer = false; - // Per game - resolution_width = -1; - resolution_height = -1; - clear_mode = Direct3DClearMode.Default; - } +// // Per game +// resolution_width = -1; +// resolution_height = -1; +// clear_mode = Direct3DClearMode.Default; +// } - public PluginType GetPluginType() - { - return PluginType.Jabo; - } +// public PluginType GetPluginType() +// { +// return PluginType.Jabo; +// } - public void FillPerGameHacks(GameInfo game) - { - if (UseDefaultHacks) - { - resolution_width = game.GetInt("Jabo_Resolution_Width", -1); - resolution_height = game.GetInt("Jabo_Resolution_Height", -1); - clear_mode = (Direct3DClearMode)game.GetInt("Jabo_Clear_Frame", (int)Direct3DClearMode.Default); - } - } +// public void FillPerGameHacks(GameInfo game) +// { +// if (UseDefaultHacks) +// { +// resolution_width = game.GetInt("Jabo_Resolution_Width", -1); +// resolution_height = game.GetInt("Jabo_Resolution_Height", -1); +// 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)] - [DisplayName("Anisotropic filtering")] - [Description("Anisotropic filtering level")] - public ANISOTROPIC_FILTERING_LEVEL anisotropic_level { get; set; } +// [DefaultValue(ANISOTROPIC_FILTERING_LEVEL.FourTimes)] +// [DisplayName("Anisotropic filtering")] +// [Description("Anisotropic filtering level")] +// public ANISOTROPIC_FILTERING_LEVEL anisotropic_level { get; set; } - [DefaultValue(ANTIALIASING_LEVEL.Off)] - [DisplayName("Full-Scene Antialiasing")] - [Description("Full-Scene Antialiasing level")] - public ANTIALIASING_LEVEL antialiasing_level { get; set; } +// [DefaultValue(ANTIALIASING_LEVEL.Off)] +// [DisplayName("Full-Scene Antialiasing")] +// [Description("Full-Scene Antialiasing level")] +// public ANTIALIASING_LEVEL antialiasing_level { get; set; } - // Range: 100-190 in increments of 3, TODO: would be nice to put this in the metadata - [DefaultValue(100)] - [DisplayName("Brightness")] - [Description("Brightness level, 100%-190%")] - public int brightness { get; set; } +// // Range: 100-190 in increments of 3, TODO: would be nice to put this in the metadata +// [DefaultValue(100)] +// [DisplayName("Brightness")] +// [Description("Brightness level, 100%-190%")] +// public int brightness { get; set; } - [DefaultValue(false)] - [DisplayName("Super2xSal textures")] - [Description("Enables Super2xSal textures")] - public bool super2xsal { get; set; } +// [DefaultValue(false)] +// [DisplayName("Super2xSal textures")] +// [Description("Enables Super2xSal textures")] +// public bool super2xsal { get; set; } - [DefaultValue(false)] - [DisplayName("Always use texture filter")] - [Description("Always use texture filter")] - public bool texture_filter { get; set; } +// [DefaultValue(false)] +// [DisplayName("Always use texture filter")] +// [Description("Always use texture filter")] +// public bool texture_filter { get; set; } - [DefaultValue(false)] - [DisplayName("Adjust game aspect ratio to match yours")] - [Description("Adjust game aspect ratio to match yours")] - public bool adjust_aspect_ratio { get; set; } +// [DefaultValue(false)] +// [DisplayName("Adjust game aspect ratio to match yours")] +// [Description("Adjust game aspect ratio to match yours")] +// public bool adjust_aspect_ratio { get; set; } - [DefaultValue(false)] - [DisplayName("Use legacy pixel pipeline")] - [Description("Use legacy pixel pipeline")] - public bool legacy_pixel_pipeline { get; set; } +// [DefaultValue(false)] +// [DisplayName("Use legacy pixel pipeline")] +// [Description("Use legacy pixel pipeline")] +// public bool legacy_pixel_pipeline { get; set; } - [DefaultValue(false)] - [DisplayName("Force alpha blending")] - [Description("Force alpha blending")] - public bool alpha_blending { get; set; } +// [DefaultValue(false)] +// [DisplayName("Force alpha blending")] +// [Description("Force alpha blending")] +// 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 - //[DefaultValue(false)] - //[DisplayName("Wireframe rendering")] - //[Description("Wireframe rendering")] - //public bool wireframe { get; set; } +// // As far as I can tell there is no way to apply this setting without opening the dll config window +// //[DefaultValue(false)] +// //[DisplayName("Wireframe rendering")] +// //[Description("Wireframe rendering")] +// //public bool wireframe { get; set; } - [DefaultValue(false)] - [DisplayName("Use Direct3D trans pipeline")] - [Description("Use Direct3D transformation pipeline")] - public bool direct3d_transformation_pipeline { get; set; } +// [DefaultValue(false)] +// [DisplayName("Use Direct3D trans pipeline")] +// [Description("Use Direct3D transformation pipeline")] +// public bool direct3d_transformation_pipeline { get; set; } - [DefaultValue(false)] - [DisplayName("Force Z Compare")] - [Description("Force Z Compare")] - public bool z_compare { get; set; } +// [DefaultValue(false)] +// [DisplayName("Force Z Compare")] +// [Description("Force Z Compare")] +// public bool z_compare { get; set; } - [DefaultValue(false)] - [DisplayName("Copy framebuffer")] - [Description("Copy framebuffer to RDRAM")] - public bool copy_framebuffer { get; set; } +// [DefaultValue(false)] +// [DisplayName("Copy framebuffer")] +// [Description("Copy framebuffer to RDRAM")] +// public bool copy_framebuffer { get; set; } - [DefaultValue(-1)] - [DisplayName("Emulated Width")] - [Description("Emulated Width")] - public int resolution_width { get; set; } +// [DefaultValue(-1)] +// [DisplayName("Emulated Width")] +// [Description("Emulated Width")] +// public int resolution_width { get; set; } - [DefaultValue(-1)] - [DisplayName("Emulated Height")] - [Description("Emulated Height")] - public int resolution_height { get; set; } +// [DefaultValue(-1)] +// [DisplayName("Emulated Height")] +// [Description("Emulated Height")] +// public int resolution_height { get; set; } - [DefaultValue(Direct3DClearMode.Default)] - [DisplayName("Direct3D Clear Mode")] - [Description("Direct3D Clear Mode")] - public Direct3DClearMode clear_mode { get; set; } +// [DefaultValue(Direct3DClearMode.Default)] +// [DisplayName("Direct3D Clear Mode")] +// [Description("Direct3D Clear Mode")] +// public Direct3DClearMode clear_mode { get; set; } - public enum ANISOTROPIC_FILTERING_LEVEL - { - [Description("Off")] - Off = 0, +// public enum ANISOTROPIC_FILTERING_LEVEL +// { +// [Description("Off")] +// Off = 0, - [Description("2X")] - TwoTimes = 1, +// [Description("2X")] +// TwoTimes = 1, - [Description("4X")] - FourTimes = 2, +// [Description("4X")] +// FourTimes = 2, - [Description("8X")] - EightTimes = 3, +// [Description("8X")] +// EightTimes = 3, - [Description("16X")] - SixteenTimes = 4 - } +// [Description("16X")] +// SixteenTimes = 4 +// } - public enum ANTIALIASING_LEVEL - { - [Description("Off")] - Off = 0, +// public enum ANTIALIASING_LEVEL +// { +// [Description("Off")] +// Off = 0, - [Description("2X")] - TwoTimes = 1, +// [Description("2X")] +// TwoTimes = 1, - [Description("4X")] - FourTimes = 2, +// [Description("4X")] +// FourTimes = 2, - [Description("8X")] - EightTimes = 3 - } +// [Description("8X")] +// EightTimes = 3 +// } - public enum Direct3DClearMode - { - [Description("Default")] - Default = 0, +// public enum Direct3DClearMode +// { +// [Description("Default")] +// Default = 0, - [Description("Only Per Frame")] - PerFrame = 1, +// [Description("Only Per Frame")] +// PerFrame = 1, - [Description("Always")] - Always = 2 - } +// [Description("Always")] +// Always = 2 +// } - public N64JaboPluginSettings Clone() - { - return (N64JaboPluginSettings)MemberwiseClone(); - } - } +// public N64JaboPluginSettings Clone() +// { +// return (N64JaboPluginSettings)MemberwiseClone(); +// } +// } - } -} \ No newline at end of file +// } +//} \ No newline at end of file diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs index ebc4fe4eea..9fb404d051 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs @@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 RicePlugin = new N64RicePluginSettings(); GlidePlugin = new N64GlidePluginSettings(); Glide64mk2Plugin = new N64Glide64mk2PluginSettings(); - JaboPlugin = new N64JaboPluginSettings(); + //JaboPlugin = new N64JaboPluginSettings(); GLideN64Plugin = new N64GLideN64PluginSettings(); } @@ -42,7 +42,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 public N64RicePluginSettings RicePlugin { get; private set; } public N64GlidePluginSettings GlidePlugin { 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 N64SyncSettings Clone() @@ -56,7 +56,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 RicePlugin = RicePlugin.Clone(), GlidePlugin = GlidePlugin.Clone(), Glide64mk2Plugin = Glide64mk2Plugin.Clone(), - JaboPlugin = JaboPlugin.Clone(), + //JaboPlugin = JaboPlugin.Clone(), GLideN64Plugin = GLideN64Plugin.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.GlideMk2: ips = Glide64mk2Plugin.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; } @@ -118,8 +118,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 [Description("Glide64 mk2")] GlideMk2, - [Description("Jabo")] - Jabo, + //[Description("Jabo")] + //Jabo, [Description("GLideN64")] GLideN64 diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs index f1229951cb..890ea2d611 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs @@ -659,10 +659,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi { m64pConfigOpenSection("Video-Glide64mk2", ref video_plugin_section); } - else if (video_settings.Plugin == PluginType.Jabo) - { - m64pConfigOpenSection("Video-Jabo", ref video_plugin_section); - } + //else if (video_settings.Plugin == PluginType.Jabo) + //{ + // m64pConfigOpenSection("Video-Jabo", ref video_plugin_section); + //} else if (video_settings.Plugin == PluginType.GLideN64) { m64pConfigOpenSection("Video-GLideN64", ref video_plugin_section); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusVideoApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusVideoApi.cs index 049cca357e..3ae493703a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusVideoApi.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusVideoApi.cs @@ -57,9 +57,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi case PluginType.GlideMk2: videoplugin = "mupen64plus-video-glide64mk2.dll"; break; - case PluginType.Jabo: - videoplugin = "mupen64plus-video-jabo.dll"; - break; + //case PluginType.Jabo: + // videoplugin = "mupen64plus-video-jabo.dll"; + // break; case PluginType.GLideN64: videoplugin = "mupen64plus-video-GLideN64.dll"; break;