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

Some Movie 2.0 reorg

This commit is contained in:
adelikat 2014-01-10 23:08:56 +00:00
parent 0164db5532
commit c0295316f5
7 changed files with 198 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -123,13 +123,15 @@
<Compile Include="lua\LuaFunctionList.cs" />
<Compile Include="lua\LuaLibraryBase.cs" />
<Compile Include="lua\NamedLuaFunction.cs" />
<Compile Include="movie\ControllerLookups\MnemonicGeneratorFactory.cs" />
<Compile Include="movie\ControllerLookups\MnemonicGenerators.cs" />
<Compile Include="movie\ControllerLookups\NesMnemonicGenerator.cs" />
<Compile Include="movie\HeaderKeys.cs" />
<Compile Include="movie\IMovie.cs" />
<Compile Include="movie\IMovieHeader.cs" />
<Compile Include="movie\InputAdapters.cs" />
<Compile Include="movie\MnemonicGenerators\IMnemonicGenerator.cs" />
<Compile Include="movie\MnemonicGenerators\IMnemonicPorts.cs" />
<Compile Include="movie\MnemonicGenerators\MnemonicGeneratorFactory.cs" />
<Compile Include="movie\MnemonicGenerators\MnemonicGenerators.cs" />
<Compile Include="movie\MnemonicGenerators\NesMnemonicGenerator.cs" />
<Compile Include="movie\MnemonicsGenerator.cs" />
<Compile Include="movie\Movie.cs" />
<Compile Include="movie\MovieHeader.cs" />

179
BizHawk.Client.Common/movie/ControllerLookups/MnemonicGenerators.cs
View File

@ -1,179 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BizHawk.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common
{
public interface IMnemonicGenerator
{
IController Source { get; set; }
string Name { get; }
/// <summary>
/// Will be prepended to all button names
/// Example: "P1"
/// </summary>
string ControllerPrefix { get; set; }
void Add(string key, char value);
char this[string key] { get; }
bool IsEmpty { get; }
string MnemonicString { get; }
/// <summary>
/// Returns a string that represents an empty or default mnemonic
/// </summary>
string EmptyMnemonicString { get; }
// Analog TODO: this assumes the Generator is boolean
/// <summary>
/// Parses a segment of a full mnemonic string (the content between pipes)
/// Note: this assume the pipes are not being passed in!
/// </summary>
IDictionary<string, bool> ParseMnemonicSegment(string mnemonicSegment);
// Analog Support TODO: this assume the Generator is boolean
//Dictionary<string, bool> GetBoolButtons();
Dictionary<string, char> AvailableMnemonics { get; }
}
/// <summary>
/// A console specific collection of Mnemonic generators
/// This handles includes all the "business" logic specific to the console
/// </summary>
public interface IMnemonicPorts
{
/// <summary>
/// Total number of available controller ports (this does not include the console controls
/// </summary>
int Count { get; }
/// <summary>
/// Source controller to read input state from
/// </summary>
IController Source { get; set; }
/// <summary>
/// Gets or sets the given port with an IMnemonicGenerator implementation
/// Ports are zero based
/// Set will throw an InvalidOperationException if a particular implementation is not allowed, this is platform specific logic such as NES doesn't allow a zapper in port 0, etc
/// Both will throw an ArgumentOutOfRangeException exception if portNum is not less than Count
/// </summary>
IMnemonicGenerator this[int portNum] { get; set; }
/// <summary>
/// Gets an IMnemonicGenerator implementation that represents the buttons and controls on the console itself (Reset, Power, etc)
/// </summary>
IMnemonicGenerator ConsoleControls { get; }
Dictionary<string, bool> ParseMnemonicString(string mnemonicStr);
// Analog TODO: this assume the generators are boolean
Dictionary<string, bool> GetBoolButtons();
// TODO: this shouldn't be required, refactor MovieRecord
string GenerateMnemonicString(Dictionary<string, bool> buttons);
string EmptyMnemonic { get; }
Dictionary<string, char> AvailableMnemonics { get; }
}
public class BooleanControllerMnemonicGenerator : IMnemonicGenerator
{
private NamedDictionary<string, char> _controllerMnemonics;
public BooleanControllerMnemonicGenerator(string name, IDictionary<string, char> mnemonics)
{
_controllerMnemonics = new NamedDictionary<string, char>(name);
foreach (var kvp in mnemonics)
{
_controllerMnemonics.Add(kvp.Key, kvp.Value);
}
}
public void Add(string key, char value)
{
_controllerMnemonics.Add(key, value);
}
public Dictionary<string, char> AvailableMnemonics
{
get
{
return _controllerMnemonics.ToDictionary(kvp => ControllerPrefix + " " + kvp.Key, kvp => kvp.Value);
}
}
public IController Source { get; set; }
public string ControllerPrefix { get; set; }
public string Name
{
get { return _controllerMnemonics.Name; }
}
public char this[string key]
{
get
{
return _controllerMnemonics[ControllerPrefix + " " + key];
}
}
public bool IsEmpty
{
get
{
return _controllerMnemonics.All(kvp => !this.Source.IsPressed(kvp.Key));
}
}
public string MnemonicString
{
get
{
var sb = new StringBuilder(_controllerMnemonics.Count);
foreach (var kvp in _controllerMnemonics)
{
sb.Append(Source.IsPressed(kvp.Key) ? kvp.Value : '.');
}
return sb.ToString();
}
}
public string EmptyMnemonicString
{
get
{
var sb = new StringBuilder(_controllerMnemonics.Count);
foreach (var kvp in _controllerMnemonics)
{
sb.Append('.');
}
return sb.ToString();
}
}
public IDictionary<string, bool> ParseMnemonicSegment(string mnemonicSegment)
{
var buttons = new Dictionary<string, bool>();
var keys = _controllerMnemonics.Select(kvp => kvp.Key).ToList();
for (int i = 0; i < mnemonicSegment.Length; i++)
{
buttons.Add(keys[i], mnemonicSegment[i] != '.');
}
return buttons;
}
}
}

