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

eliminate snowiy emulator option from CoreComm. this commit is a bit hackish

This commit is contained in:
goyuken 2014-12-05 00:39:02 +00:00
parent 1fad6f4a88
commit 40416656a2
6 changed files with 86 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/config/Config.cs
View File

@ -203,7 +203,6 @@ namespace BizHawk.Client.Common
public bool DispFixAspectRatio = true;
public bool DispFixScaleInteger = true;
public bool DispFullscreenHacks = true;
public bool DispSnowyNullEmulator = true;
public EDispManagerAR DispManagerAR = EDispManagerAR.System;
public int DispCustomUserARWidth = 1;

1
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -76,6 +76,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\References\LuaInterface.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" Condition=" '$(OS)' == 'Windows_NT' " />
<Reference Include="Newtonsoft.Json">
<HintPath>..\References\Newtonsoft.Json.dll</HintPath>

7
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -77,7 +77,6 @@ namespace BizHawk.Client.EmuHawk
ret.RequestGLContext = () => GlobalWin.GLManager.CreateGLContext();
ret.ActivateGLContext = (gl) => GlobalWin.GLManager.Activate((GLManager.ContextRef)gl);
ret.DeactivateGLContext = () => GlobalWin.GLManager.Deactivate();
ret.DispSnowyNullEmulator = () => Global.Config.DispSnowyNullEmulator;
return ret;
}
@ -198,7 +197,7 @@ namespace BizHawk.Client.EmuHawk
InitControls();
Global.CoreComm = CreateCoreComm();
CoreFileProvider.SyncCoreCommInputSignals();
Global.Emulator = new NullEmulator(Global.CoreComm);
Global.Emulator = new NullEmulator(Global.CoreComm, Global.Config.GetCoreSettings<NullEmulator>());
Global.ActiveController = Global.NullControls;
Global.AutoFireController = Global.AutofireNullControls;
Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig();
@ -3488,7 +3487,7 @@ namespace BizHawk.Client.EmuHawk
Global.Emulator.Dispose();
Global.CoreComm = CreateCoreComm();
CoreFileProvider.SyncCoreCommInputSignals();
Global.Emulator = new NullEmulator(Global.CoreComm);
Global.Emulator = new NullEmulator(Global.CoreComm, Global.Config.GetCoreSettings<NullEmulator>());
Global.ActiveController = Global.NullControls;
Global.AutoFireController = Global.AutofireNullControls;
RewireSound();
@ -3507,7 +3506,7 @@ namespace BizHawk.Client.EmuHawk
CloseGame(clearSram);
Global.CoreComm = CreateCoreComm();
CoreFileProvider.SyncCoreCommInputSignals();
Global.Emulator = new NullEmulator(Global.CoreComm);
Global.Emulator = new NullEmulator(Global.CoreComm, Global.Config.GetCoreSettings<NullEmulator>());
Global.Game = GameInfo.NullInstance;
GlobalWin.Tools.Restart();

38
BizHawk.Client.EmuHawk/config/DisplayConfigLite.cs
View File

