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

N64 plugin config - Jabo - add per game settings logic and the Direct3D clear mode per game option, still todo: resolution width/height

This commit is contained in:
adelikat 2014-08-03 17:50:56 +00:00
parent 5908c0ab12
commit b1cd40f276
3 changed files with 319 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,32 +274,36 @@
this.Glide64mk2_filtering = new System.Windows.Forms.ComboBox();
this.Glide64mk2_UseDefaultHacks2 = new System.Windows.Forms.CheckBox();
this.JaboTab = new System.Windows.Forms.TabPage();
this.label68 = new System.Windows.Forms.Label();
this.JaboCopyFrameBufferCheckbox = new System.Windows.Forms.CheckBox();
this.label67 = new System.Windows.Forms.Label();
this.JaboZCompareCheckbox = new System.Windows.Forms.CheckBox();
this.label66 = new System.Windows.Forms.Label();
this.JaboDirect3DPipelineCheckbox = new System.Windows.Forms.CheckBox();
this.label65 = new System.Windows.Forms.Label();
this.JaboAlphaBlendingCheckbox = new System.Windows.Forms.CheckBox();
this.label64 = new System.Windows.Forms.Label();
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.label61 = new System.Windows.Forms.Label();
this.JaboAntialiasingLevelDropdown = new System.Windows.Forms.ComboBox();
this.label60 = new System.Windows.Forms.Label();
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.label57 = new System.Windows.Forms.Label();
this.JaboAnisotropicFilteringLevelDropdown = new System.Windows.Forms.ComboBox();
this.label51 = new System.Windows.Forms.Label();
this.SaveButton = new System.Windows.Forms.Button();
this.CancelBT = new System.Windows.Forms.Button();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.label51 = new System.Windows.Forms.Label();
this.JaboAnisotropicFilteringLevelDropdown = new System.Windows.Forms.ComboBox();
this.label57 = new System.Windows.Forms.Label();
this.JaboBrightnessBox = new System.Windows.Forms.NumericUpDown();
this.JaboSuper2xsalCheckbox = new System.Windows.Forms.CheckBox();
this.label59 = new System.Windows.Forms.Label();
this.JaboTextureFilterCheckbox = new System.Windows.Forms.CheckBox();
this.label60 = new System.Windows.Forms.Label();
this.JaboAntialiasingLevelDropdown = new System.Windows.Forms.ComboBox();
this.label61 = new System.Windows.Forms.Label();
this.JaboAdjustAspectRatioCheckbox = new System.Windows.Forms.CheckBox();
this.label62 = new System.Windows.Forms.Label();
this.label63 = new System.Windows.Forms.Label();
this.JaboLegacyPixelPipelineCheckbox = new System.Windows.Forms.CheckBox();
this.label64 = new System.Windows.Forms.Label();
this.JaboAlphaBlendingCheckbox = new System.Windows.Forms.CheckBox();
this.label65 = new System.Windows.Forms.Label();
this.JaboDirect3DPipelineCheckbox = new System.Windows.Forms.CheckBox();
this.label66 = new System.Windows.Forms.Label();
this.JaboZCompareCheckbox = new System.Windows.Forms.CheckBox();
this.label67 = new System.Windows.Forms.Label();
this.JaboCopyFrameBufferCheckbox = new System.Windows.Forms.CheckBox();
this.label68 = new System.Windows.Forms.Label();
this.JaboUseForGameCheckbox = new System.Windows.Forms.CheckBox();
this.JaboPerGameHacksGroupBox = new System.Windows.Forms.GroupBox();
this.label69 = new System.Windows.Forms.Label();
this.JaboClearModeDropDown = new System.Windows.Forms.ComboBox();
this.N64plugintabcontrol.SuspendLayout();
this.N64vpluginglobaltab.SuspendLayout();
this.RiceTabPage.SuspendLayout();
@ -322,6 +326,7 @@
this.tabPage3.SuspendLayout();
this.JaboTab.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).BeginInit();
this.JaboPerGameHacksGroupBox.SuspendLayout();
this.SuspendLayout();
//
// N64plugintabcontrol
@ -3260,6 +3265,8 @@
//
// 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);
@ -3290,6 +3297,231 @@
this.JaboTab.Text = "Jabo";
this.JaboTab.UseVisualStyleBackColor = true;
//
// label68
//
this.label68.AutoSize = true;
this.label68.Location = new System.Drawing.Point(51, 316);
this.label68.Name = "label68";
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;
//
// label67
//
this.label67.AutoSize = true;
this.label67.Location = new System.Drawing.Point(49, 286);
this.label67.Name = "label67";
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;
//
// label66
//
this.label66.AutoSize = true;
this.label66.Location = new System.Drawing.Point(24, 256);
this.label66.Name = "label66";
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;
//
// label65
//
this.label65.AutoSize = true;
this.label65.Location = new System.Drawing.Point(32, 226);
this.label65.Name = "label65";
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;
//
// label64
//
this.label64.AutoSize = true;
this.label64.Location = new System.Drawing.Point(15, 195);
this.label64.Name = "label64";
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;
//
// label63
//
this.label63.AutoSize = true;
this.label63.Location = new System.Drawing.Point(15, 177);
this.label63.Name = "label63";
this.label63.Size = new System.Drawing.Size(76, 13);
this.label63.TabIndex = 17;
this.label63.Text = "to match yours";
//
// label62
//
this.label62.AutoSize = true;
this.label62.Location = new System.Drawing.Point(15, 164);
this.label62.Name = "label62";
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;
//
// label61
//
this.label61.AutoSize = true;
this.label61.Location = new System.Drawing.Point(49, 49);
this.label61.Name = "label61";
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;
//
// label60
//
this.label60.AutoSize = true;
this.label60.Location = new System.Drawing.Point(21, 136);
this.label60.Name = "label60";
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;
//
// label59
//
this.label59.AutoSize = true;
this.label59.Location = new System.Drawing.Point(76, 107);
this.label59.Name = "label59";
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});
//
// label57
//
this.label57.AutoSize = true;
this.label57.Location = new System.Drawing.Point(82, 79);
this.label57.Name = "label57";
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;
//
// label51
//
this.label51.AutoSize = true;
this.label51.Location = new System.Drawing.Point(18, 15);
this.label51.Name = "label51";
this.label51.Size = new System.Drawing.Size(120, 13);
this.label51.TabIndex = 5;
this.label51.Text = "Anisotropic filtering level";
//
// SaveButton
//
this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@ -3321,230 +3553,45 @@
this.toolTip1.ReshowDelay = 100;
this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
//
// label51
// JaboUseForGameCheckbox
//
this.label51.AutoSize = true;
this.label51.Location = new System.Drawing.Point(18, 15);
this.label51.Name = "label51";
this.label51.Size = new System.Drawing.Size(120, 13);
this.label51.TabIndex = 5;
this.label51.Text = "Anisotropic filtering level";
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);
//
// JaboAnisotropicFilteringLevelDropdown
// JaboPerGameHacksGroupBox
//
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;
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";
//
// label57
// label69
//
this.label57.AutoSize = true;
this.label57.Location = new System.Drawing.Point(82, 79);
this.label57.Name = "label57";
this.label57.Size = new System.Drawing.Size(56, 13);
this.label57.TabIndex = 7;
this.label57.Text = "Brightness";
this.label69.AutoSize = true;
this.label69.Location = new System.Drawing.Point(15, 34);
this.label69.Name = "label69";
this.label69.Size = new System.Drawing.Size(106, 13);
this.label69.TabIndex = 0;
this.label69.Text = "Direct3D Clear Mode";
//
// JaboBrightnessBox
// JaboClearModeDropDown
//
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;
//
// label59
//
this.label59.AutoSize = true;
this.label59.Location = new System.Drawing.Point(76, 107);
this.label59.Name = "label59";
this.label59.Size = new System.Drawing.Size(62, 13);
this.label59.TabIndex = 10;
this.label59.Text = "Super 2xsal";
//
// 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;
//
// label60
//
this.label60.AutoSize = true;
this.label60.Location = new System.Drawing.Point(21, 136);
this.label60.Name = "label60";
this.label60.Size = new System.Drawing.Size(117, 13);
this.label60.TabIndex = 12;
this.label60.Text = "Always use texture filter";
//
// 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;
//
// label61
//
this.label61.AutoSize = true;
this.label61.Location = new System.Drawing.Point(49, 49);
this.label61.Name = "label61";
this.label61.Size = new System.Drawing.Size(89, 13);
this.label61.TabIndex = 14;
this.label61.Text = "Antialiasing Level";
//
// 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;
//
// label62
//
this.label62.AutoSize = true;
this.label62.Location = new System.Drawing.Point(15, 164);
this.label62.Name = "label62";
this.label62.Size = new System.Drawing.Size(123, 13);
this.label62.TabIndex = 16;
this.label62.Text = "Adjust game aspect ratio";
//
// label63
//
this.label63.AutoSize = true;
this.label63.Location = new System.Drawing.Point(15, 177);
this.label63.Name = "label63";
this.label63.Size = new System.Drawing.Size(76, 13);
this.label63.TabIndex = 17;
this.label63.Text = "to match yours";
//
// 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;
//
// label64
//
this.label64.AutoSize = true;
this.label64.Location = new System.Drawing.Point(15, 195);
this.label64.Name = "label64";
this.label64.Size = new System.Drawing.Size(123, 13);
this.label64.TabIndex = 19;
this.label64.Text = "Use legacy pixel pipeline";
//
// 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;
//
// label65
//
this.label65.AutoSize = true;
this.label65.Location = new System.Drawing.Point(32, 226);
this.label65.Name = "label65";
this.label65.Size = new System.Drawing.Size(106, 13);
this.label65.TabIndex = 21;
this.label65.Text = "Force alpha blending";
//
// 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;
//
// label66
//
this.label66.AutoSize = true;
this.label66.Location = new System.Drawing.Point(24, 256);
this.label66.Name = "label66";
this.label66.Size = new System.Drawing.Size(114, 13);
this.label66.TabIndex = 23;
this.label66.Text = "Direct3D trans pipeline";
//
// 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;
//
// label67
//
this.label67.AutoSize = true;
this.label67.Location = new System.Drawing.Point(49, 286);
this.label67.Name = "label67";
this.label67.Size = new System.Drawing.Size(89, 13);
this.label67.TabIndex = 25;
this.label67.Text = "Force Z Compare";
//
// 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;
//
// label68
//
this.label68.AutoSize = true;
this.label68.Location = new System.Drawing.Point(51, 316);
this.label68.Name = "label68";
this.label68.Size = new System.Drawing.Size(87, 13);
this.label68.TabIndex = 27;
this.label68.Text = "Copy framebuffer";
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;
//
// N64VideoPluginconfig
//
@ -3597,6 +3644,8 @@
this.JaboTab.ResumeLayout(false);
this.JaboTab.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.JaboBrightnessBox)).EndInit();
this.JaboPerGameHacksGroupBox.ResumeLayout(false);
this.JaboPerGameHacksGroupBox.PerformLayout();
this.ResumeLayout(false);
}
@ -3873,5 +3922,9 @@
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.Label label69;
private System.Windows.Forms.ComboBox JaboClearModeDropDown;
}
}

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

