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

C64 - renamed C64.Input to C64.MotherboardInput since it is a partial class of Motherboard not C64

This commit is contained in:
adelikat 2017-05-12 14:29:26 -05:00
parent 9cbe1e3112
commit ff7db156f6
3 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@
<DependentUpon>C64.cs</DependentUpon>
</Compile>
<Compile Include="Computers\Commodore64\C64.IEmulator.cs">
<DependentUpon>C64.cs</DependentUpon>
<DependentUpon>C64.cs</DependentUpon>
</Compile>
<Compile Include="Computers\Commodore64\C64.IInputPollable.cs">
<DependentUpon>C64.cs</DependentUpon>
@ -215,7 +215,7 @@
<Compile Include="Computers\Commodore64\C64.MotherboardInterface.cs" />
<Compile Include="Computers\Commodore64\C64Format.cs" />
<Compile Include="Computers\Commodore64\Cartridge\Mapper0000.cs" />
<Compile Include="Computers\Commodore64\C64.Input.cs" />
<Compile Include="Computers\Commodore64\C64.MotherboardInput.cs" />
<Compile Include="Computers\Commodore64\Cartridge\Mapper0001.cs" />
<Compile Include="Computers\Commodore64\Cartridge\Mapper0005.cs" />
<Compile Include="Computers\Commodore64\Cartridge\Mapper000A.cs" />

109
BizHawk.Emulation.Cores/Computers/Commodore64/C64.Input.cs → BizHawk.Emulation.Cores/Computers/Commodore64/C64.MotherboardInput.cs
View File

@ -1,54 +1,55 @@
namespace BizHawk.Emulation.Cores.Computers.Commodore64
{
public sealed partial class Motherboard
{
private readonly bool[] _joystickPressed = new bool[10];
private readonly bool[] _keyboardPressed = new bool[64];
private static readonly string[][] JoystickMatrix = {
new[] {"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Button"},
new[] {"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Button"}
};
private static readonly string[][] KeyboardMatrix = {
new[] { "Key Insert/Delete", "Key Return", "Key Cursor Left/Right", "Key F7", "Key F1", "Key F3", "Key F5", "Key Cursor Up/Down" },
new[] { "Key 3", "Key W", "Key A", "Key 4", "Key Z", "Key S", "Key E", "Key Left Shift" },
new[] { "Key 5", "Key R", "Key D", "Key 6", "Key C", "Key F", "Key T", "Key X" },
new[] { "Key 7", "Key Y", "Key G", "Key 8", "Key B", "Key H", "Key U", "Key V" },
new[] { "Key 9", "Key I", "Key J", "Key 0", "Key M", "Key K", "Key O", "Key N" },
new[] { "Key Plus", "Key P", "Key L", "Key Minus", "Key Period", "Key Colon", "Key At", "Key Comma" },
new[] { "Key Pound", "Key Asterisk", "Key Semicolon", "Key Clear/Home", "Key Right Shift", "Key Equal", "Key Up Arrow", "Key Slash" },
new[] { "Key 1", "Key Left Arrow", "Key Control", "Key 2", "Key Space", "Key Commodore", "Key Q", "Key Run/Stop" }
};
[SaveState.DoNotSave] int _pollIndex;
private bool _restorePressed;
public void PollInput()
{
_c64.InputCallbacks.Call();
// scan joysticks
_pollIndex = 0;
for (var j = 0; j < 2; j++)
{
for (var i = 0; i < 5; i++)
{
_joystickPressed[_pollIndex] = Controller.IsPressed(JoystickMatrix[j][i]);
_pollIndex++;
}
}
// scan keyboard
_pollIndex = 0;
for (var i = 0; i < 8; i++)
{
for (var j = 0; j < 8; j++)
{
_keyboardPressed[_pollIndex++] = Controller.IsPressed(KeyboardMatrix[i][j]);
}
}
_restorePressed = Controller.IsPressed("Key Restore");
}
}
}
namespace BizHawk.Emulation.Cores.Computers.Commodore64
{
public sealed partial class Motherboard
{
private readonly bool[] _joystickPressed = new bool[10];
private readonly bool[] _keyboardPressed = new bool[64];
private static readonly string[][] JoystickMatrix = {
new[] {"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Button"},
new[] {"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Button"}
};
private static readonly string[][] KeyboardMatrix = {
new[] { "Key Insert/Delete", "Key Return", "Key Cursor Left/Right", "Key F7", "Key F1", "Key F3", "Key F5", "Key Cursor Up/Down" },
new[] { "Key 3", "Key W", "Key A", "Key 4", "Key Z", "Key S", "Key E", "Key Left Shift" },
new[] { "Key 5", "Key R", "Key D", "Key 6", "Key C", "Key F", "Key T", "Key X" },
new[] { "Key 7", "Key Y", "Key G", "Key 8", "Key B", "Key H", "Key U", "Key V" },
new[] { "Key 9", "Key I", "Key J", "Key 0", "Key M", "Key K", "Key O", "Key N" },
new[] { "Key Plus", "Key P", "Key L", "Key Minus", "Key Period", "Key Colon", "Key At", "Key Comma" },
new[] { "Key Pound", "Key Asterisk", "Key Semicolon", "Key Clear/Home", "Key Right Shift", "Key Equal", "Key Up Arrow", "Key Slash" },
new[] { "Key 1", "Key Left Arrow", "Key Control", "Key 2", "Key Space", "Key Commodore", "Key Q", "Key Run/Stop" }
};
[SaveState.DoNotSave] int _pollIndex;
private bool _restorePressed;
public void PollInput()
{
_c64.InputCallbacks.Call();
// scan joysticks
_pollIndex = 0;
for (var j = 0; j < 2; j++)
{
for (var i = 0; i < 5; i++)
{
_joystickPressed[_pollIndex] = Controller.IsPressed(JoystickMatrix[j][i]);
_pollIndex++;
}
}
// scan keyboard
_pollIndex = 0;
for (var i = 0; i < 8; i++)
{
for (var j = 0; j < 8; j++)
{
_keyboardPressed[_pollIndex++] = Controller.IsPressed(KeyboardMatrix[i][j]);
}
}
_restorePressed = Controller.IsPressed("Key Restore");
}
}
}

7
BizHawk.Emulation.Cores/Computers/Commodore64/C64.MotherboardInterface.cs
View File

@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BizHawk.Emulation.Cores.Computers.Commodore64
namespace BizHawk.Emulation.Cores.Computers.Commodore64
{
public sealed partial class Motherboard
{