From 8ef3c282cebc867f39b21880ed27d822146174d0 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Tue, 31 Jan 2017 01:10:18 +0900 Subject: [PATCH] bringing other memory info back Former-commit-id: a189dc26e906a6cfd85ca68b4db849426c48ce52 Former-commit-id: 267e95f7d52c126b5d3787358477fc29fb50ad8e --- src/net/torvald/terrarum/StateInGame.kt | 5 +++-- src/net/torvald/terrarum/StateNoiseTester.kt | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index bd8c6578f..e72f4c869 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -300,8 +300,9 @@ constructor() : BasicGameState() { private fun setAppTitle() { Terrarum.appgc.setTitle( Terrarum.NAME + - " — F: ${Terrarum.appgc.fps} (${Terrarum.TARGET_INTERNAL_FPS})") - //" — M: ${Terrarum.memInUse}M / ${Terrarum.memTotal}M / ${Terrarum.memXmx}M") + " — F: ${Terrarum.appgc.fps} (${Terrarum.TARGET_INTERNAL_FPS})" + + " — M: ${Terrarum.memInUse}M / ${Terrarum.memTotal}M / ${Terrarum.memXmx}M" + ) } override fun render(gc: GameContainer, sbg: StateBasedGame, gwin: Graphics) { diff --git a/src/net/torvald/terrarum/StateNoiseTester.kt b/src/net/torvald/terrarum/StateNoiseTester.kt index ab2153c4c..e4d8a08d1 100644 --- a/src/net/torvald/terrarum/StateNoiseTester.kt +++ b/src/net/torvald/terrarum/StateNoiseTester.kt @@ -197,8 +197,11 @@ class StateNoiseTester : BasicGameState() { } override fun update(gc: GameContainer, sbg: StateBasedGame, delta: Int) { - Terrarum.appgc.setTitle("${Terrarum.NAME} — F: ${Terrarum.appgc.fps}" - + " — M: ${Terrarum.memInUse}M / ${Terrarum.totalVMMem}M") + Terrarum.appgc.setTitle( + Terrarum.NAME + + " — F: ${Terrarum.appgc.fps} (${Terrarum.TARGET_INTERNAL_FPS})" + + " — M: ${Terrarum.memInUse}M / ${Terrarum.memTotal}M / ${Terrarum.memXmx}M" + ) if (ThreadParallel.allFinished()) generating = false