@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk.config
InitializeComponent();
rbNone.Checked = Global.Config.TargetDisplayFilter == 0;
rbHq2x.Checked = Global.Config.TargetDisplayFilter == 1;
rbHq2x.Checked = Global.Config.TargetDisplayFilter == 1;
rbScanlines.Checked = Global.Config.TargetDisplayFilter == 2;
rbUser.Checked = Global.Config.TargetDisplayFilter == 3;
@ -31,11 +31,20 @@ namespace BizHawk.Client.EmuHawk.config
rbFinalFilterBilinear.Checked = Global.Config.DispFinalFilter == 1;
rbFinalFilterBicubic.Checked = Global.Config.DispFinalFilter == 2;
tbScanlineIntensity.Value = Global.Config.TargetScanlineFilterIntensity;
tbScanlineIntensity.Value = Global.Config.TargetScanlineFilterIntensity;
checkLetterbox.Checked = Global.Config.DispFixAspectRatio;
checkPadInteger.Checked = Global.Config.DispFixScaleInteger;
checkFullscreenHacks.Checked = Global.Config.DispFullscreenHacks;
checkSnowyNullEmulator.Checked = Global.Config.DispSnowyNullEmulator;
// null emulator config hack
{
NullEmulator.NullEmulatorSettings s;
if (Global.Emulator is NullEmulator)
s = (Global.Emulator as dynamic).GetSettings();
else
s = (NullEmulator.NullEmulatorSettings)Global.Config.GetCoreSettings<NullEmulator>();
checkSnowyNullEmulator.Checked = s.SnowyDisplay;
}
if (Global.Config.DispManagerAR == Config.EDispManagerAR.None)
rbUseRaw.Checked = true;
@ -52,7 +61,7 @@ namespace BizHawk.Client.EmuHawk.config
private void btnOk_Click(object sender, EventArgs e)
{
if(rbNone.Checked)
if (rbNone.Checked)
Global.Config.TargetDisplayFilter = 0;
if (rbHq2x.Checked)
Global.Config.TargetDisplayFilter = 1;
@ -61,18 +70,31 @@ namespace BizHawk.Client.EmuHawk.config
if (rbUser.Checked)
Global.Config.TargetDisplayFilter = 3;
if(rbFinalFilterNone.Checked)
if (rbFinalFilterNone.Checked)
Global.Config.DispFinalFilter = 0;
if(rbFinalFilterBilinear.Checked)
if (rbFinalFilterBilinear.Checked)
Global.Config.DispFinalFilter = 1;
if(rbFinalFilterBicubic.Checked)
if (rbFinalFilterBicubic.Checked)
Global.Config.DispFinalFilter = 2;
Global.Config.TargetScanlineFilterIntensity = tbScanlineIntensity.Value;
Global.Config.DispFixAspectRatio = checkLetterbox.Checked;
Global.Config.DispFixScaleInteger = checkPadInteger.Checked;
Global.Config.DispFullscreenHacks = checkFullscreenHacks.Checked;
Global.Config.DispSnowyNullEmulator = checkSnowyNullEmulator.Checked;
// HACK:: null emulator's settings don't persist to config normally
{
NullEmulator.NullEmulatorSettings s;
if (Global.Emulator is NullEmulator)
s = (Global.Emulator as dynamic).GetSettings();
else
s = (NullEmulator.NullEmulatorSettings)Global.Config.GetCoreSettings<NullEmulator>();
s.SnowyDisplay = checkSnowyNullEmulator.Checked;
Global.Config.PutCoreSettings<NullEmulator>(s);
if (Global.Emulator is NullEmulator)
(Global.Emulator as dynamic).PutSettings(s);
}
if (rbUseRaw.Checked)
Global.Config.DispManagerAR = Config.EDispManagerAR.None;

60
BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs
View File

@ -2,16 +2,18 @@
using System.Collections.Generic;
using System.IO;
using BizHawk.Common;
using System.ComponentModel;
namespace BizHawk.Emulation.Common
{
[CoreAttributes("NullHawk", "")]
public class NullEmulator : IEmulator, IVideoProvider, ISyncSoundProvider, ISoundProvider
public class NullEmulator : IEmulator, IVideoProvider, ISyncSoundProvider, ISoundProvider, ISettable<NullEmulator.NullEmulatorSettings, object>
{
public NullEmulator(CoreComm comm)
public NullEmulator(CoreComm comm, object settings)
{
ServiceProvider = new BasicServiceProvider(this);
CoreComm = comm;
_settings = (NullEmulatorSettings)settings ?? new NullEmulatorSettings();
var d = DateTime.Now;
xmas = d.Month == 12 && d.Day >= 17 && d.Day <= 27;
@ -44,7 +46,7 @@ namespace BizHawk.Emulation.Common
public void FrameAdvance(bool render, bool rendersound)
{
if (render == false) return;
if (!CoreComm.DispSnowyNullEmulator())
if (!_settings.SnowyDisplay)
{
if (frameBufferClear) return;
frameBufferClear = true;
@ -53,15 +55,18 @@ namespace BizHawk.Emulation.Common
}
frameBufferClear = false;
if (xmas)
{
for (int i = 0; i < 256 * 192; i++)
{
byte b = (byte)rand.Next();
frameBuffer[i] = Colors.ARGB(b, (byte)(255 - b), 0, 255);
}
else
}
else
{
for (int i = 0; i < 256 * 192; i++)
frameBuffer[i] = Colors.Luminosity((byte) rand.Next());
frameBuffer[i] = Colors.Luminosity((byte)rand.Next());
}
Frame++;
}
public ControllerDefinition ControllerDefinition { get { return NullController; } }
@ -88,7 +93,7 @@ namespace BizHawk.Emulation.Common
{
nsamp = 735;
samples = sampbuff;
if (!CoreComm.DispSnowyNullEmulator())
if (!_settings.SnowyDisplay)
return;
if (xmas)
pleg.Generate(samples);
@ -100,7 +105,7 @@ namespace BizHawk.Emulation.Common
public void GetSamples(short[] samples)
{
if (!CoreComm.DispSnowyNullEmulator())
if (!_settings.SnowyDisplay)
return;
if (xmas)
pleg.Generate(samples);
@ -111,6 +116,45 @@ namespace BizHawk.Emulation.Common
get;
set;
}
private NullEmulatorSettings _settings;
public class NullEmulatorSettings
{
[DefaultValue(true)]
public bool SnowyDisplay { get; set; }
public NullEmulatorSettings()
{
SettingsUtil.SetDefaultValues(this);
}
public NullEmulatorSettings Clone()
{
return (NullEmulatorSettings)MemberwiseClone();
}
}
public NullEmulatorSettings GetSettings()
{
return _settings.Clone();
}
public object GetSyncSettings()
{
return null;
}
public bool PutSettings(NullEmulatorSettings o)
{
_settings = o;
return false;
}
public bool PutSyncSettings(object o)
{
return false;
}
}
#region super tone generator

2
BizHawk.Emulation.Common/CoreComms.cs
View File

@ -56,8 +56,6 @@ namespace BizHawk.Emulation.Common
public Func<object> RequestGLContext;
public Action<object> ActivateGLContext;
public Action DeactivateGLContext; //this shouldnt be necessary.. frontend should be changing context before it does anything.. but for now..
public Func<bool> DispSnowyNullEmulator;
}
public class MemoryCallbackSystem