curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

some colour constants moved to the Toolkit.Theme

Browse Source
This commit is contained in:
minjaesong
2021-10-21 09:45:45 +09:00
parent 6cc6a86208
commit 22da01eea0
16 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -348,7 +348,7 @@ class TitleScreen(batch: SpriteBatch) : IngameInstance(batch) {
Toolkit.drawCentered(batch, warning32bitJavaIcon, yoff)
for (i in 0..2) {
val text = Lang.get("GAME_32BIT_WARNING${i+1}", (i != 2))
if (i == 2) batch.color = UIItemTextButton.defaultHighlightCol
if (i == 2) batch.color = Toolkit.Theme.COL_HIGHLIGHT
App.fontGame.draw(batch, text, ((drawWidth - App.fontGame.getWidth(text)) / 2).toFloat(), yoff + imgTxtGap + 64f + linegap + i*(20+linegap))
}
}

2
src/net/torvald/terrarum/UIItemInventoryCatBar.kt
View File

@@ -107,7 +107,7 @@ class UIItemInventoryCatBar(
initialX = iconPosX,
initialY = posY + iconPosY,
inactiveCol = if (index == 0 || index == 3) Color.WHITE else Color(0xffffff7f.toInt()),
activeCol = if (index == 0 || index == 3) Color(0xfff066_ff.toInt()) else Color(0xffffff7f.toInt()),
activeCol = if (index == 0 || index == 3) Toolkit.Theme.COL_ACTIVE else Color(0xffffff7f.toInt()),
highlightable = (index == 0 || index == 3)
)
}

11
src/net/torvald/terrarum/UIItemInventoryElemSimple.kt
View File

