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

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

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)