Skip to content

Commit

Permalink
refactor: Display current TAS input in Info HUD again
Browse files Browse the repository at this point in the history
  • Loading branch information
@psyGamer
psyGamer committed Feb 22, 2025
1 parent c04451b commit 0c9bc63
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CelesteTAS-EverestInterop/Source/EverestInterop/InfoHUD/InfoHud.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ private static void WriteTasInput(StringBuilder stringBuilder) {

string FormatInputFrame(InputFrame inputFrame) {
return
$"{(inputFrame.Line + 1).ToString().PadLeft(linePadLeft)}: {string.Empty.PadLeft(framesPadLeft - inputFrame.Frames.ToString().Length)}{inputFrame}";
$"{(inputFrame.Line + 1).ToString().PadLeft(linePadLeft)}: {string.Empty.PadLeft(framesPadLeft - inputFrame.Frames.ToString().Length)}{inputFrame.ToString().TrimStart()}";
}

if (previous != null) {
Expand Down
69 changes: 57 additions & 12 deletions CelesteTAS-EverestInterop/Source/InfoHUD/GameInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Linq;
using System.Text;
using TAS.Gameplay;
using TAS.Input;
using TAS.ModInterop;
using TAS.Module;
using TAS.Utils;
Expand All @@ -32,14 +33,9 @@ public static IEnumerable<string> Query(Target target, bool forceAllowCodeExecut
#endif
switch (target) {
case Target.InGameHud: {
yield return TAS.GameInfo.HudInfo;
yield return "===";

// TODO:
// if (TasSettings.InfoTasInput) {
// WriteTasInput(stringBuilder);
// }

if (TasSettings.InfoTasInput && tasInput.Value is { } input && !string.IsNullOrEmpty(input)) {
yield return input;
}
if (TasSettings.InfoGame && levelStatus.Value is { } status && sessionData.Value is { } session) {
yield return $"{status}\n[{session.RoomName}] Timer: {session.ChapterTime}";
}
Expand All @@ -66,7 +62,7 @@ public static IEnumerable<string> Query(Target target, bool forceAllowCodeExecut
}

case Target.Studio: {
if (TasSettings.InfoGame && levelStatus.Value is { } status && sessionData.Value is { } session) {
if (levelStatus.Value is { } status && sessionData.Value is { } session) {
yield return $"{status}\n[{session.RoomName}] Timer: {session.ChapterTime}";
}
if (InfoMouse.Info.Value is { } infoMouse) {
Expand Down Expand Up @@ -178,6 +174,7 @@ private static void ResetCache() {
levelStatusExact.Reset();
}

tasInput.Reset();
sessionData.Reset();

if (customInfoTemplateHash != TasSettings.InfoCustomTemplate.GetHashCode()) {
Expand Down Expand Up @@ -219,6 +216,8 @@ private static void OnLevelTransition(Level level, LevelData next, Vector2 direc
}

// Caches of calculations for the current frame
private static LazyValue<string?> tasInput = new(QueryTasInput);

private static LazyValue<string?> levelStatus = new(QueryDisplayLevelStatus);
private static LazyValue<string?> levelStatusExact = new(QueryExactLevelStatus);
private static LazyValue<(string RoomName, string ChapterTime)?> sessionData = new(QuerySessionData);
Expand All @@ -237,6 +236,52 @@ private static void OnLevelTransition(Level level, LevelData next, Vector2 direc
// Kept to reduce allocations
private static readonly StringBuilder builder = new();

private static string? QueryTasInput() {
var controller = Manager.Controller;
var inputs = controller.Inputs;

if (!Manager.Running || controller.CurrentFrameInTas < 0 || controller.CurrentFrameInTas >= inputs.Count) {
return null;
}

// The current input is the next executed input, but we want the previously executed input
var current = controller.Current;
if (controller.CurrentFrameInTas >= 1 && current != controller.Previous) {
current = controller.Previous!;
}

var previous = current.Previous;
var next = current.Next;

// Align all visible inputs
int maxLine = Math.Max(current.Line, Math.Max(previous?.Line ?? 0, next?.Line ?? 0)) + 1;
int maxLineLen = maxLine.Digits();

int maxFrames = Math.Max(current.Frames, Math.Max(previous?.Frames ?? 0, next?.Frames ?? 0));
int maxFramesLen = maxFrames.Digits();

builder.Clear();

if (previous != null) {
builder.AppendLine(FormatInput(previous));
}

string currentStr = FormatInput(current);
int currFrameLen = controller.CurrentFrameInInput.Digits();
int inputWidth = Math.Max(20, currentStr.Length + currFrameLen + 2);
builder.AppendLine($"{currentStr.PadRight(inputWidth - currFrameLen)}{controller.CurrentFrameInInput}{current.RepeatString}");

if (next != null) {
builder.AppendLine(FormatInput(next));
}

return builder.TrimEnd().ToString();

string FormatInput(InputFrame input) {
return $"{(input.Line + 1).ToString().PadLeft(maxLineLen)}: {new string(' ', maxFramesLen - input.Frames.Digits())}{input.ToString().TrimStart()}";
}
}

private static string? QueryDisplayLevelStatus() => QueryLevelStatus(exact: false);
private static string? QueryExactLevelStatus() => QueryLevelStatus(exact: true);

Expand Down Expand Up @@ -449,19 +494,19 @@ private static string FormatState(StateMachine stateMachine) {

return name;
}
public static string FormatTime(long ticks) {
private static string FormatTime(long ticks) {
var timeSpan = TimeSpan.FromTicks(ticks);
long frames = ticks / Engine.RawDeltaTime.SecondsToTicks();

return $"{timeSpan.ShortGameplayFormat()}({frames})";
}

public static float ConvertSpeedUnit(float speed, SpeedUnit unit) {
private static float ConvertSpeedUnit(float speed, SpeedUnit unit) {
return unit == SpeedUnit.PixelPerSecond
? speed * Engine.TimeRateB
: speed * Engine.RawDeltaTime * Engine.TimeRateB;
}
public static Vector2 ConvertSpeedUnit(Vector2 speed, SpeedUnit unit) {
private static Vector2 ConvertSpeedUnit(Vector2 speed, SpeedUnit unit) {
return unit == SpeedUnit.PixelPerSecond
? speed * Engine.TimeRateB
: speed * Engine.RawDeltaTime * Engine.TimeRateB;
Expand Down

0 comments on commit 0c9bc63

Please sign in to comment.