old debug line removals, better alignment performance notifs
This commit is contained in:
@@ -78,19 +78,18 @@ public class PlayerPerformanceService
|
|||||||
string warningText = string.Empty;
|
string warningText = string.Empty;
|
||||||
if (exceedsTris && !exceedsVram)
|
if (exceedsTris && !exceedsVram)
|
||||||
{
|
{
|
||||||
warningText = $"Player {pairHandler.Pair.PlayerName} ({pairHandler.Pair.UserData.AliasOrUID}) exceeds your configured triangle warning threshold (" +
|
warningText = $"Player {pairHandler.Pair.PlayerName} ({pairHandler.Pair.UserData.AliasOrUID}) exceeds your configured triangle warning threshold\n" +
|
||||||
$"{triUsage}/{config.TrisWarningThresholdThousands * 1000} triangles).";
|
$"{triUsage}/{config.TrisWarningThresholdThousands * 1000} triangles";
|
||||||
}
|
}
|
||||||
else if (!exceedsTris)
|
else if (!exceedsTris)
|
||||||
{
|
{
|
||||||
warningText = $"Player {pairHandler.Pair.PlayerName} ({pairHandler.Pair.UserData.AliasOrUID}) exceeds your configured VRAM warning threshold (" +
|
warningText = $"Player {pairHandler.Pair.PlayerName} ({pairHandler.Pair.UserData.AliasOrUID}) exceeds your configured VRAM warning threshold\n" +
|
||||||
$"{UiSharedService.ByteToString(vramUsage, true)}/{config.VRAMSizeWarningThresholdMiB} MiB).";
|
$"{UiSharedService.ByteToString(vramUsage, true)}/{config.VRAMSizeWarningThresholdMiB} MiB";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
warningText = $"Player {pairHandler.Pair.PlayerName} ({pairHandler.Pair.UserData.AliasOrUID}) exceeds both VRAM warning threshold (" +
|
warningText = $"Player {pairHandler.Pair.PlayerName} ({pairHandler.Pair.UserData.AliasOrUID}) exceeds both VRAM warning threshold and triangle warning threshold\n" +
|
||||||
$"{UiSharedService.ByteToString(vramUsage, true)}/{config.VRAMSizeWarningThresholdMiB} MiB) and " +
|
$"{UiSharedService.ByteToString(vramUsage, true)}/{config.VRAMSizeWarningThresholdMiB} MiB and {triUsage}/{config.TrisWarningThresholdThousands * 1000} triangles";
|
||||||
$"triangle warning threshold ({triUsage}/{config.TrisWarningThresholdThousands * 1000} triangles).";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_mediator.Publish(new PerformanceNotificationMessage(
|
_mediator.Publish(new PerformanceNotificationMessage(
|
||||||
@@ -142,9 +141,8 @@ public class PlayerPerformanceService
|
|||||||
if (CheckForThreshold(config.AutoPausePlayersExceedingThresholds, config.TrisAutoPauseThresholdThousands * 1000,
|
if (CheckForThreshold(config.AutoPausePlayersExceedingThresholds, config.TrisAutoPauseThresholdThousands * 1000,
|
||||||
triUsage, config.AutoPausePlayersWithPreferredPermissionsExceedingThresholds, isPrefPerm))
|
triUsage, config.AutoPausePlayersWithPreferredPermissionsExceedingThresholds, isPrefPerm))
|
||||||
{
|
{
|
||||||
var message = $"Player {pair.PlayerName} ({pair.UserData.AliasOrUID}) exceeded your configured triangle auto pause threshold (" +
|
var message = $"Player {pair.PlayerName} ({pair.UserData.AliasOrUID}) exceeded your configured triangle auto pause threshold and has been automatically paused\n" +
|
||||||
$"{triUsage}/{config.TrisAutoPauseThresholdThousands * 1000} triangles)" +
|
$"{triUsage}/{config.TrisAutoPauseThresholdThousands * 1000} triangles";
|
||||||
$" and has been automatically paused.";
|
|
||||||
|
|
||||||
_mediator.Publish(new PerformanceNotificationMessage(
|
_mediator.Publish(new PerformanceNotificationMessage(
|
||||||
$"{pair.PlayerName} ({pair.UserData.AliasOrUID}) automatically paused",
|
$"{pair.PlayerName} ({pair.UserData.AliasOrUID}) automatically paused",
|
||||||
@@ -223,9 +221,8 @@ public class PlayerPerformanceService
|
|||||||
if (CheckForThreshold(config.AutoPausePlayersExceedingThresholds, config.VRAMSizeAutoPauseThresholdMiB * 1024 * 1024,
|
if (CheckForThreshold(config.AutoPausePlayersExceedingThresholds, config.VRAMSizeAutoPauseThresholdMiB * 1024 * 1024,
|
||||||
vramUsage, config.AutoPausePlayersWithPreferredPermissionsExceedingThresholds, isPrefPerm))
|
vramUsage, config.AutoPausePlayersWithPreferredPermissionsExceedingThresholds, isPrefPerm))
|
||||||
{
|
{
|
||||||
var message = $"Player {pair.PlayerName} ({pair.UserData.AliasOrUID}) exceeded your configured VRAM auto pause threshold (" +
|
var message = $"Player {pair.PlayerName} ({pair.UserData.AliasOrUID}) exceeded your configured VRAM auto pause threshold and has been automatically paused\n" +
|
||||||
$"{UiSharedService.ByteToString(vramUsage, addSuffix: true)}/{config.VRAMSizeAutoPauseThresholdMiB}MiB)" +
|
$"{UiSharedService.ByteToString(vramUsage, addSuffix: true)}/{config.VRAMSizeAutoPauseThresholdMiB}MiB";
|
||||||
$" and has been automatically paused.";
|
|
||||||
|
|
||||||
_mediator.Publish(new PerformanceNotificationMessage(
|
_mediator.Publish(new PerformanceNotificationMessage(
|
||||||
$"{pair.PlayerName} ({pair.UserData.AliasOrUID}) automatically paused",
|
$"{pair.PlayerName} ({pair.UserData.AliasOrUID}) automatically paused",
|
||||||
|
|||||||
@@ -3661,7 +3661,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
|
|||||||
var testUserData = new UserData("TEST123", "TestUser", false, false, false, null, null);
|
var testUserData = new UserData("TEST123", "TestUser", false, false, false, null, null);
|
||||||
Mediator.Publish(new PerformanceNotificationMessage(
|
Mediator.Publish(new PerformanceNotificationMessage(
|
||||||
"Test Player (TestUser) exceeds performance threshold(s)",
|
"Test Player (TestUser) exceeds performance threshold(s)",
|
||||||
"Player Test Player (TestUser) exceeds your configured VRAM warning threshold (500 MB/300 MB).",
|
"Player Test Player (TestUser) exceeds your configured VRAM warning threshold\n500 MB/300 MB",
|
||||||
testUserData,
|
testUserData,
|
||||||
false,
|
false,
|
||||||
"Test Player"
|
"Test Player"
|
||||||
|
|||||||
@@ -196,82 +196,6 @@ public class TopTabMenu
|
|||||||
|
|
||||||
if (TabSelection != SelectedTab.None) ImGuiHelpers.ScaledDummy(3f);
|
if (TabSelection != SelectedTab.None) ImGuiHelpers.ScaledDummy(3f);
|
||||||
|
|
||||||
#if DEBUG
|
|
||||||
if (ImGui.Button("Test Pair Request"))
|
|
||||||
{
|
|
||||||
_lightlessNotificationService.ShowPairRequestNotification(
|
|
||||||
"Debug User",
|
|
||||||
"debug-user-id",
|
|
||||||
onAccept: () =>
|
|
||||||
{
|
|
||||||
_lightlessMediator.Publish(new NotificationMessage(
|
|
||||||
"Pair Accepted",
|
|
||||||
"Debug pair request was accepted!",
|
|
||||||
NotificationType.Info,
|
|
||||||
TimeSpan.FromSeconds(3)));
|
|
||||||
},
|
|
||||||
onDecline: () =>
|
|
||||||
{
|
|
||||||
_lightlessMediator.Publish(new NotificationMessage(
|
|
||||||
"Pair Declined",
|
|
||||||
"Debug pair request was declined.",
|
|
||||||
NotificationType.Warning,
|
|
||||||
TimeSpan.FromSeconds(3)));
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.SameLine();
|
|
||||||
if (ImGui.Button("Test Info"))
|
|
||||||
{
|
|
||||||
_lightlessMediator.Publish(new NotificationMessage(
|
|
||||||
"Information",
|
|
||||||
"This is a test ifno notification with some longer text to see how it wraps. This is a test ifno notification with some longer text to see how it wraps. This is a test ifno notification with some longer text to see how it wraps. This is a test ifno notification with some longer text to see how it wraps.",
|
|
||||||
NotificationType.Info,
|
|
||||||
TimeSpan.FromSeconds(5)));
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.SameLine();
|
|
||||||
if (ImGui.Button("Test Warning"))
|
|
||||||
{
|
|
||||||
_lightlessMediator.Publish(new NotificationMessage(
|
|
||||||
"Warning",
|
|
||||||
"This is a test warning notification.",
|
|
||||||
NotificationType.Warning,
|
|
||||||
TimeSpan.FromSeconds(7)));
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.SameLine();
|
|
||||||
if (ImGui.Button("Test Error"))
|
|
||||||
{
|
|
||||||
_lightlessMediator.Publish(new NotificationMessage(
|
|
||||||
"Error",
|
|
||||||
"This is a test error notification erp police",
|
|
||||||
NotificationType.Error,
|
|
||||||
TimeSpan.FromSeconds(10)));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ImGui.Button("Test Download Progress"))
|
|
||||||
{
|
|
||||||
var downloadStatus = new List<(string playerName, float progress, string status)>
|
|
||||||
{
|
|
||||||
("Mauwmauw Nekochan", 0.85f, "downloading"),
|
|
||||||
("Raelynn Kitsune", 0.34f, "downloading"),
|
|
||||||
("Jaina Elraeth", 0.67f, "downloading"),
|
|
||||||
("Vaelstra Bloodthorn", 0.19f, "downloading"),
|
|
||||||
("Lydia Hera Moondrop", 0.86f, "downloading"),
|
|
||||||
("C'liina Star", 1.0f, "completed")
|
|
||||||
};
|
|
||||||
|
|
||||||
_lightlessNotificationService.ShowPairDownloadNotification(downloadStatus);
|
|
||||||
}
|
|
||||||
ImGui.SameLine();
|
|
||||||
if (ImGui.Button("Dismiss Download"))
|
|
||||||
{
|
|
||||||
_lightlessNotificationService.DismissPairDownloadNotification();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
DrawIncomingPairRequests(availableWidth);
|
DrawIncomingPairRequests(availableWidth);
|
||||||
|
|
||||||
ImGui.Separator();
|
ImGui.Separator();
|
||||||
|
|||||||
Reference in New Issue
Block a user