43
BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicGenerator.cs Normal file
View File

@ -0,0 +1,43 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BizHawk.Client.Common
{
public interface IMnemonicGenerator
{
IController Source { get; set; }
string Name { get; }
/// <summary>
/// Will be prepended to all button names
/// Example: "P1"
/// </summary>
string ControllerPrefix { get; set; }
void Add(string key, char value);
char this[string key] { get; }
bool IsEmpty { get; }
string MnemonicString { get; }
/// <summary>
/// Returns a string that represents an empty or default mnemonic
/// </summary>
string EmptyMnemonicString { get; }
// Analog TODO: this assumes the Generator is boolean
/// <summary>
/// Parses a segment of a full mnemonic string (the content between pipes)
/// Note: this assume the pipes are not being passed in!
/// </summary>
IDictionary<string, bool> ParseMnemonicSegment(string mnemonicSegment);
// Analog Support TODO: this assume the Generator is boolean
//Dictionary<string, bool> GetBoolButtons();
Dictionary<string, char> AvailableMnemonics { get; }
}
}

49
BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicPorts.cs Normal file
View File

@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BizHawk.Client.Common
{
/// <summary>
/// A console specific collection of Mnemonic generators
/// This handles includes all the "business" logic specific to the console
/// </summary>
public interface IMnemonicPorts
{
/// <summary>
/// Total number of available controller ports (this does not include the console controls
/// </summary>
int Count { get; }
/// <summary>
/// Source controller to read input state from
/// </summary>
IController Source { get; set; }
/// <summary>
/// Gets or sets the given port with an IMnemonicGenerator implementation
/// Ports are zero based
/// Set will throw an InvalidOperationException if a particular implementation is not allowed, this is platform specific logic such as NES doesn't allow a zapper in port 0, etc
/// Both will throw an ArgumentOutOfRangeException exception if portNum is not less than Count
/// </summary>
IMnemonicGenerator this[int portNum] { get; set; }
/// <summary>
/// Gets an IMnemonicGenerator implementation that represents the buttons and controls on the console itself (Reset, Power, etc)
/// </summary>
IMnemonicGenerator ConsoleControls { get; }
Dictionary<string, bool> ParseMnemonicString(string mnemonicStr);
// Analog TODO: this assume the generators are boolean
Dictionary<string, bool> GetBoolButtons();
// TODO: this shouldn't be required, refactor MovieRecord
string GenerateMnemonicString(Dictionary<string, bool> buttons);
string EmptyMnemonic { get; }
Dictionary<string, char> AvailableMnemonics { get; }
}
}

0
BizHawk.Client.Common/movie/ControllerLookups/MnemonicGeneratorFactory.cs → BizHawk.Client.Common/movie/MnemonicGenerators/MnemonicGeneratorFactory.cs
View File

101
BizHawk.Client.Common/movie/MnemonicGenerators/MnemonicGenerators.cs Normal file
View File

@ -0,0 +1,101 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BizHawk.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common
{
public class BooleanControllerMnemonicGenerator : IMnemonicGenerator
{
private NamedDictionary<string, char> _controllerMnemonics;
public BooleanControllerMnemonicGenerator(string name, IDictionary<string, char> mnemonics)
{
_controllerMnemonics = new NamedDictionary<string, char>(name);
foreach (var kvp in mnemonics)
{
_controllerMnemonics.Add(kvp.Key, kvp.Value);
}
}
public void Add(string key, char value)
{
_controllerMnemonics.Add(key, value);
}
public Dictionary<string, char> AvailableMnemonics
{
get
{
return _controllerMnemonics.ToDictionary(kvp => ControllerPrefix + " " + kvp.Key, kvp => kvp.Value);
}
}
public IController Source { get; set; }
public string ControllerPrefix { get; set; }
public string Name
{
get { return _controllerMnemonics.Name; }
}
public char this[string key]
{
get
{
return _controllerMnemonics[ControllerPrefix + " " + key];
}
}
public bool IsEmpty
{
get
{
return _controllerMnemonics.All(kvp => !this.Source.IsPressed(kvp.Key));
}
}
public string MnemonicString
{
get
{
var sb = new StringBuilder(_controllerMnemonics.Count);
foreach (var kvp in _controllerMnemonics)
{
sb.Append(Source.IsPressed(kvp.Key) ? kvp.Value : '.');
}
return sb.ToString();
}
}
public string EmptyMnemonicString
{
get
{
var sb = new StringBuilder(_controllerMnemonics.Count);
foreach (var kvp in _controllerMnemonics)
{
sb.Append('.');
}
return sb.ToString();
}
}
public IDictionary<string, bool> ParseMnemonicSegment(string mnemonicSegment)
{
var buttons = new Dictionary<string, bool>();
var keys = _controllerMnemonics.Select(kvp => kvp.Key).ToList();
for (int i = 0; i < mnemonicSegment.Length; i++)
{
buttons.Add(keys[i], mnemonicSegment[i] != '.');
}
return buttons;
}
}
}

0
BizHawk.Client.Common/movie/ControllerLookups/NesMnemonicGenerator.cs → BizHawk.Client.Common/movie/MnemonicGenerators/NesMnemonicGenerator.cs
View File