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

TAStudio - insert num frames implemented

This commit is contained in:
adelikat 2014-07-13 12:44:31 +00:00
parent dc6daddff7
commit 3f461990c4
7 changed files with 371 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
View File

@ -108,11 +108,15 @@ namespace BizHawk.Client.Common
InvalidateAfter(frame);
}
public void InsertEmptyFrame(int frame)
public void InsertEmptyFrame(int frame, int count = 1)
{
var lg = LogGeneratorInstance();
lg.SetSource(Global.MovieSession.MovieControllerInstance());
_log.Insert(frame, lg.EmptyEntry);
for (int i = 0; i < count; i++)
{
_log.Insert(frame, lg.EmptyEntry);
}
Changes = true;
InvalidateAfter(frame - 1);

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

@ -823,6 +823,12 @@
<Compile Include="tools\TAStudio\BookmarksBranchesBox.Designer.cs">
<DependentUpon>BookmarksBranchesBox.cs</DependentUpon>
</Compile>
<Compile Include="tools\TAStudio\FramesPrompt.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\TAStudio\FramesPrompt.Designer.cs">
<DependentUpon>FramesPrompt.cs</DependentUpon>
</Compile>
<Compile Include="tools\TAStudio\GreenzoneSettings.cs">
<SubType>Form</SubType>
</Compile>
@ -1258,6 +1264,9 @@
<EmbeddedResource Include="tools\TAStudio\BookmarksBranchesBox.resx">
<DependentUpon>BookmarksBranchesBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\TAStudio\FramesPrompt.resx">
<DependentUpon>FramesPrompt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\TAStudio\GreenzoneSettings.resx">
<DependentUpon>GreenzoneSettings.cs</DependentUpon>
</EmbeddedResource>

111
BizHawk.Client.EmuHawk/tools/TAStudio/FramesPrompt.Designer.cs generated Normal file
View File

@ -0,0 +1,111 @@
namespace BizHawk.Client.EmuHawk
{
partial class FramesPrompt
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.OkBtn = new System.Windows.Forms.Button();
this.CancelBtn = new System.Windows.Forms.Button();
this.NumFramesBox = new BizHawk.Client.EmuHawk.WatchValueBox();
this.label1 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// OkBtn
//
this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OkBtn.Location = new System.Drawing.Point(67, 47);
this.OkBtn.Name = "OkBtn";
this.OkBtn.Size = new System.Drawing.Size(60, 23);
this.OkBtn.TabIndex = 1;
this.OkBtn.Text = "&Ok";
this.OkBtn.UseVisualStyleBackColor = true;
this.OkBtn.Click += new System.EventHandler(this.OkBtn_Click);
//
// CancelBtn
//
this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.CancelBtn.Location = new System.Drawing.Point(134, 47);
this.CancelBtn.Name = "CancelBtn";
this.CancelBtn.Size = new System.Drawing.Size(60, 23);
this.CancelBtn.TabIndex = 2;
this.CancelBtn.Text = "&Cancel";
this.CancelBtn.UseVisualStyleBackColor = true;
this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click);
//
// NumFramesBox
//
this.NumFramesBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte;
this.NumFramesBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.NumFramesBox.Location = new System.Drawing.Point(138, 16);
this.NumFramesBox.MaxLength = 3;
this.NumFramesBox.Name = "NumFramesBox";
this.NumFramesBox.Nullable = false;
this.NumFramesBox.Size = new System.Drawing.Size(51, 20);
this.NumFramesBox.TabIndex = 3;
this.NumFramesBox.Text = "1";
this.NumFramesBox.Type = BizHawk.Client.Common.Watch.DisplayType.Unsigned;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 20);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(120, 13);
this.label1.TabIndex = 4;
this.label1.Text = "Insert number of frames:";
//
// FramesPrompt
//
this.AcceptButton = this.OkBtn;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelBtn;
this.ClientSize = new System.Drawing.Size(206, 82);
this.Controls.Add(this.label1);
this.Controls.Add(this.NumFramesBox);
this.Controls.Add(this.CancelBtn);
this.Controls.Add(this.OkBtn);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Name = "FramesPrompt";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Insert Frames";
this.Load += new System.EventHandler(this.FramesPrompt_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button OkBtn;
private System.Windows.Forms.Button CancelBtn;
private WatchValueBox NumFramesBox;
private System.Windows.Forms.Label label1;
}
}

41
BizHawk.Client.EmuHawk/tools/TAStudio/FramesPrompt.cs Normal file
View File

@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace BizHawk.Client.EmuHawk
{
public partial class FramesPrompt : Form
{
public FramesPrompt()
{
InitializeComponent();
}
public int Frames
{
get { return NumFramesBox.ToRawInt() ?? 0; }
}
private void FramesPrompt_Load(object sender, EventArgs e)
{
NumFramesBox.Select();
}
private void OkBtn_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
Close();
}
private void CancelBtn_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}
}

120
BizHawk.Client.EmuHawk/tools/TAStudio/FramesPrompt.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

2
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs generated
View File

@ -394,11 +394,11 @@ namespace BizHawk.Client.EmuHawk
//
// InsertNumFramesMenuItem
//
this.InsertNumFramesMenuItem.Enabled = false;
this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem";
this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "Ins";
this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(240, 22);
this.InsertNumFramesMenuItem.Text = "Insert # of Frames";
this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click);
//
// toolStripSeparator6
//

