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

buildingmaker palette scrollbar

Browse Source
This commit is contained in:
minjaesong
2023-10-15 12:04:32 +09:00
parent 35c46d9a91
commit 1af172d354
3 changed files with 30 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/net/torvald/terrarum/modulebasegame/ui/UIBuildingMakerBlockChooser.kt
View File

@@ -7,10 +7,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.*
import net.torvald.terrarum.modulebasegame.BuildingMaker
import net.torvald.terrarum.modulebasegame.ui.ItemSlotImageFactory.CELLCOLOUR_WHITE
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UIItemImageButton
import net.torvald.terrarum.ui.UIItemTextButtonList
import net.torvald.terrarum.ui.*
import net.torvald.terrarum.ui.UIItemTextButtonList.Companion.DEFAULT_BACKGROUNDCOL
import kotlin.math.roundToInt
@@ -21,7 +18,7 @@ class UIBuildingMakerBlockChooser(val parent: BuildingMaker): UICanvas() {
companion object {
const val TILES_X = 8
const val TILES_Y = 14
const val TILES_Y = 8
const val TILESREGION_SIZE = 24
const val MENUBAR_SIZE = 72
@@ -61,7 +58,7 @@ class UIBuildingMakerBlockChooser(val parent: BuildingMaker): UICanvas() {
catch (e: NullPointerException) {
null
}) != null
}.filter { !it.hasTag("INTERNAL") }.forEachIndexed { index, prop ->
}.filter { !it.hasTag("INTERNAL") }.sortedBy { it.id }.forEachIndexed { index, prop ->
val paletteItem = UIItemImageButton(
this, ItemCodex.getItemImage(prop.id)!!,
initialX = MENUBAR_SIZE + (index % TILES_X) * TILESREGION_SIZE,
@@ -82,9 +79,22 @@ class UIBuildingMakerBlockChooser(val parent: BuildingMaker): UICanvas() {
}
}
private val scrollOverflowSize = ((palette.size - TILES_X * TILES_Y).toDouble() / TILES_X).ceilToDouble().coerceAtLeast(0.0)
private val scrollBar = UIItemVertSlider(
this, WIDTH - UIItemVertSlider.WIDTH, 0, 0.0, 0.0, scrollOverflowSize, height, SCROLLBAR_SIZE
).also {
println("scrollOverflowSize = $scrollOverflowSize")
addUIitem(it)
it.scrolledListener = { scrollX, scrollY ->
}
}
override fun updateUI(delta: Float) {
parent.tappedOnUI = true
if (!mouseOnScroll) palette.forEach { it.update(delta) }
if (!scrollBar.mouseUp) palette.forEach { it.update(delta) }
tabs.update(delta)
closeButton.update(delta)
if (closeButton.mousePushed) {
@@ -92,38 +102,9 @@ class UIBuildingMakerBlockChooser(val parent: BuildingMaker): UICanvas() {
closeGracefully()
}
// respond to click
if (Terrarum.mouseDown) {
// scroll bar
if (relativeMouseX in width - SCROLLBAR_SIZE until width && relativeMouseY in 0 until height) {
mouseOnScroll = true
}
if (mouseOnScroll) {
scrollBarPos = relativeMouseY - (scrollBarHeight / 2).roundToInt()
scrollBarPos = scrollBarPos.coerceIn(0, scrollableArea - 1)
}
}
else {
mouseOnScroll = false
}
// rebuild if necessary
val newPaletteScroll = ((scrollBarPos.toFloat() / scrollableArea) * paletteScrollMax).roundToInt()
if (paletteScroll != newPaletteScroll) {
paletteScroll = newPaletteScroll
rebuildPalette()
}
uiItems.forEach { it.update(delta) }
}
private val scrollbarBackCol = Color(0x000000_70)
private var scrollBarPos = 0
private var paletteScroll = 0
private val paletteScrollMax = 256f - 14f
private val scrollBarHeight = (HEIGHT - 16 * 14).toFloat()
private val scrollableArea = HEIGHT - scrollBarHeight.roundToInt()
private var mouseOnScroll = false
private fun closeGracefully() {
this.isVisible = false
parent.tappedOnUI = true
@@ -140,24 +121,15 @@ class UIBuildingMakerBlockChooser(val parent: BuildingMaker): UICanvas() {
batch.color = DEFAULT_BACKGROUNDCOL
Toolkit.fillArea(batch, 0, 0, width, height)
palette.forEach { it.render(batch, camera) }
// gaps between tabs and close button
batch.color = DEFAULT_BACKGROUNDCOL
Toolkit.fillArea(batch, 0f, tabs.height.toFloat(), MENUBAR_SIZE.toFloat(), height.toFloat() - (tabs.height + closeButton.height))
// scrollbar back
batch.color = DEFAULT_BACKGROUNDCOL
Toolkit.fillArea(batch, width - SCROLLBAR_SIZE.toFloat(), 0f, SCROLLBAR_SIZE.toFloat(), height.toFloat())
batch.color = scrollbarBackCol
Toolkit.fillArea(batch, width - SCROLLBAR_SIZE.toFloat(), 0f, SCROLLBAR_SIZE.toFloat(), height.toFloat())
// scrollbar
batch.color = CELLCOLOUR_WHITE
Toolkit.fillArea(batch, width - SCROLLBAR_SIZE.toFloat(), scrollBarPos.toFloat(), SCROLLBAR_SIZE.toFloat(), scrollBarHeight)
// the actual buttons
tabs.render(batch, camera)
closeButton.render(batch, camera)
uiItems.forEach { it.render(batch, camera) }
}
private var dragOriginX = 0 // relative mousepos

5
src/net/torvald/terrarum/modulebasegame/ui/UIBuildingMakerPenMenu.kt
View File

@@ -72,7 +72,10 @@ class UIBuildingMakerPenMenu(val parent: BuildingMaker): UICanvas() {
{ parent.currentPenMode = BuildingMaker.PENMODE_MARQUEE_ERASE },
{
parent.uiPalette.isVisible = true
parent.uiPalette.setPosition(Gdx.input.x - parent.uiPalette.width / 2, Gdx.input.y - parent.uiPalette.height / 2)
parent.uiPalette.setPosition(
((Gdx.input.x / App.scr.magn) - parent.uiPalette.width / 2).roundToInt(),
((Gdx.input.y / App.scr.magn) - parent.uiPalette.height / 2).roundToInt()
)
parent.uiPalette.posX = parent.uiPalette.posX.coerceIn(0, App.scr.width - parent.uiPalette.width)
parent.uiPalette.posY = parent.uiPalette.posY.coerceIn(0, App.scr.height - parent.uiPalette.height)
},

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

@@ -23,7 +23,11 @@ class UIItemVertSlider(
private val disposeTexture: Boolean = false
) : UIItem(parentUI, initialX, initialY) {
override val width = 16
companion object {
const val WIDTH = 16
}
override val width = WIDTH
private var mouseOnHandle = false
private val handleTravelDist = height - handleHeight