curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 18:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

bringing other memory info back

Browse Source 
Former-commit-id: a189dc26e906a6cfd85ca68b4db849426c48ce52
Former-commit-id: 267e95f7d52c126b5d3787358477fc29fb50ad8e
This commit is contained in:
Song Minjae
2017-01-31 01:10:18 +09:00
parent 2f7eaea6b8
commit 2c9906888b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/torvald/terrarum/StateInGame.kt
View File

@@ -300,8 +300,9 @@ constructor() : BasicGameState() {
private fun setAppTitle() { private fun setAppTitle() {
Terrarum.appgc.setTitle( Terrarum.appgc.setTitle(
Terrarum.NAME + Terrarum.NAME +
" — F: ${Terrarum.appgc.fps} (${Terrarum.TARGET_INTERNAL_FPS})") " — F: ${Terrarum.appgc.fps} (${Terrarum.TARGET_INTERNAL_FPS})" +
//" — M: ${Terrarum.memInUse}M / ${Terrarum.memTotal}M / ${Terrarum.memXmx}M") " — M: ${Terrarum.memInUse}M / ${Terrarum.memTotal}M / ${Terrarum.memXmx}M"
)
} }
override fun render(gc: GameContainer, sbg: StateBasedGame, gwin: Graphics) { override fun render(gc: GameContainer, sbg: StateBasedGame, gwin: Graphics) {

7
src/net/torvald/terrarum/StateNoiseTester.kt
View File

@@ -197,8 +197,11 @@ class StateNoiseTester : BasicGameState() {
} }
override fun update(gc: GameContainer, sbg: StateBasedGame, delta: Int) { override fun update(gc: GameContainer, sbg: StateBasedGame, delta: Int) {
Terrarum.appgc.setTitle("${Terrarum.NAME} — F: ${Terrarum.appgc.fps}" Terrarum.appgc.setTitle(
+ " — M: ${Terrarum.memInUse}M / ${Terrarum.totalVMMem}M") 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 if (ThreadParallel.allFinished()) generating = false