diff --git a/resources/lang/en.json b/resources/lang/en.json index 8121fffa8..f543f5b62 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -853,9 +853,11 @@ "tps_avg_60s": "Avg:", "tick_exec": "Tick Exec:", "tick_delay": "Tick Delay:", - "layers_header": "Render Layers (avg / max | tick avg, sorted by total time):", + "layers_header": "Render Layers", + "render_layers_table_header": "avg / max | tick avg", "render_layers_summary": "Last tick: {frames} frames, {ms}ms", - "tick_layers_header": "Tick Layers (avg / max, sorted by total time):", + "tick_layers_header": "Tick Layers", + "tick_layers_table_header": "avg / max", "tick_layers_summary": "Last tick: {count} layers, {ms}ms" }, "heads_up_message": { diff --git a/src/client/graphics/layers/PerformanceOverlay.ts b/src/client/graphics/layers/PerformanceOverlay.ts index d30f4309c..7dfdf575e 100644 --- a/src/client/graphics/layers/PerformanceOverlay.ts +++ b/src/client/graphics/layers/PerformanceOverlay.ts @@ -281,6 +281,13 @@ export class PerformanceOverlay extends LitElement implements Layer { ); } + .layer-row.table-header { + background: none; + opacity: 0.75; + font-size: 11px; + margin-top: 4px; + } + .layer-row.inactive { opacity: 0.5; } @@ -893,33 +900,41 @@ export class PerformanceOverlay extends LitElement implements Layer { })} ${this.renderLayersExpanded - ? renderLayersToShow.map((layer) => { - const width = Math.min( - 100, - (layer.avg / maxLayerAvg) * 100 || 0, - ); - const perTickRenderMs = - this.renderLastTickLayerDurations[layer.name] ?? 0; - const perTickRenderAvgMs = - this.renderPerTickLayerStats.get(layer.name)?.avg ?? 0; - const isInactive = perTickRenderMs <= 0.01; - const title = `${layer.name} | last tick render: ${perTickRenderMs.toFixed( - 2, - )}ms`; - return html`
- ${layer.name} - + ? html`
+ - ${layer.avg.toFixed(2)} / ${layer.max.toFixed(2)}ms | - ${perTickRenderAvgMs.toFixed(2)}ms + ${translateText( + "performance_overlay.render_layers_table_header", + )} -
`; - }) +
+ ${renderLayersToShow.map((layer) => { + const width = Math.min( + 100, + (layer.avg / maxLayerAvg) * 100 || 0, + ); + const perTickRenderMs = + this.renderLastTickLayerDurations[layer.name] ?? 0; + const perTickRenderAvgMs = + this.renderPerTickLayerStats.get(layer.name)?.avg ?? 0; + const isInactive = perTickRenderMs <= 0.01; + const title = `${layer.name} | last tick render: ${perTickRenderMs.toFixed( + 2, + )}ms`; + return html`
+ ${layer.name} + + + ${layer.avg.toFixed(2)} / ${layer.max.toFixed(2)}ms | + ${perTickRenderAvgMs.toFixed(2)}ms + +
`; + })}` : html``} ` : html``} @@ -946,28 +961,36 @@ export class PerformanceOverlay extends LitElement implements Layer { })} ${this.tickLayersExpanded - ? tickLayersToShow.map((layer) => { - const width = Math.min( - 100, - (layer.avg / maxTickLayerAvg) * 100 || 0, - ); - const lastTickMs = - this.tickLayerLastDurations[layer.name] ?? 0; - const isInactive = lastTickMs <= 0.01; - const title = `${layer.name} | last tick: ${lastTickMs.toFixed(2)}ms`; - return html`
- ${layer.name} + ? html`
+ - ${layer.avg.toFixed(2)} / ${layer.max.toFixed(2)}ms + ${translateText( + "performance_overlay.tick_layers_table_header", + )} -
`; - }) +
+ ${tickLayersToShow.map((layer) => { + const width = Math.min( + 100, + (layer.avg / maxTickLayerAvg) * 100 || 0, + ); + const lastTickMs = + this.tickLayerLastDurations[layer.name] ?? 0; + const isInactive = lastTickMs <= 0.01; + const title = `${layer.name} | last tick: ${lastTickMs.toFixed(2)}ms`; + return html`
+ ${layer.name} + + ${layer.avg.toFixed(2)} / ${layer.max.toFixed(2)}ms + +
`; + })}` : html``} ` : html``}