137
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -417,21 +417,24 @@ namespace BizHawk.Client.EmuHawk
private void CopyMenuItem_Click(object sender, EventArgs e)
{
_tasClipboard.Clear();
var list = TasView.SelectedIndices;
var sb = new StringBuilder();
for (var i = 0; i < list.Count; i++)
if (SelectedIndices.Any())
{
var input = _tas.GetInputState(list[i]);
_tasClipboard.Add(new TasClipboardEntry(list[i], input));
var lg = _tas.LogGeneratorInstance();
lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry());
_tasClipboard.Clear();
var list = TasView.SelectedIndices;
var sb = new StringBuilder();
for (var i = 0; i < list.Count; i++)
{
var input = _tas.GetInputState(list[i]);
_tasClipboard.Add(new TasClipboardEntry(list[i], input));
var lg = _tas.LogGeneratorInstance();
lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry());
}
Clipboard.SetDataObject(sb.ToString());
SetSplicer();
}
Clipboard.SetDataObject(sb.ToString());
SetSplicer();
}
private void PasteMenuItem_Click(object sender, EventArgs e)
@ -441,44 +444,43 @@ namespace BizHawk.Client.EmuHawk
if (_tasClipboard.Any())
{
_tas.CopyOverInput(FirstSelectedIndex, _tasClipboard.Select(x => x.ControllerState));
RefreshDialog();
}
RefreshDialog();
}
private void PasteInsertMenuItem_Click(object sender, EventArgs e)
{
// TODO: if highlighting 2 rows and pasting 3, only paste 2 of them
// FCEUX Taseditor does't do this, but I think it is the expected behavior in editor programs
if (_tasClipboard.Any())
{
_tas.InsertInput(FirstSelectedIndex, _tasClipboard.Select(x => x.ControllerState));
RefreshDialog();
}
RefreshDialog();
}
private void CutMenuItem_Click(object sender, EventArgs e)
{
_tasClipboard.Clear();
var list = SelectedIndices.ToArray();
var sb = new StringBuilder();
for (var i = 0; i < list.Length; i++)
if (SelectedIndices.Any())
{
var input = _tas.GetInputState(i);
_tasClipboard.Add(new TasClipboardEntry(list[i], input));
var lg = _tas.LogGeneratorInstance();
lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry());
_tasClipboard.Clear();
var list = SelectedIndices.ToArray();
var sb = new StringBuilder();
for (var i = 0; i < list.Length; i++)
{
var input = _tas.GetInputState(i);
_tasClipboard.Add(new TasClipboardEntry(list[i], input));
var lg = _tas.LogGeneratorInstance();
lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry());
}
Clipboard.SetDataObject(sb.ToString());
_tas.RemoveFrames(list);
SetSplicer();
TasView.DeselectAll();
RefreshDialog();
}
Clipboard.SetDataObject(sb.ToString());
_tas.RemoveFrames(list);
SetSplicer();
TasView.DeselectAll();
RefreshDialog();
}
private void ClearMenuItem_Click(object sender, EventArgs e)
@ -493,39 +495,66 @@ namespace BizHawk.Client.EmuHawk
private void DeleteFramesMenuItem_Click(object sender, EventArgs e)
{
_tasClipboard.Clear();
_tas.RemoveFrames(SelectedIndices.ToArray());
SetSplicer();
TasView.DeselectAll();
RefreshDialog();
if (SelectedIndices.Any())
{
_tasClipboard.Clear();
_tas.RemoveFrames(SelectedIndices.ToArray());
SetSplicer();
TasView.DeselectAll();
RefreshDialog();
}
}
private void CloneMenuItem_Click(object sender, EventArgs e)
{
var framesToInsert = SelectedIndices.ToList();
var insertionFrame = LastSelectedIndex + 1;
var inputLog = new List<string>();
foreach (var frame in framesToInsert)
if (SelectedIndices.Any())
{
inputLog.Add(_tas.GetInput(frame));
var framesToInsert = SelectedIndices.ToList();
var insertionFrame = LastSelectedIndex + 1;
var inputLog = new List<string>();
foreach (var frame in framesToInsert)
{
inputLog.Add(_tas.GetInput(frame));
}
_tas.InsertInput(insertionFrame, inputLog);
RefreshDialog();
}
_tas.InsertInput(insertionFrame, inputLog);
RefreshDialog();
}
private void InsertFrameMenuItem_Click(object sender, EventArgs e)
{
_tas.InsertEmptyFrame(LastSelectedIndex + 1);
if (SelectedIndices.Any())
{
_tas.InsertEmptyFrame(LastSelectedIndex + 1);
RefreshDialog();
}
}
private void InsertNumFramesMenuItem_Click(object sender, EventArgs e)
{
if (SelectedIndices.Any())
{
var framesPrompt = new FramesPrompt();
var result = framesPrompt.ShowDialog();
if (result == DialogResult.OK)
{
_tas.InsertEmptyFrame(LastSelectedIndex + 1, framesPrompt.Frames);
}
}
RefreshDialog();
}
private void TruncateMenuItem_Click(object sender, EventArgs e)
{
_tas.Truncate(LastSelectedIndex + 1);
RefreshDialog();
if (SelectedIndices.Any())
{
_tas.Truncate(LastSelectedIndex + 1);
RefreshDialog();
}
}