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

Move TAStudio colours into a struct and save it to config

This commit is contained in:
YoshiRulz 2021-11-19 03:24:15 +10:00
parent 625c657531
commit 90c489beed
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
6 changed files with 109 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -131,13 +131,13 @@ namespace BizHawk.Client.EmuHawk
var record = Movie[branch.Frame];
if (index == Branches.Current)
{
color = TAStudio.CurrentFrame_InputLog;
color = Tastudio.Palette.CurrentFrame_InputLog;
}
else if (record.Lagged.HasValue)
{
color = record.Lagged.Value
? TAStudio.LagZone_InputLog
: TAStudio.GreenZone_InputLog;
? Tastudio.Palette.LagZone_InputLog
: Tastudio.Palette.GreenZone_InputLog;
}
}

10
src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -73,7 +73,7 @@ namespace BizHawk.Client.EmuHawk
if (prev != null && index == Markers.IndexOf(prev))
{
// feos: taseditor doesn't have it, so we're free to set arbitrary color scheme. and I prefer consistency
color = TAStudio.CurrentFrame_InputLog;
color = Tastudio.Palette.CurrentFrame_InputLog;
}
else if (index < Markers.Count)
{
@ -84,11 +84,15 @@ namespace BizHawk.Client.EmuHawk
{
if (record.Lagged.Value)
{
color = column.Name == "FrameColumn" ? TAStudio.LagZone_FrameCol : TAStudio.LagZone_InputLog;
color = column.Name == "FrameColumn"
? Tastudio.Palette.LagZone_FrameCol
: Tastudio.Palette.LagZone_InputLog;
}
else
{
color = column.Name == "LabelColumn" ? TAStudio.GreenZone_FrameCol : TAStudio.GreenZone_InputLog;
color = column.Name == "LabelColumn"
? Tastudio.Palette.GreenZone_FrameCol
: Tastudio.Palette.GreenZone_InputLog;
}
}
}

39
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -126,23 +126,6 @@ namespace BizHawk.Client.EmuHawk
}
}
// public static Color CurrentFrame_FrameCol = Color.FromArgb(0xCF, 0xED, 0xFC); Why?
public static Color CurrentFrame_InputLog => Color.FromArgb(0xB5, 0xE7, 0xF7);
public static Color SeekFrame_InputLog => Color.FromArgb(0x70, 0xB5, 0xE7, 0xF7);
public static Color GreenZone_FrameCol => Color.FromArgb(0xDD, 0xFF, 0xDD);
public static Color GreenZone_InputLog => Color.FromArgb(0xD2, 0xF9, 0xD3);
public static Color GreenZone_InputLog_Stated => Color.FromArgb(0xC4, 0xF7, 0xC8);
public static Color GreenZone_InputLog_Invalidated => Color.FromArgb(0xE0, 0xFB, 0xE0);
public static Color LagZone_FrameCol => Color.FromArgb(0xFF, 0xDC, 0xDD);
public static Color LagZone_InputLog => Color.FromArgb(0xF4, 0xDA, 0xDA);
public static Color LagZone_InputLog_Stated => Color.FromArgb(0xF0, 0xD0, 0xD2);
public static Color LagZone_InputLog_Invalidated => Color.FromArgb(0xF7, 0xE5, 0xE5);
public static Color Marker_FrameCol => Color.FromArgb(0xF7, 0xFF, 0xC9);
public static Color AnalogEdit_Col => Color.FromArgb(0x90, 0x90, 0x70); // SuuperW: When editing an analog value, it will be a gray color.
private Bitmap ts_v_arrow_green_blue => Properties.Resources.ts_v_arrow_green_blue;
private Bitmap ts_h_arrow_green_blue => Properties.Resources.ts_h_arrow_green_blue;
private Bitmap ts_v_arrow_blue => Properties.Resources.ts_v_arrow_blue;
@ -248,7 +231,7 @@ namespace BizHawk.Client.EmuHawk
{
if (Emulator.Frame != index && CurrentTasMovie.Markers.IsMarker(index) && Settings.DenoteMarkersWithBGColor)
{
color = Marker_FrameCol;
color = Palette.Marker_FrameCol;
}
else
{
@ -259,7 +242,7 @@ namespace BizHawk.Client.EmuHawk
&& (index == _axisEditRow || _extraAxisRows.Contains(index))
&& columnName == _axisEditColumn)
{
color = AnalogEdit_Col;
color = Palette.AnalogEdit_Col;
}
int player = Emulator.ControllerDefinition.PlayerNumber(columnName);
@ -280,32 +263,32 @@ namespace BizHawk.Client.EmuHawk
if (MainForm.IsSeeking && MainForm.PauseOnFrame == index)
{
color = CurrentFrame_InputLog;
color = Palette.CurrentFrame_InputLog;
}
else if (!MainForm.IsSeeking && Emulator.Frame == index)
{
color = CurrentFrame_InputLog;
color = Palette.CurrentFrame_InputLog;
}
else if (record.Lagged.HasValue)
{
if (!record.HasState && Settings.DenoteStatesWithBGColor)
{
color = record.Lagged.Value
? LagZone_InputLog
: GreenZone_InputLog;
? Palette.LagZone_InputLog
: Palette.GreenZone_InputLog;
}
else
{
color = record.Lagged.Value
? LagZone_InputLog_Stated
: GreenZone_InputLog_Stated;
? Palette.LagZone_InputLog_Stated
: Palette.GreenZone_InputLog_Stated;
}
}
else if (record.WasLagged.HasValue)
{
color = record.WasLagged.Value ?
LagZone_InputLog_Invalidated :
GreenZone_InputLog_Invalidated;
color = record.WasLagged.Value
? Palette.LagZone_InputLog_Invalidated
: Palette.GreenZone_InputLog_Invalidated;
}
else
{

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

@ -53,6 +53,8 @@ namespace BizHawk.Client.EmuHawk
[ConfigPersist]
public TAStudioSettings Settings { get; set; } = new TAStudioSettings();
public TAStudioPalette Palette => Settings.Palette;
[ConfigPersist]
public Font TasViewFont { get; set; } = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
@ -82,6 +84,8 @@ namespace BizHawk.Client.EmuHawk
DenoteStatesWithBGColor = true;
DenoteMarkersWithIcons = false;
DenoteMarkersWithBGColor = true;
Palette = TAStudioPalette.Default;
}
public RecentFiles RecentTas { get; set; }
@ -109,6 +113,7 @@ namespace BizHawk.Client.EmuHawk
public int BranchMarkerSplitDistance { get; set; }
public bool BindMarkersToInput { get; set; }
public bool CopyIncludesFrameNo { get; set; }
public TAStudioPalette Palette { get; set; }
}
public TAStudio()

