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

option and warning msg for loading script mods

Browse Source
This commit is contained in:
minjaesong
2023-11-08 13:10:42 +09:00
parent 797bad3014
commit 31b328fb48
13 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/net/torvald/terrarum/modulebasegame/ui/ControlPanelCommon.kt
View File

@@ -36,7 +36,7 @@ object ControlPanelCommon {
val optionName = optionNames.first()
val arg = args.split(',')
return if (args.equals("h1") || args.equals("p")) {
return if (args == "h1" || args == "p" || args == "emph") {
(object : UIItem(parent, x, y) {
override val width = 1
override val height = 1
@@ -201,10 +201,13 @@ object ControlPanelCommon {
else throw IllegalArgumentException(args)
}
private fun String.countLines() = this.count { it == '\n' } + 1
private val linegap = 14
private val panelgap = 20
private val rowheight = 20 + linegap
private val textLineHeight = App.fontGame.lineHeight.toInt()
private val rowheightDiff = textLineHeight - panelgap
private val h1MarginTop = 16
private val h1MarginBottom = 4
@@ -225,9 +228,11 @@ object ControlPanelCommon {
optionsYpos[index] = akku
val realRowHeight = (row[1] as () -> String).invoke().countLines() * textLineHeight - rowheightDiff
akku += when (option) {
"h1" -> rowheight + h1MarginBottom
else -> rowheight
"h1" -> realRowHeight + linegap + h1MarginBottom
else -> realRowHeight + linegap
}
}
optionsYpos[optionsYpos.lastIndex] = akku
@@ -264,20 +269,23 @@ object ControlPanelCommon {
val font = if (mode == "h1") App.fontUITitle else App.fontGame
val label = (args[1] as () -> String).invoke()
val labelWidth = font.getWidth(label)
val label = (args[1] as () -> String).invoke().lines()
val labelWidth = label.maxOf { font.getWidth(it) }
batch.color = when (mode) {
"h1" -> Toolkit.Theme.COL_MOUSE_UP
"p" -> Color.LIGHT_GRAY
"emph" -> Toolkit.Theme.COL_RED
else -> Color.WHITE
}
val xpos = if (mode == "p" || mode == "h1")
val xpos = if (mode == "p" || mode == "h1" || mode == "emph")
drawX + (width - labelWidth)/2 // centre-aligned
else
drawX + width/2 - panelgap - labelWidth // right aligned at the middle of the panel, offsetted by panelgap
drawX + width/2 - panelgap - labelWidth // right aligned at the middle of the panel, offset by panelgap
font.draw(batch, label, xpos.toFloat(), drawY + optionsYpos[index] - 2f)
label.forEachIndexed { rows, s ->
font.draw(batch, s, xpos.toFloat(), drawY + optionsYpos[index] - 2f + textLineHeight * rows)
}
// draw hrule
if (mode == "h1") {

14
src/net/torvald/terrarum/modulebasegame/ui/UIPerformanceControlPanel.kt
View File

@@ -1,19 +1,9 @@
package net.torvald.terrarum.modulebasegame.ui
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.App
import net.torvald.terrarum.CommonResourcePool
import net.torvald.terrarum.ceilToInt
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.ui.ControlPanelCommon.makeButton
import net.torvald.terrarum.ui.*
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import net.torvald.unicode.TIMES
/**
* Created by minjaesong on 2023-06-22.
@@ -32,6 +22,10 @@ class UIPerformanceControlPanel(remoCon: UIRemoCon?) : UICanvas() {
arrayOf("", { Lang["MENU_LABEL_GRAPHICS"] }, "h1"),
arrayOf("atlastexsize", { Lang["MENU_OPTIONS_ATLAS_TEXTURE_SIZE"] }, "spinnersel,1024,2048,4096,8192"),
arrayOf("lightpasses", { Lang["MENU_OPTIONS_LIGHT_UPDATE_PASSES"] }, "spinner,2,4,1"),
arrayOf("", { Lang["MENU_MODULES"] }, "h1"),
arrayOf("enablescriptmods", { Lang["MENU_OPTIONS_ENABLE_SCRIPT_MODS"] }, "toggle"),
arrayOf("", { "(${Lang["MENU_LABEL_RESTART_REQUIRED"]})" }, "p"),
arrayOf("", { "${Lang["MENU_LABEL_WARN_ACE"]}" }, "emph"),
arrayOf("", { Lang["MENU_LABEL_JVM_DNT"] }, "h1"),
arrayOf("jvm_xmx", { Lang["MENU_OPTIONS_JVM_HEAP_MAX"] + " (GB)" }, "spinner,2,32,1"),
arrayOf("jvm_extra_cmd", { Lang["MENU_LABEL_EXTRA_JVM_ARGUMENTS"] }, "typein"),