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

N64 - Remove commented out jabo code

This commit is contained in:
adelikat 2017-06-12 13:07:06 -05:00
parent 0712833de1
commit b1918759be
8 changed files with 5 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,18 +109,6 @@
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 author.";
//
// VersionLabel
//

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

@ -4684,37 +4684,20 @@
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.Label label51;
//private System.Windows.Forms.ComboBox JaboAnisotropicFilteringLevelDropdown;
private System.Windows.Forms.Label label57;
//private System.Windows.Forms.NumericUpDown JaboBrightnessBox;
private System.Windows.Forms.Label label59;
//private System.Windows.Forms.CheckBox JaboSuper2xsalCheckbox;
private System.Windows.Forms.Label label60;
//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.Label label62;
private System.Windows.Forms.Label label63;
private System.Windows.Forms.Label label64;
//private System.Windows.Forms.CheckBox JaboLegacyPixelPipelineCheckbox;
private System.Windows.Forms.Label label65;
//private System.Windows.Forms.CheckBox JaboAlphaBlendingCheckbox;
private System.Windows.Forms.Label label66;
//private System.Windows.Forms.CheckBox JaboDirect3DPipelineCheckbox;
private System.Windows.Forms.Label label67;
//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;
private System.Windows.Forms.Label label70;
//private WatchValueBox JaboResolutionHeightBox;
//private WatchValueBox JaboResolutionWidthBox;
private System.Windows.Forms.Label label71;
private System.Windows.Forms.Label LabelVideoResolutionY;
private System.Windows.Forms.Label LabelVideoResolutionX;

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

@ -33,22 +33,6 @@ 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 bool _programmaticallyChangingPluginComboBox = false;
public N64VideoPluginconfig()
@ -149,41 +133,11 @@ namespace BizHawk.Client.EmuHawk
case "Glide64mk2":
_ss.VideoPlugin = PluginType.GlideMk2;
break;
//case "Jabo 1.6.1":
// _ss.VideoPlugin = PluginType.Jabo;
// break;
case "GLideN64":
_ss.VideoPlugin = PluginType.GLideN64;
break;
}
//// Jabo
//_ss.JaboPlugin.UseDefaultHacks = JaboUseForGameCheckbox.Checked;
//_ss.JaboPlugin.clear_mode = JaboClearModeDropDown.SelectedItem
// .ToString()
// .GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode>();
//_ss.JaboPlugin.anisotropic_level = JaboAnisotropicFilteringLevelDropdown.SelectedItem
// .ToString()
// .GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.ANISOTROPIC_FILTERING_LEVEL>();
//_ss.JaboPlugin.antialiasing_level = JaboAntialiasingLevelDropdown.SelectedItem
// .ToString()
// .GetEnumFromDescription<N64SyncSettings.N64JaboPluginSettings.ANTIALIASING_LEVEL>();
//_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;
_ss.RicePlugin.FastTextureLoading = RiceFastTextureLoading_CB.Checked;
@ -540,9 +494,6 @@ namespace BizHawk.Client.EmuHawk
case PluginType.Rice:
PluginComboBox.Text = "Rice";
break;
//case PluginType.Jabo:
// PluginComboBox.Text = "Jabo 1.6.1";
// break;
case PluginType.GLideN64:
PluginComboBox.Text = "GLideN64";
break;
@ -566,29 +517,6 @@ namespace BizHawk.Client.EmuHawk
ShowCustomVideoResolutionControls();
}
//// Jabo
//JaboUseForGameCheckbox.Checked = _ss.JaboPlugin.UseDefaultHacks;
//JaboClearModeDropDown
// .PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.Direct3DClearMode>(_ss.JaboPlugin.clear_mode);
//JaboResolutionWidthBox.Text = _ss.JaboPlugin.resolution_width.ToString();
//JaboResolutionHeightBox.Text = _ss.JaboPlugin.resolution_height.ToString();
//JaboUpdateHacksSection();
//JaboAnisotropicFilteringLevelDropdown
// .PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.ANISOTROPIC_FILTERING_LEVEL>(_ss.JaboPlugin.anisotropic_level);
//JaboAntialiasingLevelDropdown
// .PopulateFromEnum<N64SyncSettings.N64JaboPluginSettings.ANTIALIASING_LEVEL>(_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;
RiceFastTextureLoading_CB.Checked = _ss.RicePlugin.FastTextureLoading;
@ -1223,18 +1151,10 @@ 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
{
// Change resolution list to the rest
VideoResolutionComboBox.Items.Clear();
VideoResolutionComboBox.Items.AddRange(ValidResolutions);
}
// Change resolution list to the rest
VideoResolutionComboBox.Items.Clear();
VideoResolutionComboBox.Items.AddRange(ValidResolutions);
// If the given resolution is in the table, pick it.
// Otherwise find a best fit
@ -1272,15 +1192,7 @@ namespace BizHawk.Client.EmuHawk
if (bestFit < 0)
{
if (PluginComboBox.Text == "Jabo 1.6.1")
{
// Pick 8 to avoid picking the widescreen resolutions
VideoResolutionComboBox.SelectedIndex = 8;
}
else
{
VideoResolutionComboBox.SelectedIndex = VideoResolutionComboBox.Items.Count - 1;
}
VideoResolutionComboBox.SelectedIndex = VideoResolutionComboBox.Items.Count - 1;
}
else
{
@ -1289,26 +1201,6 @@ namespace BizHawk.Client.EmuHawk
}
}
//private void JaboUseForGameCheckbox_CheckedChanged(object sender, EventArgs e)
//{
// JaboPerGameHacksGroupBox.Controls
// .OfType<Control>()
// .ToList()
// .ForEach(c => c.Enabled = !JaboUseForGameCheckbox.Checked);
// 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 VideoResolutionComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (VideoResolutionComboBox.Text == "Custom")

