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

Merge pull request #1394 from TASVideos/appleii_fixattempt 

[WIP] Trying to get Virtu fixed up a bit
This commit is contained in:
Asnivor 2019-03-29 15:04:00 +00:00 committed by GitHub
parent 4e91f88af3 59ad94f9b9
commit 31237e0c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
View File

@ -115,8 +115,8 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
}
private static readonly List<string> RealButtons = new List<string>(Keyboard.GetKeyNames()
.Where(k => k != "White Apple") // Hack because these buttons aren't wired up yet
.Where(k => k != "Black Apple")
//.Where(k => k != "White Apple") // Hack because these buttons aren't wired up yet
//.Where(k => k != "Black Apple")
.Where(k => k != "Reset"));
private static readonly List<string> ExtraButtons = new List<string>

16
BizHawk.sln
View File

@ -59,6 +59,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.MultiHawk",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.ApiHawk", "BizHawk.Client.ApiHawk\BizHawk.Client.ApiHawk.csproj", "{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtu", "ExternalCoreProjects\Virtu\Virtu.csproj", "{8E522778-7A2C-4364-BDCE-0BA5623828E1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -125,6 +127,18 @@ Global
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|Any CPU.Build.0 = Release|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|x64.ActiveCfg = Debug|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|x64.Build.0 = Debug|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|x86.ActiveCfg = Debug|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|x86.Build.0 = Debug|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|Any CPU.Build.0 = Release|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|x64.ActiveCfg = Release|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|x64.Build.0 = Release|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|x86.ActiveCfg = Release|Any CPU
{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -145,7 +159,7 @@ Global
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1A77376C-2741-489C-90E1-03E415910B65}
SolutionGuid = {9B9E4316-9185-412E-B951-A63355ACA956}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj

0
ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/db.lock Normal file
View File

BIN
ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide Normal file
View File

Binary file not shown.

BIN
ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide-shm Normal file
View File

Binary file not shown.

0
ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide-wal Normal file
View File

4
ExternalCoreProjects/Virtu/GamePort.cs
View File

@ -9,8 +9,8 @@ namespace Jellyfish.Virtu
public sealed class GamePort : MachineComponent
{
// TODO: ressurect this
public bool ReadButton0() { return false; }
public bool ReadButton1() { return false; }
public bool ReadButton0() { return Keyboard.WhiteAppleDown; }
public bool ReadButton1() { return Keyboard.BlackAppleDown; }
public bool ReadButton2() { return false; }
public bool Paddle0Strobe { get { return false; } }

14
ExternalCoreProjects/Virtu/Keyboard.cs
View File

@ -264,6 +264,9 @@ namespace Jellyfish.Virtu
{
}
public static bool WhiteAppleDown;
public static bool BlackAppleDown;
/// <summary>
/// Call this at 60hz with all of the currently pressed keys
/// </summary>
@ -272,8 +275,15 @@ namespace Jellyfish.Virtu
{
Keys keys = FromStrings(keynames);
if (keys.HasFlag(Keys.WhiteApple)) { } // TODO: set GAME1
if (keys.HasFlag(Keys.BlackApple)) { } // TODO: set GAME2
if (keys.HasFlag(Keys.WhiteApple))
WhiteAppleDown = true;
else
WhiteAppleDown = false;
if (keys.HasFlag(Keys.BlackApple))
BlackAppleDown = true;
else
BlackAppleDown = false;
if (keys.HasFlag(Keys.Reset) && keys.HasFlag(Keys.Control)) { } // TODO: reset console

2
ExternalCoreProjects/Virtu/Virtu.csproj
View File

@ -74,7 +74,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /y $(TargetDir)$(TargetFileName) $(ProjectDir)..\..\references\$(TargetFileName)</PostBuildEvent>
<PostBuildEvent>copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\references\$(TargetFileName)"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

BIN
References/Virtu.dll
View File

Binary file not shown.