@@ -9,9 +9,8 @@ import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellBase
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.Toolkit.DEFAULT_BOX_BORDER_COL
import net.torvald.terrarum.ui.Toolkit.Theme.COL_INVENTORY_CELL_BORDER
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UIItemTextButton
import kotlin.math.roundToInt
/**
@@ -24,13 +23,13 @@ class UIItemInventoryElemSimple(
override var item: GameItem?,
override var amount: Int,
override var itemImage: TextureRegion?,
val mouseOverTextCol: Color = Color(0xfff066_ff.toInt()),
val mouseOverTextCol: Color = Toolkit.Theme.COL_ACTIVE,
val mouseoverBackCol: Color = Color(0),
val mouseoverBackBlendMode: String = BlendMode.NORMAL,
val inactiveTextCol: Color = UIItemTextButton.defaultInactiveCol,
val inactiveTextCol: Color = Toolkit.Theme.COL_LIST_DEFAULT,
val backCol: Color = Color(0),
val backBlendMode: String = BlendMode.NORMAL,
val highlightCol: Color = UIItemTextButton.defaultHighlightCol,
val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT,
override var quickslot: Int? = null,
override var equippedSlot: Int? = null,
val drawBackOnNull: Boolean = true,
@@ -69,7 +68,7 @@ class UIItemInventoryElemSimple(
}
Toolkit.fillArea(batch, posX, posY, width, height)
}
batch.color = DEFAULT_BOX_BORDER_COL
batch.color = COL_INVENTORY_CELL_BORDER
//blendNormal(batch)
Toolkit.drawBoxBorder(batch, posX, posY, width, height)

9
src/net/torvald/terrarum/UIItemInventoryElemWide.kt
View File

@@ -10,9 +10,8 @@ import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellBase
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.Toolkit.DEFAULT_BOX_BORDER_COL
import net.torvald.terrarum.ui.Toolkit.Theme.COL_INVENTORY_CELL_BORDER
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UIItemTextButton
import kotlin.math.roundToInt
/***
@@ -28,10 +27,10 @@ class UIItemInventoryElemWide(
override var item: GameItem?,
override var amount: Int,
override var itemImage: TextureRegion?,
val mouseOverTextCol: Color = Color(0xfff066_ff.toInt()),
val mouseOverTextCol: Color = Toolkit.Theme.COL_ACTIVE,
val mouseoverBackCol: Color = Color(0),
val mouseoverBackBlendMode: String = BlendMode.NORMAL,
val inactiveTextCol: Color = UIItemTextButton.defaultInactiveCol,
val inactiveTextCol: Color = Toolkit.Theme.COL_LIST_DEFAULT,
val backCol: Color = Color(0),
val backBlendMode: String = BlendMode.NORMAL,
override var quickslot: Int? = null,
@@ -88,7 +87,7 @@ class UIItemInventoryElemWide(
}
Toolkit.fillArea(batch, posX, posY, width, height)
}
batch.color = DEFAULT_BOX_BORDER_COL
batch.color = COL_INVENTORY_CELL_BORDER
//blendNormal(batch)
Toolkit.drawBoxBorder(batch, posX, posY, width, height)

2
src/net/torvald/terrarum/modulebasegame/ui/GraphicsControlPanel.kt
View File

@@ -78,7 +78,7 @@ class GraphicsControlPanel(val remoCon: UIRemoCon) : UICanvas() {
batch.color = Color(0x00f8ff_40)
Toolkit.fillArea(batch, xstart + 1, 1, App.scr.chatWidth - 2, App.scr.height - 2)
batch.color = UIItemTextButton.defaultActiveCol
batch.color = Toolkit.Theme.COL_ACTIVE
Toolkit.drawBoxBorder(batch, xstart + 1, 1, App.scr.chatWidth - 2, App.scr.height - 2)
val overlayResTxt = "${App.scr.chatWidth}$TIMES${App.scr.height}"
App.fontGame.draw(batch, overlayResTxt,

2
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
View File

@@ -34,7 +34,7 @@ class UIInventoryFull(
override var openCloseTime: Second = 0.0f
companion object {
val CELL_COL = Color(0x28282888)
val CELL_COL = Toolkit.Theme.COL_CELL_FILL
const val INVEN_DEBUG_MODE = false

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

@@ -11,7 +11,7 @@ import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.itemList
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryItemGrid.Companion.createInvCellGenericKeyDownFun
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryItemGrid.Companion.createInvCellGenericTouchDownFun
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.Toolkit.DEFAULT_BOX_BORDER_COL
import net.torvald.terrarum.ui.Toolkit.Theme.COL_INVENTORY_CELL_BORDER
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UIItem
@@ -82,7 +82,7 @@ class UIItemInventoryEquippedView(
blendNormal(batch)
batch.color = spriteViewBackCol
Toolkit.fillArea(batch, posX, posY, width, width)
batch.color = DEFAULT_BOX_BORDER_COL
batch.color = COL_INVENTORY_CELL_BORDER
Toolkit.drawBoxBorder(batch, posX, posY, width, width)

8
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt
View File

@@ -16,10 +16,10 @@ import net.torvald.terrarum.modulebasegame.gameactors.InventoryPair
import net.torvald.terrarum.modulebasegame.ui.ItemSlotImageFactory.CELLCOLOUR_BLACK_ACTIVE
import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.CELL_COL
import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVEN_DEBUG_MODE
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UIItem
import net.torvald.terrarum.ui.UIItemImageButton
import net.torvald.terrarum.ui.UIItemTextButton.Companion.defaultActiveCol
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import kotlin.math.floor
@@ -239,7 +239,7 @@ class UIItemInventoryItemGrid(
activeBackCol = Color(0),
highlightBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL,
activeCol = defaultActiveCol,
activeCol = Toolkit.Theme.COL_ACTIVE,
initialX = iconPosX,
initialY = getIconPosY(index),
highlightable = true
@@ -252,7 +252,7 @@ class UIItemInventoryItemGrid(
backgroundCol = Color(0),
activeBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL,
activeCol = defaultActiveCol,
activeCol = Toolkit.Theme.COL_ACTIVE,
initialX = iconPosX,
initialY = getIconPosY(2),
highlightable = false
@@ -264,7 +264,7 @@ class UIItemInventoryItemGrid(
backgroundCol = Color(0),
activeBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL,
activeCol = defaultActiveCol,
activeCol = Toolkit.Theme.COL_ACTIVE,
initialX = iconPosX,
initialY = getIconPosY(3),
highlightable = false

11
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt
View File

@@ -44,9 +44,6 @@ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() {
private val threeu = 84
private val spaceu = 188
private val borderNormal = Color(0xFFFFFF80.toInt())
private val fillCol = Color(0x80)
private val keycaps = hashMapOf(
Input.Keys.GRAVE to UIItemKeycap(this, 1, 1, null, oneu, ""),
Input.Keys.NUM_1 to UIItemKeycap(this, 33,1, Input.Keys.NUM_1, oneu, "1,3"),
@@ -286,11 +283,11 @@ class UIItemKeycap(
private val borderKeyForbidden = Color(0x000000C0)
private val borderKeyNormal = Color(0xFFFFFFAA.toInt())
private val borderMouseUp = UIItemTextButton.defaultActiveCol
private val borderKeyPressed = UIItemTextButton.defaultHighlightCol
private val borderMouseUp = Toolkit.Theme.COL_ACTIVE
private val borderKeyPressed = Toolkit.Theme.COL_HIGHLIGHT
private val borderKeyPressedAndSelected = Color(0x33FF33FF.toInt())
private val keycapFill = Color(0x28282888)
private val keycapFill = Toolkit.Theme.COL_CELL_FILL
private val keylabelCol = Color(0xFFFFFF40.toInt())
private val configuredKeyCol = Color.WHITE
@@ -346,7 +343,7 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I
private val icons = CommonResourcePool.getAsTextureRegionPack("inventory_category")
private val buttonBackground = Color(0x2C2C2CFF)
private val buttonBackground = Toolkit.Theme.COL_CELL_FILL.cpy().add(0f,0f,0f,1f)
private val iconButtons = arrayOf(
// left up right down

4
src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
View File

@@ -468,7 +468,7 @@ class UIItemPlayerCells(
internal var hasTexture = false
private set
private val litCol = UIItemTextButton.defaultActiveCol
private val litCol = Toolkit.Theme.COL_ACTIVE
private val cellCol = CELL_COL
private val defaultCol = Color.WHITE
private val hruleCol = Color(1f,1f,1f,0.35f)
@@ -645,7 +645,7 @@ class UIItemWorldCells(
hasTexture = true
}
val highlightCol = if (mouseUp) UIItemTextButton.defaultActiveCol else Color.WHITE
val highlightCol = if (mouseUp) Toolkit.Theme.COL_ACTIVE else Color.WHITE
val x = posX.toFloat()
val y = posY.toFloat()

12
src/net/torvald/terrarum/ui/Toolkit.kt
View File

@@ -22,7 +22,17 @@ import org.lwjgl.opengl.GL20
*/
object Toolkit : Disposable {
val DEFAULT_BOX_BORDER_COL = Color(1f, 1f, 1f, 0.2f)
object Theme {
val COL_INVENTORY_CELL_BORDER = Color(1f, 1f, 1f, 0.2f)
val COL_CELL_FILL = Color(0x28282888)
val COL_LIST_DEFAULT = Color.WHITE
val COL_INACTIVE = Color.LIGHT_GRAY
val COL_ACTIVE = Color(0xfff066_ff.toInt()) // yellow
val COL_HIGHLIGHT = Color(0x00f8ff_ff) // cyan
val COL_DISABLED = Color(0xaaaaaaff.toInt())
}
val shaderBlur: ShaderProgram
get() = if (IngameRenderer.isDither()) IngameRenderer.shaderBlurDither else IngameRenderer.shaderBlurRaw

6
src/net/torvald/terrarum/ui/UIItemImageButton.kt
View File

@@ -15,19 +15,19 @@ open class UIItemImageButton(
var image: TextureRegion,
/** Colour when mouse is over */
val activeCol: Color = UIItemTextButton.defaultActiveCol,
val activeCol: Color = Toolkit.Theme.COL_ACTIVE,
/** Colour when mouse is over */
val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL,
/** Colour when mouse is over */
val activeBackBlendMode: String = BlendMode.NORMAL,
/** Colour when clicked/selected */
val highlightCol: Color = UIItemTextButton.defaultHighlightCol,
val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT,
/** Colour when clicked/selected */
val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL,
/** Colour when clicked/selected */
val highlightBackBlendMode: String = BlendMode.NORMAL,
/** Colour on normal status */
val inactiveCol: Color = UIItemTextButton.defaultInactiveCol,
val inactiveCol: Color = Toolkit.Theme.COL_LIST_DEFAULT,
val backgroundCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUNDCOL,
val backgroundBlendMode: String = BlendMode.NORMAL,

6
src/net/torvald/terrarum/ui/UIItemList.kt
View File

@@ -22,13 +22,13 @@ class UIItemList<Item: UIItem>(
val defaultSelection: Int? = null, // negative: INVALID, positive: valid, null: no select
// copied directly from UIItemTextButton
val activeCol: Color = Color(0xfff066_ff.toInt()),
val activeCol: Color = Toolkit.Theme.COL_ACTIVE,
val activeBackCol: Color = Color(0),
val activeBackBlendMode: String = BlendMode.NORMAL,
val highlightCol: Color = Color(0x00f8ff_ff),
val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT,
val highlightBackCol: Color = Color(0xb0b0b0_ff.toInt()),
val highlightBackBlendMode: String = BlendMode.MULTIPLY,
val inactiveCol: Color = Color(0xc0c0c0_ff.toInt()),
val inactiveCol: Color = Toolkit.Theme.COL_INACTIVE,
val backgroundCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUNDCOL,
val backgroundBlendMode: String = BlendMode.NORMAL,
val kinematic: Boolean = false,

9
src/net/torvald/terrarum/ui/UIItemTextButton.kt
View File

@@ -23,19 +23,19 @@ open class UIItemTextButton(
val readFromLang: Boolean = false,
/** Colour when mouse is over */
val activeCol: Color = UIItemTextButton.defaultActiveCol,
val activeCol: Color = Toolkit.Theme.COL_ACTIVE,
/** Colour when mouse is over */
val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL,
/** Colour when mouse is over */
val activeBackBlendMode: String = BlendMode.NORMAL,
/** Colour when clicked/selected */
val highlightCol: Color = UIItemTextButton.defaultHighlightCol,
val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT,
/** Colour when clicked/selected */
val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL,
/** Colour when clicked/selected */
val highlightBackBlendMode: String = BlendMode.NORMAL,
/** Colour on normal status */
val inactiveCol: Color = UIItemTextButton.defaultInactiveCol,
val inactiveCol: Color = Toolkit.Theme.COL_LIST_DEFAULT,
val backgroundCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUNDCOL,
val backgroundBlendMode: String = BlendMode.NORMAL,
@@ -52,9 +52,6 @@ open class UIItemTextButton(
companion object {
val font = App.fontGame
val height = font.lineHeight.toInt()
val defaultInactiveCol = Color.WHITE
val defaultHighlightCol = Color(0x00f8ff_ff)
val defaultActiveCol = Color(0xfff066_ff.toInt())
enum class Alignment {
CENTRE, LEFT, RIGHT

8
src/net/torvald/terrarum/ui/UIItemTextButtonList.kt
View File

@@ -26,23 +26,23 @@ class UIItemTextButtonList(
val textAreaWidth: Int,
val iconSpriteSheet: TextureRegionPack? = null,
val iconSpriteSheetIndices: IntArray? = null,
val iconCol: Color = UIItemTextButton.defaultInactiveCol,
val iconCol: Color = Toolkit.Theme.COL_LIST_DEFAULT,
// copied directly from UIItemTextButton
/** Colour when mouse is over */
val activeCol: Color = UIItemTextButton.defaultActiveCol,
val activeCol: Color = Toolkit.Theme.COL_ACTIVE,
/** Colour when mouse is over */
val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL,
/** Colour when mouse is over */
val activeBackBlendMode: String = BlendMode.NORMAL,
/** Colour when clicked/selected */
val highlightCol: Color = UIItemTextButton.defaultHighlightCol,
val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT,
/** Colour when clicked/selected */
val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL,
/** Colour when clicked/selected */
val highlightBackBlendMode: String = BlendMode.NORMAL,
/** Colour on normal status */
val inactiveCol: Color = UIItemTextButton.defaultInactiveCol,
val inactiveCol: Color = Toolkit.Theme.COL_LIST_DEFAULT,
val backgroundCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUNDCOL,
val backgroundBlendMode: String = BlendMode.NORMAL,

8
src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
View File

@@ -28,9 +28,9 @@ class UIItemTextLineInput(
companion object {
val TEXTINPUT_COL_TEXT = Color.WHITE
val TEXTINPUT_COL_BORDER = UIItemTextButton.defaultActiveCol
val TEXTINPUT_COL_BORDER_INACTIVE = Color.LIGHT_GRAY
val TEXTINPUT_COL_BACKGROUND = Color(0x28282888)
val TEXTINPUT_COL_BORDER = Toolkit.Theme.COL_ACTIVE
val TEXTINPUT_COL_BORDER_INACTIVE = Toolkit.Theme.COL_INACTIVE
val TEXTINPUT_COL_BACKGROUND = Toolkit.Theme.COL_CELL_FILL
const val CURSOR_BLINK_TIME = 1f / 3f
}
@@ -48,7 +48,7 @@ class UIItemTextLineInput(
val keybuf = StringBuilder()
private var fboUpdateLatch = false
private var fboUpdateLatch = true
override fun update(delta: Float) {
super.update(delta)