@ -142,6 +142,10 @@ namespace BizHawk.Client.EmuHawk
}
// Jabo
ss.JaboPlugin.clear_mode = JaboClearModeDropDown.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode>();
ss.JaboPlugin.anisotropic_level = JaboAnisotropicFilteringLevelDropdown.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.ANISOTROPIC_FILTERING_LEVEL>();
@ -440,6 +444,10 @@ namespace BizHawk.Client.EmuHawk
}
// Jabo
JaboUseForGameCheckbox.Checked = ss.JaboPlugin.UseDefaultHacks;
JaboClearModeDropDown
.PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode>(ss.JaboPlugin.clear_mode);
JaboAnisotropicFilteringLevelDropdown
.PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.ANISOTROPIC_FILTERING_LEVEL>(ss.JaboPlugin.anisotropic_level);
JaboAntialiasingLevelDropdown
@ -1057,5 +1065,13 @@ namespace BizHawk.Client.EmuHawk
previousPluginSelection = PluginComboBox.SelectedItem.ToString();
}
private void JaboUseForGameCheckbox_CheckedChanged(object sender, EventArgs e)
{
JaboPerGameHacksGroupBox.Controls
.OfType<Control>()
.ToList()
.ForEach(c => c.Enabled = !JaboUseForGameCheckbox.Checked);
}
}
}

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

@ -13,6 +13,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
public N64JaboPluginSettings()
{
UseDefaultHacks = true;
anisotropic_level = ANISOTROPIC_FILTERING_LEVEL.FourTimes;
antialiasing_level = ANTIALIASING_LEVEL.Off;
brightness = 100;
@ -40,9 +42,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
public void FillPerGameHacks(GameInfo game)
{
if (UseDefaultHacks)
{
resolution_width = game.GetInt("Jabo_resolution_width", -1);
resolution_height = game.GetInt("resolution_height", -1);
clear_mode = (Direct3DClearMode)game.GetInt("clear_mode", (int)Direct3DClearMode.Default);
}
}
public bool UseDefaultHacks { get; set; }
[DefaultValue(ANISOTROPIC_FILTERING_LEVEL.FourTimes)]
[DisplayName("Anisotropic filtering")]
[Description("Anisotropic filtering level")]