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

GLideN64: Added settings to the plugin dialog. Removed some settings from the sync settings that we will not need.

This commit is contained in:
pjgat09 2016-09-22 12:57:09 -04:00
parent a85da435f9
commit 59e43a25f9
3 changed files with 1191 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -398,6 +398,89 @@ namespace BizHawk.Client.EmuHawk
ss.Glide64mk2Plugin.read_back_to_screen = Glide64mk2_read_back_to_screen.SelectedIndex;
ss.Glide64mk2Plugin.fast_crc = Glide64mk2_fast_crc.Checked;
ss.GLideN64Plugin.UseDefaultHacks = GLideN64_UseDefaultHacks.Checked;
switch (GLideN64_MultiSampling.SelectedIndex)
{
case 0: ss.GLideN64Plugin.MultiSampling = 0; break;
case 1: ss.GLideN64Plugin.MultiSampling = 2; break;
case 2: ss.GLideN64Plugin.MultiSampling = 4; break;
case 3: ss.GLideN64Plugin.MultiSampling = 8; break;
case 4: ss.GLideN64Plugin.MultiSampling = 16; break;
default: ss.GLideN64Plugin.MultiSampling = 0; break;
}
ss.GLideN64Plugin.AspectRatio = GLideN64_AspectRatio.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.AspectRatioMode>();
ss.GLideN64Plugin.BufferSwapMode = GLideN64_BufferSwapMode.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.SwapMode>();
ss.GLideN64Plugin.UseNativeResolutionFactor = GLideN64_UseNativeResolutionFactor.Checked;
ss.GLideN64Plugin.bilinearMode = GLideN64_bilinearMode.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.bilinearFilteringMode>();
ss.GLideN64Plugin.MaxAnisotropy = GLideN64_MaxAnisotropy.Checked;
if (GLideN64_CacheSize.Text.IsSigned())
ss.GLideN64Plugin.CacheSize = int.Parse(GLideN64_CacheSize.Text);
else
ss.GLideN64Plugin.CacheSize = 500;
ss.GLideN64Plugin.EnableNoise = GLideN64_EnableNoise.Checked;
ss.GLideN64Plugin.EnableLOD = GLideN64_EnableLOD.Checked;
ss.GLideN64Plugin.EnableHWLighting = GLideN64_HWLighting.Checked;
ss.GLideN64Plugin.EnableShadersStorage = GLideN64_ShadersStorage.Checked;
ss.GLideN64Plugin.CorrectTexrectCoords = GLideN64_CorrectTexrectCoords.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.TexrectCoordsMode>();
ss.GLideN64Plugin.EnableNativeResTexrects = GLideN64_NativeResTexrects.Checked;
ss.GLideN64Plugin.EnableLegacyBlending = GLideN64_LegacyBlending.Checked;
ss.GLideN64Plugin.EnableFragmentDepthWrite = GLideN64_FragmentDepthWrite.Checked;
ss.GLideN64Plugin.EnableFBEmulation = GLideN64_EnableFBEmulation.Checked;
ss.GLideN64Plugin.DisableFBInfo = GLideN64_DisableFBInfo.Checked;
ss.GLideN64Plugin.FBInfoReadColorChunk = GLideN64_FBInfoReadColorChunk.Checked;
ss.GLideN64Plugin.FBInfoReadDepthChunk = GLideN64_FBInfoReadDepthChunk.Checked;
ss.GLideN64Plugin.txFilterMode = GLideN64_txFilterMode.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.TextureFilterMode>();
ss.GLideN64Plugin.txEnhancementMode = GLideN64_txEnhancementMode.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.TextureEnhancementMode>();
ss.GLideN64Plugin.txDeposterize = GLideN64_txDeposterize.Checked;
ss.GLideN64Plugin.txFilterIgnoreBG = GLideN64_txFilterIgnoreBG.Checked;
if (GLideN64_txCacheSize.Text.IsSigned())
ss.GLideN64Plugin.txCacheSize = int.Parse(GLideN64_txCacheSize.Text);
else
ss.GLideN64Plugin.txCacheSize = 100;
ss.GLideN64Plugin.txHiresEnable = GLideN64_txHiresEnable.Checked;
ss.GLideN64Plugin.txHiresFullAlphaChannel = GLideN64_txHiresFullAlphaChannel.Checked;
ss.GLideN64Plugin.txHresAltCRC = GLideN64_txHresAltCRC.Checked;
ss.GLideN64Plugin.txDump = GLideN64_txDump.Checked;
ss.GLideN64Plugin.txCacheCompression = GLideN64_txCacheCompression.Checked;
ss.GLideN64Plugin.txForce16bpp = GLideN64_txForce16bpp.Checked;
ss.GLideN64Plugin.txSaveCache = GLideN64_txSaveCache.Checked;
ss.GLideN64Plugin.txPath = GLideN64_txPath.Text;
ss.GLideN64Plugin.EnableBloom = GLideN64_EnableBloom.Checked;
ss.GLideN64Plugin.bloomThresholdLevel = GLideN64_bloomThresholdLevel.SelectedIndex + 2;
ss.GLideN64Plugin.bloomBlendMode = GLideN64_bloomBlendMode.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.BlendMode>();
ss.GLideN64Plugin.blurAmount = GLideN64_blurAmount.SelectedIndex + 2;
ss.GLideN64Plugin.blurStrength = GLideN64_blurStrength.SelectedIndex + 10;
ss.GLideN64Plugin.ForceGammaCorrection = GLideN64_ForceGammaCorrection.Checked;
if (GLideN64_GammaCorrectionLevel.Text.IsFloat())
ss.GLideN64Plugin.GammaCorrectionLevel = float.Parse(GLideN64_GammaCorrectionLevel.Text);
else
ss.GLideN64Plugin.GammaCorrectionLevel = 2.0f;
ss.GLideN64Plugin.EnableN64DepthCompare = GLideN64_EnableN64DepthCompare.Checked;
ss.GLideN64Plugin.EnableCopyColorToRDRAM = GLideN64_EnableCopyColorToRDRAM.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.CopyColorToRDRAMMode>();
ss.GLideN64Plugin.EnableCopyDepthToRDRAM = GLideN64_EnableCopyDepthToRDRAM.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64GLideN64PluginSettings.CopyDepthToRDRAMMode>();
ss.GLideN64Plugin.EnableCopyColorFromRDRAM = GLideN64_EnableCopyColorFromRDRAM.Checked;
ss.GLideN64Plugin.EnableCopyAuxiliaryToRDRAM = GLideN64_EnableCopyAuxiliaryToRDRAM.Checked;
ss.Core = CoreTypeDropdown.SelectedItem
.ToString()
@ -676,6 +759,76 @@ namespace BizHawk.Client.EmuHawk
Glide64mk2_read_back_to_screen.SelectedIndex = ss.Glide64mk2Plugin.read_back_to_screen;
Glide64mk2_fast_crc.Checked = ss.Glide64mk2Plugin.fast_crc;
}
// GLideN64
GLideN64_UseDefaultHacks.Checked = ss.GLideN64Plugin.UseDefaultHacks;
switch (ss.GLideN64Plugin.MultiSampling)
{
case 0: GLideN64_MultiSampling.SelectedIndex = 0; break;
case 2: GLideN64_MultiSampling.SelectedIndex = 1; break;
case 4: GLideN64_MultiSampling.SelectedIndex = 2; break;
case 8: GLideN64_MultiSampling.SelectedIndex = 3; break;
case 16: GLideN64_MultiSampling.SelectedIndex = 4; break;
default: GLideN64_MultiSampling.SelectedIndex = 0; break;
}
GLideN64_AspectRatio
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.AspectRatioMode>(ss.GLideN64Plugin.AspectRatio);
GLideN64_BufferSwapMode
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.SwapMode>(ss.GLideN64Plugin.BufferSwapMode);
GLideN64_UseNativeResolutionFactor.Checked = ss.GLideN64Plugin.UseNativeResolutionFactor;
GLideN64_bilinearMode
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.bilinearFilteringMode>(ss.GLideN64Plugin.bilinearMode);
GLideN64_MaxAnisotropy.Checked = ss.GLideN64Plugin.MaxAnisotropy;
GLideN64_CacheSize.Text = ss.GLideN64Plugin.CacheSize.ToString();
GLideN64_EnableNoise.Checked = ss.GLideN64Plugin.EnableNoise;
GLideN64_EnableLOD.Checked = ss.GLideN64Plugin.EnableLOD;
GLideN64_HWLighting.Checked = ss.GLideN64Plugin.EnableHWLighting;
GLideN64_ShadersStorage.Checked = ss.GLideN64Plugin.EnableShadersStorage;
GLideN64_CorrectTexrectCoords
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.TexrectCoordsMode>(ss.GLideN64Plugin.CorrectTexrectCoords);
GLideN64_NativeResTexrects.Checked = ss.GLideN64Plugin.EnableNativeResTexrects;
GLideN64_LegacyBlending.Checked = ss.GLideN64Plugin.EnableLegacyBlending;
GLideN64_FragmentDepthWrite.Checked = ss.GLideN64Plugin.EnableFragmentDepthWrite;
GLideN64_EnableFBEmulation.Checked = ss.GLideN64Plugin.EnableFBEmulation;
GLideN64_DisableFBInfo.Checked = ss.GLideN64Plugin.DisableFBInfo;
GLideN64_FBInfoReadColorChunk.Checked = ss.GLideN64Plugin.FBInfoReadColorChunk;
GLideN64_FBInfoReadDepthChunk.Checked = ss.GLideN64Plugin.FBInfoReadDepthChunk;
GLideN64_txFilterMode
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.TextureFilterMode>(ss.GLideN64Plugin.txFilterMode);
GLideN64_txEnhancementMode
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.TextureEnhancementMode>(ss.GLideN64Plugin.txEnhancementMode);
GLideN64_txDeposterize.Checked = ss.GLideN64Plugin.txDeposterize;
GLideN64_txFilterIgnoreBG.Checked = ss.GLideN64Plugin.txFilterIgnoreBG;
GLideN64_txCacheSize.Text = ss.GLideN64Plugin.txCacheSize.ToString();
GLideN64_txHiresEnable.Checked = ss.GLideN64Plugin.txHiresEnable;
GLideN64_txHiresFullAlphaChannel.Checked = ss.GLideN64Plugin.txHiresFullAlphaChannel;
GLideN64_txHresAltCRC.Checked = ss.GLideN64Plugin.txHresAltCRC;
GLideN64_txDump.Checked = ss.GLideN64Plugin.txDump;
GLideN64_txCacheCompression.Checked = ss.GLideN64Plugin.txCacheCompression;
GLideN64_txForce16bpp.Checked = ss.GLideN64Plugin.txForce16bpp;
GLideN64_txSaveCache.Checked = ss.GLideN64Plugin.txSaveCache;
GLideN64_txPath.Text = ss.GLideN64Plugin.txPath;
GLideN64_EnableBloom.Checked = ss.GLideN64Plugin.EnableBloom;
GLideN64_bloomThresholdLevel.SelectedIndex = ss.GLideN64Plugin.bloomThresholdLevel - 2;
GLideN64_bloomBlendMode
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.BlendMode>(ss.GLideN64Plugin.bloomBlendMode);
GLideN64_blurAmount.SelectedIndex = ss.GLideN64Plugin.blurAmount - 2;
GLideN64_blurStrength.SelectedIndex = ss.GLideN64Plugin.blurStrength - 10;
GLideN64_ForceGammaCorrection.Checked = ss.GLideN64Plugin.ForceGammaCorrection;
GLideN64_GammaCorrectionLevel.Text = ss.GLideN64Plugin.GammaCorrectionLevel.ToString();
UpdateGLideN64HacksSection();
if (!ss.GLideN64Plugin.UseDefaultHacks)
{
GLideN64_EnableN64DepthCompare.Checked = ss.GLideN64Plugin.EnableN64DepthCompare;
GLideN64_EnableCopyColorToRDRAM
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.CopyColorToRDRAMMode>(ss.GLideN64Plugin.EnableCopyColorToRDRAM);
GLideN64_EnableCopyDepthToRDRAM
.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.CopyDepthToRDRAMMode>(ss.GLideN64Plugin.EnableCopyDepthToRDRAM);
GLideN64_EnableCopyColorFromRDRAM.Checked = ss.GLideN64Plugin.EnableCopyColorFromRDRAM;
GLideN64_EnableCopyAuxiliaryToRDRAM.Checked = ss.GLideN64Plugin.EnableCopyAuxiliaryToRDRAM;
}
}
private void RiceAnisotropicFiltering_TB_Scroll_1(object sender, EventArgs e)
@ -738,6 +891,25 @@ namespace BizHawk.Client.EmuHawk
}
}
private void UpdateGLideN64HacksSection()
{
if (GLideN64_UseDefaultHacks.Checked)
{
GLideN64_EnableN64DepthCompare.Checked = Global.Game.GetBool("GLideN64_N64DepthCompare", false);
GLideN64_EnableCopyColorToRDRAM.SelectedItem = ((N64SyncSettings.N64GLideN64PluginSettings.CopyColorToRDRAMMode)GetIntFromDB("GLideN64_CopyColorToRDRAM", (int)N64SyncSettings.N64GLideN64PluginSettings.CopyColorToRDRAMMode.AsyncMode)).GetDescription();
GLideN64_EnableCopyDepthToRDRAM.SelectedItem = ((N64SyncSettings.N64GLideN64PluginSettings.CopyDepthToRDRAMMode)GetIntFromDB("GLideN64_CopyDepthToRDRAM", (int)N64SyncSettings.N64GLideN64PluginSettings.CopyDepthToRDRAMMode.DoNotCopy)).GetDescription();
GLideN64_EnableCopyColorFromRDRAM.Checked = Global.Game.GetBool("GLideN64_CopyColorFromRDRAM", false);
GLideN64_EnableCopyAuxiliaryToRDRAM.Checked = Global.Game.GetBool("GLideN64_CopyAuxiliaryToRDRAM", false);
ToggleGLideN64HackCheckboxEnable(false);
}
else
{
ToggleGLideN64HackCheckboxEnable(true);
}
}
private void UpdateGlideHacksSection()
{
if (GlideUseDefaultHacks1.Checked || GlideUseDefaultHacks2.Checked)
@ -948,6 +1120,15 @@ namespace BizHawk.Client.EmuHawk
Glide64mk2_fast_crc.Enabled = val;
}
public void ToggleGLideN64HackCheckboxEnable(bool val)
{
GLideN64_EnableN64DepthCompare.Enabled = val;
GLideN64_EnableCopyColorToRDRAM.Enabled = val;
GLideN64_EnableCopyDepthToRDRAM.Enabled = val;
GLideN64_EnableCopyColorFromRDRAM.Enabled = val;
GLideN64_EnableCopyAuxiliaryToRDRAM.Enabled = val;
}
private void GlideUseDefaultHacks1_CheckedChanged(object sender, EventArgs e)
{
GlideUseDefaultHacks2.Checked = GlideUseDefaultHacks1.Checked;
@ -972,6 +1153,11 @@ namespace BizHawk.Client.EmuHawk
UpdateGlide64mk2HacksSection();
}
private void GLideN64_UseDefaultHacks_CheckedChanged(object sender, EventArgs e)
{
UpdateGLideN64HacksSection();
}
private void PluginComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (programmaticallyChangingPluginComboBox)

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

