From bb8fc25d14a341d66d9999d233a12720fff4f8fe Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 1 Nov 2017 15:46:09 +0900 Subject: [PATCH] hacked the titlescreen to fix resize-related UI shit --- src/net/torvald/terrarum/TitleScreen.kt | 5 ++++- .../torvald/terrarum/ui/UIItemInventoryDynamicList.kt | 4 ++-- .../terrarum/ui/UIItemInventoryEquippedView.kt | 4 ++-- .../terrarum/worlddrawer/LightmapRendererNew.kt | 11 +++++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt index 0afc790a7..408a53a20 100644 --- a/src/net/torvald/terrarum/TitleScreen.kt +++ b/src/net/torvald/terrarum/TitleScreen.kt @@ -369,7 +369,10 @@ class TitleScreen(val batch: SpriteBatch) : Screen { if (loadDone) { // resize UI by re-creating it (!!) uiMenu.resize(Terrarum.WIDTH, Terrarum.HEIGHT) - uiMenu.setPosition(0, UITitleRemoConRoot.menubarOffY) + //uiMenu.setPosition(0, UITitleRemoConRoot.menubarOffY) + uiMenu.setPosition(0, 0) // shitty hack. Could be: + // 1: Init code and resize code are different + // 2: The UI is coded shit } if (lightmapInitialised) { diff --git a/src/net/torvald/terrarum/ui/UIItemInventoryDynamicList.kt b/src/net/torvald/terrarum/ui/UIItemInventoryDynamicList.kt index a1a2e3fd4..56ee45315 100644 --- a/src/net/torvald/terrarum/ui/UIItemInventoryDynamicList.kt +++ b/src/net/torvald/terrarum/ui/UIItemInventoryDynamicList.kt @@ -82,7 +82,7 @@ class UIItemInventoryDynamicList( itemImage = null, mouseoverBackCol = Color(0x282828_ff), mouseoverBackBlendMode = BlendMode.SCREEN, - backCol = Color(0x303030_58), + backCol = Color(0x404040_88), backBlendMode = BlendMode.NORMAL, drawBackOnNull = true, inactiveTextCol = defaultTextColour @@ -98,7 +98,7 @@ class UIItemInventoryDynamicList( itemImage = null, mouseoverBackCol = Color(0x282828_ff), mouseoverBackBlendMode = BlendMode.SCREEN, - backCol = Color(0x303030_58), + backCol = Color(0x404040_88), backBlendMode = BlendMode.NORMAL, drawBackOnNull = true, inactiveTextCol = defaultTextColour diff --git a/src/net/torvald/terrarum/ui/UIItemInventoryEquippedView.kt b/src/net/torvald/terrarum/ui/UIItemInventoryEquippedView.kt index 8a8b475ab..ae731ad87 100644 --- a/src/net/torvald/terrarum/ui/UIItemInventoryEquippedView.kt +++ b/src/net/torvald/terrarum/ui/UIItemInventoryEquippedView.kt @@ -38,7 +38,7 @@ class UIItemInventoryEquippedView( lateinit var inventorySortList: Array private var rebuildList = true - val spriteViewBackCol: Color; get() = Color(0x303030_58.toInt())//Color(0xd4d4d4_ff.toInt()) + val spriteViewBackCol: Color; get() = Color(0x404040_88.toInt())//Color(0xd4d4d4_ff.toInt()) private val itemGrid = Array( 2 * 5, { @@ -51,7 +51,7 @@ class UIItemInventoryEquippedView( itemImage = null, mouseoverBackCol = Color(0x282828_ff), mouseoverBackBlendMode = BlendMode.SCREEN, - backCol = Color(0x303030_58), + backCol = Color(0x404040_88), backBlendMode = BlendMode.NORMAL, drawBackOnNull = true ) diff --git a/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt b/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt index 30c737d71..e3384c2b9 100644 --- a/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt +++ b/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt @@ -674,10 +674,13 @@ object LightmapRenderer { // excluiding overscans; only reckon echo lights for (y in overscan_open..render_height + overscan_open + 1) { for (x in overscan_open..render_width + overscan_open + 1) { - val colour = lightmap[y][x] - reds [minOf(CHANNEL_MAX, colour.r.times(MUL).floorInt())] += 1 - greens[minOf(CHANNEL_MAX, colour.g.times(MUL).floorInt())] += 1 - blues [minOf(CHANNEL_MAX, colour.b.times(MUL).floorInt())] += 1 + try { + val colour = lightmap[y][x] + reds[minOf(CHANNEL_MAX, colour.r.times(MUL).floorInt())] += 1 + greens[minOf(CHANNEL_MAX, colour.g.times(MUL).floorInt())] += 1 + blues[minOf(CHANNEL_MAX, colour.b.times(MUL).floorInt())] += 1 + } + catch (e: ArrayIndexOutOfBoundsException) { } } } return Histogram(reds, greens, blues)