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

start a new Virtual Pad Tool, currently only does NES with one controller as a proof of concept, this is probably a messed up commit will fix next

This commit is contained in:
adelikat 2014-06-22 13:57:23 +00:00
parent 7cdc585252
commit 269b3c7ee1
8 changed files with 27 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -883,113 +883,18 @@
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="tools\VirtualPads\IVirtualPad.cs" /> <Compile Include="tools\VirtualPads\IVirtualPad.cs" />
<Compile Include="tools\VirtualPads\VirtualPad.cs"> <Compile Include="tools\VirtualPads\PadSchema.cs" />
<SubType>Component</SubType> <Compile Include="tools\VirtualPads\VirtualPadControl.cs">
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadA26.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadA26Control.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadA78.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="tools\VirtualPads\VirtualPadA78.Designer.cs"> <Compile Include="tools\VirtualPads\VirtualPadControl.Designer.cs">
<DependentUpon>VirtualPadA78.cs</DependentUpon> <DependentUpon>VirtualPadControl.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="tools\VirtualPads\VirtualPadA78Control.cs"> <Compile Include="tools\VirtualPads\VirtualpadTool.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadA78Control.Designer.cs">
<DependentUpon>VirtualPadA78Control.cs</DependentUpon>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadButton.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadC64Keyboard.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadC64Keyboard.Designer.cs">
<DependentUpon>VirtualPadC64Keyboard.cs</DependentUpon>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadColeco.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadColeco.Designer.cs">
<DependentUpon>VirtualPadColeco.cs</DependentUpon>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="tools\VirtualPads\VirtualPadForm.Designer.cs"> <Compile Include="tools\VirtualPads\VirtualpadTool.Designer.cs">
<DependentUpon>VirtualPadForm.cs</DependentUpon> <DependentUpon>VirtualpadTool.cs</DependentUpon>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadGB.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadGBA.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadGBControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadGen3Button.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadGen6Button.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadGen6Button.Designer.cs">
<DependentUpon>VirtualPadGen6Button.cs</DependentUpon>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadN64.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadN64.Designer.cs">
<DependentUpon>VirtualPadN64.cs</DependentUpon>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadN64Control.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadNES.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadNESControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadPCE.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadSaturn.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadSaturn.Designer.cs">
<DependentUpon>VirtualPadSaturn.cs</DependentUpon>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadSaturnControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadSaturnControl.Designer.cs">
<DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadSMS.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadSMSControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadSNES.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadSNESControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadWonderSawn.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\VirtualPads\VirtualPadWonderSawn.Designer.cs">
<DependentUpon>VirtualPadWonderSawn.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="tools\Watch\RamPoke.cs"> <Compile Include="tools\Watch\RamPoke.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
@ -1308,38 +1213,11 @@
<EmbeddedResource Include="tools\TI83\TI83KeyPad.resx"> <EmbeddedResource Include="tools\TI83\TI83KeyPad.resx">
<DependentUpon>TI83KeyPad.cs</DependentUpon> <DependentUpon>TI83KeyPad.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPad.resx"> <EmbeddedResource Include="tools\VirtualPads\VirtualPadControl.resx">
<DependentUpon>VirtualPad.cs</DependentUpon> <DependentUpon>VirtualPadControl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadA78.resx"> <EmbeddedResource Include="tools\VirtualPads\VirtualpadTool.resx">
<DependentUpon>VirtualPadA78.cs</DependentUpon> <DependentUpon>VirtualpadTool.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadA78Control.resx">
<DependentUpon>VirtualPadA78Control.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadC64Keyboard.resx">
<DependentUpon>VirtualPadC64Keyboard.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadColeco.resx">
<DependentUpon>VirtualPadColeco.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadForm.resx">
<DependentUpon>VirtualPadForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadGen6Button.resx">
<DependentUpon>VirtualPadGen6Button.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadN64.resx">
<DependentUpon>VirtualPadN64.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadSaturn.resx">
<DependentUpon>VirtualPadSaturn.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadSaturnControl.resx">
<DependentUpon>VirtualPadSaturnControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\VirtualPads\VirtualPadWonderSawn.resx">
<DependentUpon>VirtualPadWonderSawn.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="tools\Watch\RamPoke.resx"> <EmbeddedResource Include="tools\Watch\RamPoke.resx">
<DependentUpon>RamPoke.cs</DependentUpon> <DependentUpon>RamPoke.cs</DependentUpon>