@ -14,7 +14,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
UseDefaultHacks = true;
VerticalSync = false;
MultiSampling = 0;
AspectRatio = AspectRatioMode.FourThree;
BufferSwapMode = SwapMode.OnVIUpdateCall;
@ -52,9 +51,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
txForce16bpp = false;
txSaveCache = true;
txPath = "";
fontName = "arial.ttf";
fontSize = 18;
fontColor = "B5E61D";
EnableBloom = false;
bloomThresholdLevel = 4;
bloomBlendMode = BlendMode.Strong;
@ -66,11 +62,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
public bool UseDefaultHacks { get; set; }
[DefaultValue(false)]
[DisplayName("Vertical sync")]
[Description("If true, activate the SDL_GL_SWAP_CONTROL attribute")]
public bool VerticalSync { get; set; }
[DefaultValue(0)]
[DisplayName("Multi-sampling")]
[Description("Enable/Disable MultiSampling (0=off, 2,4,8,16=quality)")]
@ -397,21 +388,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
[Description("Path to folder with hi-res texture packs.")]
public string txPath { get; set; }
[DefaultValue("arial.ttf")]
[DisplayName("Font Name")]
[Description("File name of True Type Font for text messages.")]
public string fontName { get; set; }
[DefaultValue(18)]
[DisplayName("Font size")]
[Description("Font size.")]
public int fontSize { get; set; }
[DefaultValue("B5E61D")]
[DisplayName("Font color")]
[Description("Font color in RGB format.")]
public string fontColor { get; set; }
[DefaultValue(false)]
[DisplayName("Enable Bloom")]
[Description("Enable bloom filter")]