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

buildingmaker import pen click latch

Browse Source
This commit is contained in:
minjaesong
2023-10-24 16:49:04 +09:00
parent a5a2c98041
commit a8b44c1cac
6 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
View File

@@ -298,7 +298,14 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
}
private var mousePrimaryClickLatched = false
var mousePrimaryJustDown = false; private set
override fun render(updateRate: Float) {
super.render(updateRate)
Gdx.graphics.setTitle(TerrarumIngame.getCanonicalTitle())
@@ -316,6 +323,11 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
)
)
if (!Gdx.input.isButtonPressed(App.getConfigInt("config_mouseprimary"))) {
mousePrimaryClickLatched = false
}
}
private var mouseOnUI = false
@@ -428,7 +440,13 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
it.title = "Export"
it.labelDo = "Export"
it.text = listOf("WH: $w\u00D7$h", "Name of the POI:")
it.confirmCallback = callback
it.confirmCallback = { s ->
callback(s)
mousePrimaryClickLatched = true
}
it.cancelCallback = {
mousePrimaryClickLatched = true
}
it.setPosition(
240,
32
@@ -443,7 +461,13 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
it.title = "Import"
it.labelDo = "Import"
it.text = listOf("Name of the POI:")
it.confirmCallback = callback
it.confirmCallback = { s ->
callback(s)
mousePrimaryClickLatched = true
}
it.cancelCallback = {
mousePrimaryClickLatched = true
}
it.setPosition(
240,
32
@@ -456,7 +480,6 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
private fun makePenWork(x: Int, y: Int) {
val world = gameWorld
val palSelection = uiPaletteSelector.fore
val mouseJustDown = Terrarum.mouseJustDown
when (currentPenMode) {
// test paint terrain layer
@@ -485,7 +508,10 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
removeBlockMarker(x, y)
}
PENMODE_IMPORT -> {
if (mouseJustDown) importPoi(x, y)
if (!mousePrimaryClickLatched) {
importPoi(x, y)
mousePrimaryClickLatched = true
}
}
}
}