mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-03-07 20:31:51 +09:00
playtime counter on top left corner
This commit is contained in:
Binary file not shown.
@@ -175,9 +175,9 @@ object TerrarumPostProcessor : Disposable {
|
||||
if (!debugUI.isClosed && !debugUI.isClosing) debugUI.setAsClose()
|
||||
}
|
||||
|
||||
if (App.scr.isFullscreen) {
|
||||
// if (App.scr.isFullscreen) {
|
||||
drawFullscreenComplications()
|
||||
}
|
||||
// }
|
||||
|
||||
// draw dev build notifiers
|
||||
// omitting this screws up HQ2X render for some reason
|
||||
@@ -393,6 +393,15 @@ object TerrarumPostProcessor : Disposable {
|
||||
hasBattery = battStatus.hasBattery
|
||||
isCharging = battStatus.isCharging
|
||||
batteryPercentage = battStatus.percentage
|
||||
|
||||
val timeNow = App.getTIME_T()
|
||||
val ptime_t = timeNow - INGAME.loadedTime_t
|
||||
|
||||
val ptimeMin = ptime_t / 60
|
||||
val ptimeHr = ptime_t / 3600
|
||||
|
||||
ptimeH = ptimeHr.toString().padStart(2,'0')
|
||||
ptimeM = ptimeMin.toString().padStart(2,'0')
|
||||
}
|
||||
|
||||
private var clockH = "00"
|
||||
@@ -401,6 +410,9 @@ object TerrarumPostProcessor : Disposable {
|
||||
private var isCharging = false
|
||||
private var batteryPercentage = 0
|
||||
|
||||
private var ptimeH = "00"
|
||||
private var ptimeM = "00"
|
||||
|
||||
private val shadowCol = Color(1f, 1f, 1f, 0.6666667f)
|
||||
|
||||
private fun drawFullscreenComplications() {
|
||||
@@ -414,6 +426,11 @@ object TerrarumPostProcessor : Disposable {
|
||||
val watchStr = "$clockH:$clockM"
|
||||
val batteryPercentageStr = "$batteryPercentage%"
|
||||
|
||||
val ptimex = (marginEach * 1.5f).ceilToFloat()
|
||||
val ptimey = wy
|
||||
val ptimew = 7*6 + 4f
|
||||
val ptimestr = "$ptimeH:$ptimeM"
|
||||
|
||||
val percIndex = (batteryPercentage.toFloat() * 0.01 * 64).toInt() // 0-63
|
||||
val btx = percIndex % 4
|
||||
val bty = percIndex / 4
|
||||
@@ -429,6 +446,8 @@ object TerrarumPostProcessor : Disposable {
|
||||
Toolkit.drawBlurShadowBack(batch, wx - watchHeight - batteryTex.tileW - App.fontSmallNumbers.getWidth(batteryPercentageStr) - 4, wy + 2, App.fontSmallNumbers.getWidth(batteryPercentageStr) + 28f, 9f)
|
||||
}
|
||||
|
||||
Toolkit.drawBlurShadowBack(batch, ptimex, ptimey + 2, ptimew, 9f)
|
||||
|
||||
|
||||
|
||||
// draw texts
|
||||
@@ -445,6 +464,10 @@ object TerrarumPostProcessor : Disposable {
|
||||
wy
|
||||
)
|
||||
}
|
||||
|
||||
App.fontSmallNumbers.draw(batch, "\u00DD", ptimex, ptimey)
|
||||
App.fontSmallNumbers.draw(batch, ptimestr, ptimex + 11, ptimey)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -580,11 +580,6 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
|
||||
ingameController.gamepad = App.gamepad
|
||||
}
|
||||
|
||||
// init console window
|
||||
// TODO test put it on the IngameInstance.(init)
|
||||
//consoleHandler = ConsoleWindow()
|
||||
//consoleHandler.setPosition(0, 0)
|
||||
|
||||
val drawWidth = Toolkit.drawWidth
|
||||
|
||||
|
||||
|
||||
@@ -105,6 +105,8 @@ class ConsoleWindow : UICanvas() {
|
||||
}
|
||||
|
||||
override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
|
||||
posY = App.scr.tvSafeActionHeight // move away from the top area
|
||||
|
||||
// background
|
||||
batch.color = UIColour
|
||||
Toolkit.fillArea(batch, drawOffX, drawOffY, width.toFloat(), height.toFloat())
|
||||
|
||||
Reference in New Issue
Block a user