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

tastudio: more branch work. 

- change skipRemoval default to true, set to false only on state capturing
- put guid hashes to BranchStates
- setup a couple of functions using guid
This commit is contained in:
feos 2015-09-16 19:40:50 +03:00
parent 227a35e474
commit 4f07c908a0
3 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -81,9 +81,19 @@ namespace BizHawk.Client.Common
public TasMovieMarkerList Markers { get; set; }
public bool BindMarkersToInput { get; set; }
public bool UseInputCache { get; set; }
public TasBranch GetBranch(int id) { return Branches[id]; }
public int BranchCount { get { return Branches.Count; } }
public int BranchIndex(int frame)
public TasBranch GetBranch(int index) { return Branches[index]; }
public int BranchHashByIndex(int index) { return Branches[index].UniqueIdentifier.GetHashCode(); }
public int BranchIndexByHash(int hash)
{
TasBranch branch = Branches.Where(b => b.UniqueIdentifier.GetHashCode() == hash).SingleOrDefault();
if (branch == null)
return -1;
return Branches.IndexOf(branch);
}
public int BranchIndexByFrame(int frame)
{
TasBranch branch = Branches.Where(b => b.Frame == frame)
.OrderByDescending(b => b.TimeStamp).FirstOrDefault();
@ -478,7 +488,7 @@ namespace BizHawk.Client.Common
StateManager.LoadBranch(Branches.IndexOf(branch));
StateManager.SetState(branch.Frame, branch.CoreData, skipRemoval: true);
StateManager.SetState(branch.Frame, branch.CoreData);
//ChangeLog = branch.ChangeLog;
Markers = branch.Markers;

58
BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
View File

@ -195,7 +195,7 @@ namespace BizHawk.Client.Common
if (shouldCapture)
{
SetState(frame, (byte[])Core.SaveStateBinary().Clone());
SetState(frame, (byte[])Core.SaveStateBinary().Clone(), skipRemoval: false);
}
}
@ -326,9 +326,9 @@ namespace BizHawk.Client.Common
Used += (ulong)States[index].Length;
}
internal void SetState(int frame, byte[] state, bool skipRemoval = false)
internal void SetState(int frame, byte[] state, bool skipRemoval = true)
{
if (!skipRemoval)
if (!skipRemoval) // skipRemoval: false only when capturing new states
MaybeRemoveStates(); // Remove before adding so this state won't be removed.
if (States.ContainsKey(frame))
@ -564,6 +564,8 @@ namespace BizHawk.Client.Common
int frame = br.ReadInt32();
int len = br.ReadInt32();
byte[] data = br.ReadBytes(len);
// whether we should allow state removal check here is an interesting question
// nothing was edited yet, so it might make sense to show the project untouched first
SetState(frame, data);
//States.Add(frame, data);
//Used += len;
@ -643,7 +645,6 @@ namespace BizHawk.Client.Common
#region "Branches"
private SortedList<int, SortedList<int, StateManagerState>> BranchStates = new SortedList<int, SortedList<int, StateManagerState>>();
//private int branches = 0;
private int currentBranch = -1;
/// <summary>
@ -697,30 +698,28 @@ namespace BizHawk.Client.Common
public void AddBranch()
{
// let's not put serial number there, since branches can be removed and whatnot, messing it up
// use something unique, reliable and already present, like... total seconds?
// might as well just add another field to branch, like counter of added branches, and check by that
int identifier = (int)_movie.GetBranch(_movie.BranchCount-1).TimeStamp.TimeOfDay.TotalSeconds;
int branchHash = _movie.BranchHashByIndex(_movie.BranchCount - 1);
foreach (KeyValuePair<int, StateManagerState> kvp in States)
{
if (!BranchStates.ContainsKey(kvp.Key))
BranchStates.Add(kvp.Key, new SortedList<int, StateManagerState>());
SortedList<int, StateManagerState> stateList = BranchStates[kvp.Key];
if (stateList == null) // when does this happen?
{
stateList = new SortedList<int, StateManagerState>();
BranchStates[kvp.Key] = stateList;
}
stateList.Add(identifier, kvp.Value);
stateList.Add(branchHash, kvp.Value);
}
//branches++;
currentBranch = _movie.BranchCount;
}
public void RemoveBranch(int index)
{
int identifier = (int)_movie.GetBranch(index).TimeStamp.TimeOfDay.TotalSeconds;
int branchHash = _movie.BranchHashByIndex(index);
foreach (KeyValuePair<int, SortedList<int, StateManagerState>> kvp in BranchStates.ToList())
{
@ -728,24 +727,21 @@ namespace BizHawk.Client.Common
if (stateList == null)
continue;
if (stateHasDuplicate(kvp.Key, identifier) == -2)
if (stateHasDuplicate(kvp.Key, branchHash) == -2)
{
if (stateList.ContainsKey(identifier))
if (stateList.ContainsKey(branchHash))
{
if (stateList[identifier].IsOnDisk)
if (stateList[branchHash].IsOnDisk)
{ }
else
Used -= (ulong)stateList[identifier].Length;
Used -= (ulong)stateList[branchHash].Length;
}
}
stateList.Remove(identifier);
stateList.Remove(branchHash);
if (stateList.Count == 0)
BranchStates.Remove(kvp.Key);
}
//branches--;
//if (currentBranch <= _movie.BranchCount)
// currentBranch = -1;
if (currentBranch > index)
currentBranch--;
else if (currentBranch == index)
@ -754,7 +750,7 @@ namespace BizHawk.Client.Common
public void UpdateBranch(int index)
{
int identifier = (int)_movie.GetBranch(index).TimeStamp.TimeOfDay.TotalSeconds;
int branchHash = _movie.BranchHashByIndex(index);
// RemoveBranch
foreach (KeyValuePair<int, SortedList<int, StateManagerState>> kvp in BranchStates.ToList())
@ -763,18 +759,18 @@ namespace BizHawk.Client.Common
if (stateList == null)
continue;
if (stateHasDuplicate(kvp.Key, identifier) == -2)
if (stateHasDuplicate(kvp.Key, branchHash) == -2)
{
if (stateList.ContainsKey(identifier))
if (stateList.ContainsKey(branchHash))
{
if (stateList[identifier].IsOnDisk)
if (stateList[branchHash].IsOnDisk)
{ }
else
Used -= (ulong)stateList[identifier].Length;
Used -= (ulong)stateList[branchHash].Length;
}
}
stateList.Remove(identifier);
stateList.Remove(branchHash);
if (stateList.Count == 0)
{
BranchStates[kvp.Key] = null;
@ -786,13 +782,15 @@ namespace BizHawk.Client.Common
{
if (!BranchStates.ContainsKey(kvp.Key))
BranchStates.Add(kvp.Key, new SortedList<int, StateManagerState>());
SortedList<int, StateManagerState> stateList = BranchStates[kvp.Key];
if (stateList == null)
{
stateList = new SortedList<int, StateManagerState>();
BranchStates[kvp.Key] = stateList;
}
stateList.Add(identifier, kvp.Value);
stateList.Add(branchHash, kvp.Value);
}
currentBranch = index;
@ -800,15 +798,17 @@ namespace BizHawk.Client.Common
public void LoadBranch(int index)
{
int identifier = (int)_movie.GetBranch(index).TimeStamp.TimeOfDay.TotalSeconds;
int branchHash = _movie.BranchHashByIndex(index);
Invalidate(0); // Not a good way of doing it?
foreach (KeyValuePair<int, SortedList<int, StateManagerState>> kvp in BranchStates)
{
if (kvp.Key == 0 && States.ContainsKey(0))
continue; // TODO: It might be a better idea to just not put state 0 in BranchStates.
if (kvp.Value.ContainsKey(identifier))
SetState(kvp.Key, kvp.Value[identifier].State, skipRemoval: true);
if (kvp.Value.ContainsKey(branchHash))
SetState(kvp.Key, kvp.Value[branchHash].State);
}
currentBranch = index;

2
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -226,7 +226,7 @@ namespace BizHawk.Client.EmuHawk
if (columnName == CursorColumnName)
{
int branchIndex = CurrentTasMovie.BranchIndex(index);
int branchIndex = CurrentTasMovie.BranchIndexByFrame(index);
if (branchIndex != -1)
{
text = branchIndex.ToString();