1
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -620,7 +620,6 @@
<Compile Include="Consoles\Nintendo\N64\N64SyncSettings.Controller.cs" />
<Compile Include="Consoles\Nintendo\N64\N64SyncSettings.Glide.cs" />
<Compile Include="Consoles\Nintendo\N64\N64SyncSettings.GlideMk2.cs" />
<Compile Include="Consoles\Nintendo\N64\N64SyncSettings.Jabo.cs" />
<Compile Include="Consoles\Nintendo\N64\N64SyncSettings.Rice.cs" />
<Compile Include="Consoles\Nintendo\N64\NativeApi\mupen64plusAudioApi.cs" />
<Compile Include="Consoles\Nintendo\N64\NativeApi\mupen64plusCoreApi.cs" />

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

@ -1,184 +0,0 @@
//using System.Collections.Generic;
//using System.ComponentModel;
//using Newtonsoft.Json;
//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;
// 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;
// // Per game
// resolution_width = -1;
// resolution_height = -1;
// clear_mode = Direct3DClearMode.Default;
// }
// 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 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(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; }
// [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("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("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; }
// [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("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 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; }
// public enum ANISOTROPIC_FILTERING_LEVEL
// {
// [Description("Off")]
// Off = 0,
// [Description("2X")]
// TwoTimes = 1,
// [Description("4X")]
// FourTimes = 2,
// [Description("8X")]
// EightTimes = 3,
// [Description("16X")]
// SixteenTimes = 4
// }
// public enum ANTIALIASING_LEVEL
// {
// [Description("Off")]
// Off = 0,
// [Description("2X")]
// TwoTimes = 1,
// [Description("4X")]
// FourTimes = 2,
// [Description("8X")]
// EightTimes = 3
// }
// public enum Direct3DClearMode
// {
// [Description("Default")]
// Default = 0,
// [Description("Only Per Frame")]
// PerFrame = 1,
// [Description("Always")]
// Always = 2
// }
// public N64JaboPluginSettings Clone()
// {
// return (N64JaboPluginSettings)MemberwiseClone();
// }
// }
// }
//}

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

@ -27,7 +27,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
RicePlugin = new N64RicePluginSettings();
GlidePlugin = new N64GlidePluginSettings();
Glide64mk2Plugin = new N64Glide64mk2PluginSettings();
//JaboPlugin = new N64JaboPluginSettings();
GLideN64Plugin = new N64GLideN64PluginSettings();
}
@ -42,7 +41,6 @@ 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 N64GLideN64PluginSettings GLideN64Plugin { get; private set; }
public N64SyncSettings Clone()
@ -56,7 +54,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
RicePlugin = RicePlugin.Clone(),
GlidePlugin = GlidePlugin.Clone(),
Glide64mk2Plugin = Glide64mk2Plugin.Clone(),
//JaboPlugin = JaboPlugin.Clone(),
GLideN64Plugin = GLideN64Plugin.Clone(),
Controllers = System.Array.ConvertAll(Controllers, a => a.Clone())
};
@ -73,7 +70,6 @@ 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.GLideN64: ips = GLideN64Plugin.Clone(); break;
}

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

@ -659,10 +659,6 @@ 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.GLideN64)
{
m64pConfigOpenSection("Video-GLideN64", ref video_plugin_section);

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

@ -57,9 +57,6 @@ 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.GLideN64:
videoplugin = "mupen64plus-video-GLideN64.dll";
break;