2
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1042,7 +1042,7 @@ namespace BizHawk.Client.EmuHawk
private void VirtualPadMenuItem_Click(object sender, EventArgs e) private void VirtualPadMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<VirtualPadForm>(); GlobalWin.Tools.Load<VirtualpadTool>();
} }
private void CheatsMenuItem_Click(object sender, EventArgs e) private void CheatsMenuItem_Click(object sender, EventArgs e)

2
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -350,7 +350,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<ToolBox>(); GlobalWin.Tools.Load<ToolBox>();
break; break;
case "Virtual Pad": case "Virtual Pad":
GlobalWin.Tools.Load<VirtualPadForm>(); GlobalWin.Tools.Load<VirtualpadTool>();
break; break;
// Ram Search // Ram Search

2
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -106,7 +106,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Restart<TAStudio>(); GlobalWin.Tools.Restart<TAStudio>();
} }
GlobalWin.Tools.Restart<VirtualPadForm>(); GlobalWin.Tools.Restart<VirtualpadTool>();
GlobalWin.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
} }

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

@ -353,7 +353,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.AutoloadVirtualPad) if (Global.Config.AutoloadVirtualPad)
{ {
GlobalWin.Tools.Load<VirtualPadForm>(); GlobalWin.Tools.Load<VirtualpadTool>();
} }
if (Global.Config.AutoLoadLuaConsole) if (Global.Config.AutoLoadLuaConsole)
@ -579,7 +579,7 @@ namespace BizHawk.Client.EmuHawk
Global.StickyXORAdapter.ClearStickies(); Global.StickyXORAdapter.ClearStickies();
Global.AutofireStickyXORAdapter.ClearStickies(); Global.AutofireStickyXORAdapter.ClearStickies();
if (GlobalWin.Tools.Has<VirtualPadForm>()) if (GlobalWin.Tools.Has<VirtualpadTool>())
{ {
GlobalWin.Tools.VirtualPad.ClearVirtualPadHolds(); GlobalWin.Tools.VirtualPad.ClearVirtualPadHolds();
} }
@ -608,7 +608,7 @@ namespace BizHawk.Client.EmuHawk
if (ActiveForm is HotkeyConfig || if (ActiveForm is HotkeyConfig ||
ActiveForm is ControllerConfig || ActiveForm is ControllerConfig ||
ActiveForm is TAStudio || ActiveForm is TAStudio ||
ActiveForm is VirtualPadForm) ActiveForm is VirtualpadTool)
{ {
return true; return true;
} }

2
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -182,7 +182,7 @@ namespace BizHawk.Client.EmuHawk
private void VirtualpadToolbarItem_Click(object sender, EventArgs e) private void VirtualpadToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<VirtualPadForm>(); GlobalWin.Tools.Load<VirtualpadTool>();
} }
private void SNESGameGenieToolbarItem_Click(object sender, EventArgs e) private void SNESGameGenieToolbarItem_Click(object sender, EventArgs e)

8
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -347,11 +347,11 @@ namespace BizHawk.Client.EmuHawk
} }
} }
public VirtualPadForm VirtualPad public VirtualpadTool VirtualPad
{ {
get get
{ {
var tool = _tools.FirstOrDefault(x => x is VirtualPadForm); var tool = _tools.FirstOrDefault(x => x is VirtualpadTool);
if (tool != null) if (tool != null)
{ {
if (tool.IsDisposed) if (tool.IsDisposed)
@ -360,11 +360,11 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
return tool as VirtualPadForm; return tool as VirtualpadTool;
} }
} }
var newTool = new VirtualPadForm(); var newTool = new VirtualpadTool();
_tools.Add(newTool); _tools.Add(newTool);
return newTool; return newTool;
} }

9
BizHawk.Client.EmuHawk/tools/VirtualPads/IVirtualPad.cs
View File

@ -1,10 +1,11 @@
namespace BizHawk.Client.EmuHawk using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
{ {
public interface IVirtualPad public interface IVirtualPad
{ {
string Controller { get; set; } IController Get();
string GetMnemonic(); void Set(IController controller);
void Clear(); void Clear();
void SetButtons(string buttons);
} }
} }