diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 6941bb5bd7..df18359df1 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -864,12 +864,6 @@
LuaBox.cs
-
- Form
-
-
- TasStudioExperiment.cs
-
TAStudio.cs
Form
@@ -1308,9 +1302,6 @@
RecorderBox.cs
-
- TasStudioExperiment.cs
-
TAStudio.cs
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index ccefe4a4c7..8671d2ae83 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -373,11 +373,6 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load();
}
- if (Global.Config.AutoloadExperimentalTAStudio)
- {
- GlobalWin.Tools.Load();
- }
-
if (Global.Config.AutoloadVirtualPad)
{
GlobalWin.Tools.Load();
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.Designer.cs
deleted file mode 100644
index 7b7c29d86a..0000000000
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.Designer.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-namespace BizHawk.Client.EmuHawk
-{
- partial class TasStudioExperiment
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.menuStrip1 = new System.Windows.Forms.MenuStrip();
- this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.label1 = new System.Windows.Forms.Label();
- this.CurrentCellLabel = new System.Windows.Forms.Label();
- this.InputView = new BizHawk.Client.EmuHawk.InputRoll();
- this.OutputLabel = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.ScrollBarValueTable = new System.Windows.Forms.Label();
- this.menuStrip1.SuspendLayout();
- this.SuspendLayout();
- //
- // menuStrip1
- //
- this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.settingsToolStripMenuItem});
- this.menuStrip1.Location = new System.Drawing.Point(0, 0);
- this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(404, 24);
- this.menuStrip1.TabIndex = 0;
- this.menuStrip1.Text = "menuStrip1";
- //
- // settingsToolStripMenuItem
- //
- this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.autoloadToolStripMenuItem});
- this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
- this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
- this.settingsToolStripMenuItem.Text = "&Settings";
- this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened);
- //
- // autoloadToolStripMenuItem
- //
- this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem";
- this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
- this.autoloadToolStripMenuItem.Text = "Autoload";
- this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click);
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(12, 87);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(67, 13);
- this.label1.TabIndex = 2;
- this.label1.Text = "Current Cell: ";
- //
- // CurrentCellLabel
- //
- this.CurrentCellLabel.AutoSize = true;
- this.CurrentCellLabel.Location = new System.Drawing.Point(85, 87);
- this.CurrentCellLabel.Name = "CurrentCellLabel";
- this.CurrentCellLabel.Size = new System.Drawing.Size(35, 13);
- this.CurrentCellLabel.TabIndex = 3;
- this.CurrentCellLabel.Text = "label2";
- //
- // InputView
- //
- this.InputView.AllowColumnReorder = false;
- this.InputView.AllowColumnResize = false;
- this.InputView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.InputView.Font = new System.Drawing.Font("Courier New", 8F);
- this.InputView.HorizontalOrientation = false;
- this.InputView.ItemCount = 0;
- this.InputView.Location = new System.Drawing.Point(12, 103);
- this.InputView.MultiSelect = false;
- this.InputView.Name = "InputView";
- this.InputView.Size = new System.Drawing.Size(380, 303);
- this.InputView.TabIndex = 1;
- this.InputView.Text = "inputRoll1";
- this.InputView.VirtualMode = false;
- this.InputView.PointedCellChanged += new BizHawk.Client.EmuHawk.InputRoll.CellChangeEventHandler(this.InputView_PointedCellChanged);
- this.InputView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.InputView_ColumnClick);
- this.InputView.SelectedIndexChanged += new System.EventHandler(this.InputView_SelectedIndexChanged);
- //
- // OutputLabel
- //
- this.OutputLabel.AutoSize = true;
- this.OutputLabel.Location = new System.Drawing.Point(12, 51);
- this.OutputLabel.Name = "OutputLabel";
- this.OutputLabel.Size = new System.Drawing.Size(35, 13);
- this.OutputLabel.TabIndex = 4;
- this.OutputLabel.Text = "label2";
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(12, 28);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(76, 13);
- this.label2.TabIndex = 5;
- this.label2.Text = "Scroll Position:";
- //
- // ScrollBarValueTable
- //
- this.ScrollBarValueTable.AutoSize = true;
- this.ScrollBarValueTable.Location = new System.Drawing.Point(94, 28);
- this.ScrollBarValueTable.Name = "ScrollBarValueTable";
- this.ScrollBarValueTable.Size = new System.Drawing.Size(76, 13);
- this.ScrollBarValueTable.TabIndex = 6;
- this.ScrollBarValueTable.Text = "Scroll Position:";
- //
- // TasStudioExperiment
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(404, 418);
- this.Controls.Add(this.ScrollBarValueTable);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.OutputLabel);
- this.Controls.Add(this.CurrentCellLabel);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.InputView);
- this.Controls.Add(this.menuStrip1);
- this.MainMenuStrip = this.menuStrip1;
- this.Name = "TasStudioExperiment";
- this.Text = "TasStudioExperiment";
- this.Load += new System.EventHandler(this.TasStudioExperiment_Load);
- this.menuStrip1.ResumeLayout(false);
- this.menuStrip1.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.MenuStrip menuStrip1;
- private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem autoloadToolStripMenuItem;
- private InputRoll InputView;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label CurrentCellLabel;
- private System.Windows.Forms.Label OutputLabel;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label ScrollBarValueTable;
- }
-}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.cs
deleted file mode 100644
index 4a6482d0c5..0000000000
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-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;
-
-using BizHawk.Client.Common;
-
-namespace BizHawk.Client.EmuHawk
-{
- public partial class TasStudioExperiment : Form, IToolForm
- {
- #region IToolForm Implementation
-
- public bool UpdateBefore { get { return false; } }
-
- public void UpdateValues()
- {
- if (!IsHandleCreated || IsDisposed)
- {
- return;
- }
-
- Watches.UpdateValues();
- InputView.Refresh();
- ScrollBarValueTable.Text = InputView.ScrollPosition.ToString();
- }
-
- public void FastUpdate()
- {
- // TODO: think more about this
- }
-
- public void Restart()
- {
- if (!IsHandleCreated || IsDisposed)
- {
- return;
- }
-
- }
-
- public bool AskSaveChanges()
- {
- return true;
- }
-
- #endregion
-
- private readonly WatchList Watches = new WatchList(Global.Emulator.MemoryDomains.MainMemory);
- Random r;
-
- public TasStudioExperiment()
- {
- InitializeComponent();
- InputView.QueryItemText += TasView_QueryItemText;
- InputView.QueryItemBkColor += TasView_QueryItemBkColor;
- r = new Random((int)DateTime.Now.Ticks);
- InputView.FullRowSelect = true;
- InputView.MultiSelect = false;
- }
-
- private int? columnClicked = null;
-
- private void TasView_QueryItemText(int index, int column, out string text)
- {
- text = "";
-
- /*
- if (columnClicked.HasValue && column == columnClicked)
- {
- text = "!";
- return;
- }
-
- if (index < InputView.ItemCount)
- {
- text = r.NextDouble() > .5 ? "_" : "";
- }
-
-
- text = string.Empty;
-
- if (index >= Watches.ItemCount || Watches[index].IsSeparator)
- {
- return;
- }
-
- //var columnName = InputView.Columns[column].Name;
- */
- try
- {
- switch (column)
- {
- case 0:
- text = Watches[index].AddressString;
- break;
- case 1:
- text = Watches[index].ValueString;
- break;
- case 2:
- text = Watches[index].PreviousStr;
- break;
- case 3:
- if (!Watches[index].IsSeparator)
- {
- text = Watches[index].ChangeCount.ToString();
- }
-
- break;
- case 4:
- text = Watches[index].Diff;
- break;
- case 5:
- text = Watches[index].Domain.Name;
- break;
- case 6:
- text = Watches[index].Notes;
- break;
- }
- }
- catch (Exception ex)
- {
- var message = ex.Message;
- }
- }
-
- private void TasView_QueryItemBkColor(int index, int column, ref Color color)
- {
- var test = r.NextDouble() > .5;
- //var test = index == 2 && column == 2;
-
- color = test ? Color.LightCyan : Color.White;
- }
-
- private void TasStudioExperiment_Load(object sender, EventArgs e)
- {
-
- for (int i = 0; i < 10; i++)
- {
- Watches.Add(new ByteWatch(Watches.Domain, i, Watch.DisplayType.Signed, false, "Speed"));
- }
-
- InputView.ItemCount = Watches.Count;
-
- InputView.AddColumns(new[]
- {
- new InputRoll.RollColumn
- {
- Group = "",
- Name = "Address",
- Text = "Address"
- },
- new InputRoll.RollColumn
- {
- Group = "",
- Name = "Value",
- Text = "Value"
- },
- new InputRoll.RollColumn
- {
- Group = "",
- Name = "Prev",
- Text = "Prev"
- },
- new InputRoll.RollColumn
- {
- Group = "",
- Name = "Changes",
- Text = "Changes"
- },
- new InputRoll.RollColumn
- {
- Group = "",
- Name = "Domain",
- Text = "Domain"
- },
- new InputRoll.RollColumn
- {
- Group = "",
- Name = "Diff",
- Text = "Diff"
- },
- new InputRoll.RollColumn
- {
- Group = "",
- Name = "Notes",
- Text = "Notes"
- },
- });
-
- /*
- InputView.AddColumns(new []
- {
- new InputRoll.RollColumn
- {
- Group = "Core",
- Name = "MarkerColumn",
- Text = "",
- Width = 23,
- },
- new InputRoll.RollColumn
- {
- Group = "Core",
- Name = "FrameColumn",
- Text = "Frame",
- Width = 50,
- },
- new InputRoll.RollColumn
- {
- Group = "P1",
- Name = "P1 Up",
- Text = "U",
- Type = InputRoll.RollColumn.InputType.Boolean
- },
- new InputRoll.RollColumn
- {
- Group = "P1",
- Name = "P1 Down",
- Text = "D",
- Type = InputRoll.RollColumn.InputType.Boolean
- },
- new InputRoll.RollColumn
- {
- Group = "P1",
- Name = "P1 Left",
- Text = "L",
- Type = InputRoll.RollColumn.InputType.Boolean
- },
- new InputRoll.RollColumn
- {
- Group = "P1",
- Name = "P1 Right",
- Text = "R",
- Type = InputRoll.RollColumn.InputType.Boolean
- },
- new InputRoll.RollColumn
- {
- Group = "P1",
- Name = "P1 Select",
- Text = "s",
- Type = InputRoll.RollColumn.InputType.Boolean
- },
- new InputRoll.RollColumn
- {
- Group = "P1",
- Name = "P1 Start",
- Text = "S",
- Type = InputRoll.RollColumn.InputType.Boolean
- },
- new InputRoll.RollColumn
- {
- Group = "P1",
- Name = "P1 B",
- Text = "B",
- Type = InputRoll.RollColumn.InputType.Boolean
- },
- new InputRoll.RollColumn
- {
- Group = "P1",
- Name = "P1 A",
- Text = "A",
- Type = InputRoll.RollColumn.InputType.Boolean
- },
- });
-
- InputView.ItemCount = 20;
- */
- }
-
- private void settingsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
- {
-
- }
-
- private void autoloadToolStripMenuItem_Click(object sender, EventArgs e)
- {
-
- }
-
- private void InputView_PointedCellChanged(object sender, InputRoll.CellEventArgs e)
- {
- if (e.NewCell == null)
- {
- CurrentCellLabel.Text = "None";
- }
- else
- {
- string column = e.NewCell.Column != null ? e.NewCell.Column.Text : "None";
- string row = e.NewCell.RowIndex.HasValue ? e.NewCell.RowIndex.Value.ToString() : "None";
-
- CurrentCellLabel.Text = string.Format("Column: {0} RowIndex: {1}", column, row);
- }
- }
-
- private void InputView_ColumnClick(object sender, ColumnClickEventArgs e)
- {
- var column = InputView.GetColumn(e.Column);
- columnClicked = e.Column;
- InputView.Refresh();
- }
-
- private void InputView_SelectedIndexChanged(object sender, EventArgs e)
- {
- OutputLabel.Text = string.Join(",", InputView.SelectedIndices.ToArray());
- }
- }
-}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.resx b/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.resx
deleted file mode 100644
index 0f6d8eb42b..0000000000
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 17, 17
-
-
\ No newline at end of file