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

TasClipboardEntry, move some logic to Tastudio, fix filename, and move to Client.Common

This commit is contained in:
adelikat 2020-11-29 12:25:26 -06:00
parent 8e70bece16
commit 8d6cb7685e
4 changed files with 34 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BizHawk.Client.Common/movie/tasproj/TasClipboardEntry.cs Normal file
View File

@ -0,0 +1,16 @@
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common
{
public class TasClipboardEntry
{
public TasClipboardEntry(int frame, IController controllerState)
{
Frame = frame;
ControllerState = controllerState;
}
public int Frame { get; }
public IController ControllerState { get; }
}
}

4
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -481,7 +481,7 @@ namespace BizHawk.Client.EmuHawk
_tasClipboard.Clear();
for (int i = 0; i < lines.Length - 1; i++)
{
var line = TasClipboardEntry.SetFromMnemonicStr(lines[i]);
var line = ControllerFromMnemonicStr(lines[i]);
if (line == null)
{
return;
@ -521,7 +521,7 @@ namespace BizHawk.Client.EmuHawk
_tasClipboard.Clear();
for (int i = 0; i < lines.Length - 1; i++)
{
var line = TasClipboardEntry.SetFromMnemonicStr(lines[i]);
var line = ControllerFromMnemonicStr(lines[i]);
if (line == null)
{
return;

16
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -1262,5 +1262,21 @@ namespace BizHawk.Client.EmuHawk
TasView.Refresh();
}
}
private IMovieController ControllerFromMnemonicStr(string inputLogEntry)
{
try
{
var controller = MovieSession.GenerateMovieController();
controller.SetFromMnemonic(inputLogEntry);
return controller;
}
catch (Exception)
{
MessageBox.Show($"Invalid mnemonic string: {inputLogEntry}", "Paste Input failed!");
return null;
}
}
}
}

46
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioClipboard.cs
View File

@ -1,46 +0,0 @@
using System;
using System.Windows.Forms;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{
public class TasClipboardEntry
{
public TasClipboardEntry(int frame, IController controllerState)
{
Frame = frame;
ControllerState = controllerState;
}
public int Frame { get; }
public IController ControllerState { get; }
public static IMovieController SetFromMnemonicStr(string inputLogEntry)
{
try
{
var controller = GlobalWin.MovieSession.GenerateMovieController();
controller.SetFromMnemonic(inputLogEntry);
foreach (var button in controller.Definition.BoolButtons)
{
GlobalWin.InputManager.ButtonOverrideAdapter.SetButton(button, controller.IsPressed(button));
}
foreach (var axisName in controller.Definition.Axes.Keys)
{
GlobalWin.InputManager.ButtonOverrideAdapter.SetAxis(axisName, controller.AxisValue(axisName));
}
return controller;
}
catch (Exception)
{
MessageBox.Show($"Invalid mnemonic string: {inputLogEntry}", "Paste Input failed!");
return null;
}
}
}
}