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

fix: some UIs won't fade in/out on open/close

Browse Source
This commit is contained in:
minjaesong
2023-07-03 21:35:46 +09:00
parent bad72dd353
commit 453459e3b6
6 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureHomeComputer.kt
View File

@@ -195,17 +195,10 @@ internal class UIHomeComputer : UICanvas(
}
override fun doOpening(delta: Float) {
super.doOpening(delta)
fixture.startVM()
}
override fun doClosing(delta: Float) {
}
override fun endOpening(delta: Float) {
}
override fun endClosing(delta: Float) {
}
override fun dispose() {
fbo.dispose()

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

@@ -85,6 +85,8 @@ class UIInventoryFull(
private val gsta = Color(gradStartCol)
private val gend = Color(gradEndCol)
private val drawBackgroundColourBuffer = Color(1f,1f,1f,1f)
fun drawBackground(batch: SpriteBatch, opacity: Float) {
gdxBlendNormalStraightAlpha()
/*batch.end()
@@ -118,7 +120,8 @@ class UIInventoryFull(
}
batch.begin()*/
batch.color = Color.WHITE
// drawBackgroundColourBuffer.a = opacity
batch.color = drawBackgroundColourBuffer
val w = App.scr.wf
val h = App.scr.hf
val gradTopStart = (-YPOS_CORRECTION + (App.scr.height - internalHeight).div(2).toFloat()) * App.scr.magn
@@ -312,7 +315,7 @@ class UIInventoryFull(
override fun renderUI(batch: SpriteBatch, camera: Camera) {
drawBackground(batch, handler.opacity)
drawBackground(batch, 1f)
// UI items
catBar.render(batch, camera)

6
src/net/torvald/terrarum/modulebasegame/ui/UIStorageChest.kt
View File

@@ -179,7 +179,7 @@ internal class UIStorageChest : UICanvas(
override fun renderUI(batch: SpriteBatch, camera: Camera) {
// background fill
UIInventoryFull.drawBackground(batch, handler.opacity)
UIInventoryFull.drawBackground(batch, 1f)
// UI items
batch.color = Color.WHITE
@@ -237,19 +237,23 @@ internal class UIStorageChest : UICanvas(
}
override fun doOpening(delta: Float) {
super.doOpening(delta)
INGAME.pause()
INGAME.setTooltipMessage(null)
}
override fun doClosing(delta: Float) {
super.doClosing(delta)
INGAME.resume()
INGAME.setTooltipMessage(null)
}
override fun endOpening(delta: Float) {
super.endOpening(delta)
}
override fun endClosing(delta: Float) {
super.endClosing(delta)
UIItemInventoryItemGrid.tooltipShowing.clear()
INGAME.setTooltipMessage(null) // required!
}

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

@@ -92,7 +92,7 @@ class UIWorldPortal : UICanvas(
}
override fun renderUI(batch: SpriteBatch, camera: Camera) {
drawBackground(batch, handler.opacity)
drawBackground(batch, 1f)
// UI items
transitionPanel.render(batch, camera)

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

@@ -171,7 +171,7 @@ class UIWorldPortalCargo(val full: UIWorldPortal) : UICanvas(), HasInventory {
override fun renderUI(batch: SpriteBatch, camera: Camera) {
// background fill
UIInventoryFull.drawBackground(batch, handler.opacity)
UIInventoryFull.drawBackground(batch, 1f)
// UI items
batch.color = Color.WHITE

23
src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt
View File

@@ -448,6 +448,29 @@ class UIWorldPortalListing(val full: UIWorldPortal) : UICanvas() {
}
else return false
}
override fun doOpening(delta: Float) {
super.doOpening(delta)
INGAME.pause()
INGAME.setTooltipMessage(null)
}
override fun doClosing(delta: Float) {
super.doClosing(delta)
INGAME.resume()
INGAME.setTooltipMessage(null)
}
override fun endOpening(delta: Float) {
super.endOpening(delta)
}
override fun endClosing(delta: Float) {
super.endClosing(delta)
UIItemInventoryItemGrid.tooltipShowing.clear()
INGAME.setTooltipMessage(null) // required!
}
}