81
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioPalette.cs Normal file
View File

@ -0,0 +1,81 @@
using System.Drawing;
namespace BizHawk.Client.EmuHawk
{
/// <remarks>
/// TODO these colours are obviously related in some way, calculate the lighter/darker shades from a base colour
/// (I've already used CurrentFrame_InputLog in the definition of SeekFrame_InputLog, they differed only in alpha)
/// --yoshi
/// </remarks>
public readonly struct TAStudioPalette
{
public static TAStudioPalette Default = new(
// currentFrame_FrameCol: Color.FromArgb(0xCF, 0xED, 0xFC),
currentFrame_InputLog: Color.FromArgb(0xB5, 0xE7, 0xF7),
greenZone_FrameCol: Color.FromArgb(0xDD, 0xFF, 0xDD),
greenZone_InputLog: Color.FromArgb(0xD2, 0xF9, 0xD3),
greenZone_InputLog_Stated: Color.FromArgb(0xC4, 0xF7, 0xC8),
greenZone_InputLog_Invalidated: Color.FromArgb(0xE0, 0xFB, 0xE0),
lagZone_FrameCol: Color.FromArgb(0xFF, 0xDC, 0xDD),
lagZone_InputLog: Color.FromArgb(0xF4, 0xDA, 0xDA),
lagZone_InputLog_Stated: Color.FromArgb(0xF0, 0xD0, 0xD2),
lagZone_InputLog_Invalidated: Color.FromArgb(0xF7, 0xE5, 0xE5),
marker_FrameCol: Color.FromArgb(0xF7, 0xFF, 0xC9),
analogEdit_Col: Color.FromArgb(0x90, 0x90, 0x70)); // SuuperW: When editing an analog value, it will be a gray color.
// public readonly Color CurrentFrame_FrameCol;
public readonly Color CurrentFrame_InputLog;
// public readonly Color SeekFrame_InputLog;
public readonly Color GreenZone_FrameCol;
public readonly Color GreenZone_InputLog;
public readonly Color GreenZone_InputLog_Stated;
public readonly Color GreenZone_InputLog_Invalidated;
public readonly Color LagZone_FrameCol;
public readonly Color LagZone_InputLog;
public readonly Color LagZone_InputLog_Stated;
public readonly Color LagZone_InputLog_Invalidated;
public readonly Color Marker_FrameCol;
public readonly Color AnalogEdit_Col;
public TAStudioPalette(
// Color currentFrame_FrameCol,
Color currentFrame_InputLog,
Color greenZone_FrameCol,
Color greenZone_InputLog,
Color greenZone_InputLog_Stated,
Color greenZone_InputLog_Invalidated,
Color lagZone_FrameCol,
Color lagZone_InputLog,
Color lagZone_InputLog_Stated,
Color lagZone_InputLog_Invalidated,
Color marker_FrameCol,
Color analogEdit_Col)
{
// CurrentFrame_FrameCol = currentFrame_FrameCol;
CurrentFrame_InputLog = currentFrame_InputLog;
// SeekFrame_InputLog = Color.FromArgb(0x70, currentFrame_InputLog);
GreenZone_FrameCol = greenZone_FrameCol;
GreenZone_InputLog = greenZone_InputLog;
GreenZone_InputLog_Stated = greenZone_InputLog_Stated;
GreenZone_InputLog_Invalidated = greenZone_InputLog_Invalidated;
LagZone_FrameCol = lagZone_FrameCol;
LagZone_InputLog = lagZone_InputLog;
LagZone_InputLog_Stated = lagZone_InputLog_Stated;
LagZone_InputLog_Invalidated = lagZone_InputLog_Invalidated;
Marker_FrameCol = marker_FrameCol;
AnalogEdit_Col = analogEdit_Col;
}
}
}

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

@ -44,11 +44,11 @@ namespace BizHawk.Client.EmuHawk
{
if (index == Log.UndoIndex)
{
color = TAStudio.GreenZone_InputLog;
color = _tastudio.Palette.GreenZone_InputLog;
}
else if (index > Log.UndoIndex)
{
color = TAStudio.LagZone_InputLog;
color = _tastudio.Palette.LagZone_InputLog;
}
}