curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-12 22:56:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

hacked the titlescreen to fix resize-related UI shit

Browse Source
This commit is contained in:
minjaesong
2017-11-01 15:46:09 +09:00
parent cec6d9c3c2
commit b892d2e70c
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,7 +369,10 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
if (loadDone) { if (loadDone) {
// resize UI by re-creating it (!!) // resize UI by re-creating it (!!)
uiMenu.resize(Terrarum.WIDTH, Terrarum.HEIGHT) 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) { if (lightmapInitialised) {

4
src/net/torvald/terrarum/ui/UIItemInventoryDynamicList.kt
View File

@@ -82,7 +82,7 @@ class UIItemInventoryDynamicList(
itemImage = null, itemImage = null,
mouseoverBackCol = Color(0x282828_ff), mouseoverBackCol = Color(0x282828_ff),
mouseoverBackBlendMode = BlendMode.SCREEN, mouseoverBackBlendMode = BlendMode.SCREEN,
backCol = Color(0x303030_58), backCol = Color(0x404040_88),
backBlendMode = BlendMode.NORMAL, backBlendMode = BlendMode.NORMAL,
drawBackOnNull = true, drawBackOnNull = true,
inactiveTextCol = defaultTextColour inactiveTextCol = defaultTextColour
@@ -98,7 +98,7 @@ class UIItemInventoryDynamicList(
itemImage = null, itemImage = null,
mouseoverBackCol = Color(0x282828_ff), mouseoverBackCol = Color(0x282828_ff),
mouseoverBackBlendMode = BlendMode.SCREEN, mouseoverBackBlendMode = BlendMode.SCREEN,
backCol = Color(0x303030_58), backCol = Color(0x404040_88),
backBlendMode = BlendMode.NORMAL, backBlendMode = BlendMode.NORMAL,
drawBackOnNull = true, drawBackOnNull = true,
inactiveTextCol = defaultTextColour inactiveTextCol = defaultTextColour

4
src/net/torvald/terrarum/ui/UIItemInventoryEquippedView.kt
View File

@@ -38,7 +38,7 @@ class UIItemInventoryEquippedView(
lateinit var inventorySortList: Array<GameItem?> lateinit var inventorySortList: Array<GameItem?>
private var rebuildList = true 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<UIItemInventoryCellBase>( private val itemGrid = Array<UIItemInventoryCellBase>(
2 * 5, { 2 * 5, {
@@ -51,7 +51,7 @@ class UIItemInventoryEquippedView(
itemImage = null, itemImage = null,
mouseoverBackCol = Color(0x282828_ff), mouseoverBackCol = Color(0x282828_ff),
mouseoverBackBlendMode = BlendMode.SCREEN, mouseoverBackBlendMode = BlendMode.SCREEN,
backCol = Color(0x303030_58), backCol = Color(0x404040_88),
backBlendMode = BlendMode.NORMAL, backBlendMode = BlendMode.NORMAL,
drawBackOnNull = true drawBackOnNull = true
) )

11
src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt
View File

@@ -674,10 +674,13 @@ object LightmapRenderer {
// excluiding overscans; only reckon echo lights // excluiding overscans; only reckon echo lights
for (y in overscan_open..render_height + overscan_open + 1) { for (y in overscan_open..render_height + overscan_open + 1) {
for (x in overscan_open..render_width + overscan_open + 1) { for (x in overscan_open..render_width + overscan_open + 1) {
val colour = lightmap[y][x] try {
reds [minOf(CHANNEL_MAX, colour.r.times(MUL).floorInt())] += 1 val colour = lightmap[y][x]
greens[minOf(CHANNEL_MAX, colour.g.times(MUL).floorInt())] += 1 reds[minOf(CHANNEL_MAX, colour.r.times(MUL).floorInt())] += 1
blues [minOf(CHANNEL_MAX, colour.b.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) return Histogram(reds, greens, blues)