diff --git a/assets/graphics/gui/blur_shadow.tga b/assets/graphics/gui/blur_shadow.tga new file mode 100644 index 000000000..dc934e000 --- /dev/null +++ b/assets/graphics/gui/blur_shadow.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:025118a0124c42969dbd70d33e36f9c96cf7e78c7b20949824cb6270e32915d7 +size 36882 diff --git a/src/net/torvald/terrarum/TerrarumPostProcessor.kt b/src/net/torvald/terrarum/TerrarumPostProcessor.kt index 62e8d9cb8..4a8a04adb 100644 --- a/src/net/torvald/terrarum/TerrarumPostProcessor.kt +++ b/src/net/torvald/terrarum/TerrarumPostProcessor.kt @@ -390,9 +390,9 @@ object TerrarumPostProcessor : Disposable { val battStatus = GetBatteryStatus.get() - hasBattery = battStatus.hasBattery - isCharging = battStatus.isCharging - batteryPercentage = battStatus.percentage + hasBattery = true//battStatus.hasBattery + isCharging = true//battStatus.isCharging + batteryPercentage = 85//battStatus.percentage } private var clockH = "00" @@ -401,6 +401,8 @@ object TerrarumPostProcessor : Disposable { private var isCharging = false private var batteryPercentage = 0 + private val shadowCol = Color(1f, 1f, 1f, 0.6666667f) + private fun drawFullscreenComplications() { val tvSafeArea2H = App.scr.tvSafeActionHeight.toFloat() val dockHeight = tvSafeArea2H @@ -418,6 +420,18 @@ object TerrarumPostProcessor : Disposable { val btxoff = isCharging.toInt() * 4 batch.inUse { + + // draw blur backs + batch.color = shadowCol + Toolkit.drawBlurShadowBack(batch, wx, wy + 2, App.fontSmallNumbers.getWidth(watchStr).toFloat(), 9f) + + if (hasBattery) { + Toolkit.drawBlurShadowBack(batch, wx - watchHeight - batteryTex.tileW - App.fontSmallNumbers.getWidth(batteryPercentageStr) - 4, wy + 2, App.fontSmallNumbers.getWidth(batteryPercentageStr) + 28f, 9f) + } + + + + // draw texts batch.color = Color.WHITE App.fontSmallNumbers.draw(batch, watchStr, wx, wy) diff --git a/src/net/torvald/terrarum/ui/Toolkit.kt b/src/net/torvald/terrarum/ui/Toolkit.kt index fd885e778..252cdb0b7 100644 --- a/src/net/torvald/terrarum/ui/Toolkit.kt +++ b/src/net/torvald/terrarum/ui/Toolkit.kt @@ -59,6 +59,7 @@ object Toolkit : Disposable { private lateinit var blurWriteQuad4: Mesh // val baloonTile = TextureRegionPack("assets/graphics/gui/message_black_tileable.tga", 36, 36) + val shadowTile = TextureRegionPack("assets/graphics/gui/blur_shadow.tga", 32, 32) val textureWhiteSquare = Texture(Gdx.files.internal("assets/graphics/ortho_line_tex_2px.tga")) val textureWhiteCircle = Texture(Gdx.files.internal("assets/graphics/circle_512.tga")) @@ -312,6 +313,27 @@ object Toolkit : Disposable { drawBoxBorder(batch, x - 4, y - 4, w + 8, h + 8) } + fun drawBlurShadowBack(batch: SpriteBatch, x: Float, y: Float, w: Float, h: Float) { + val x = x - 2 + val y = y + 4 + val w = w + 4 + + // centre area + batch.draw(shadowTile.get(1, 1), x, y, w, h) + + // edges + batch.draw(shadowTile.get(1, 0), x, y - shadowTile.tileH, w, shadowTile.tileH.toFloat()) + batch.draw(shadowTile.get(1, 2), x, y + h, w, shadowTile.tileH.toFloat()) + batch.draw(shadowTile.get(0, 1), x - shadowTile.tileW, y, shadowTile.tileW.toFloat(), h) + batch.draw(shadowTile.get(2, 1), x + w, y, shadowTile.tileW.toFloat(), h) + + // corners + batch.draw(shadowTile.get(0, 0), x - shadowTile.tileW, y - shadowTile.tileH) + batch.draw(shadowTile.get(2, 0), x + w, y - shadowTile.tileH) + batch.draw(shadowTile.get(2, 2), x + w, y + h) + batch.draw(shadowTile.get(0, 2), x - shadowTile.tileW, y + h) + } + private var init = false /**