inventory gamemenu visual only

2026-06-10 18:44:05 +09:00 · 2019-01-29 23:37:38 +09:00
parent aef07149b4
commit 1475fa08dc
19 changed files with 307 additions and 52 deletions
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
@@ -6,7 +6,6 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.GL20
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
-import com.jme3.math.FastMath
 import net.torvald.terrarum.*
 import net.torvald.terrarum.gameactors.ActorWBMovable
 import net.torvald.terrarum.langpack.Lang
@@ -15,6 +14,8 @@ import net.torvald.terrarum.modulebasegame.gameactors.ActorInventory.Companion.C
 import net.torvald.terrarum.modulebasegame.gameactors.Pocketed
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.ui.UIItem
+import net.torvald.terrarum.ui.UIItemTextButtonList
+import net.torvald.terrarum.ui.UIUtils
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack

 /**
@@ -29,6 +30,8 @@ class UIInventoryFull(
        doNotWarnConstant: Boolean = false
 ) : UICanvas(toggleKeyLiteral, toggleButtonLiteral, customPositioning, doNotWarnConstant) {

+    private val debugvals = false
+    
    override var width: Int = Terrarum.WIDTH
    override var height: Int = Terrarum.HEIGHT

@@ -60,12 +63,12 @@ class UIInventoryFull(
        get() = if (AppLoader.environment == RunningEnvironment.PC)
            "${0xe031.toChar()} ${Lang["GAME_ACTION_CLOSE"]}"
        else
-            "${0xe031.toChar()} ${Lang["GAME_ACTION_CLOSE"]}$SP${0xe06b.toChar()} ${Lang["GAME_INVENTORY"]}"
+            "${0xe069.toChar()} ${Lang["GAME_ACTION_CLOSE"]}$SP${0xe06b.toChar()} ${Lang["GAME_INVENTORY"]}"
    val gameMenuControlHelp: String
        get() = if (AppLoader.environment == RunningEnvironment.PC)
            "${0xe031.toChar()} ${Lang["GAME_ACTION_CLOSE"]}"
        else
-            "${0xe031.toChar()} ${Lang["GAME_ACTION_CLOSE"]}$SP${0xe068.toChar()} ${Lang["GAME_INVENTORY"]}"
+            "${0xe069.toChar()} ${Lang["GAME_ACTION_CLOSE"]}$SP${0xe068.toChar()} ${Lang["GAME_INVENTORY"]}"
    val controlHelpHeight = Terrarum.fontGame.lineHeight

    private var encumbrancePerc = 0f
@@ -104,22 +107,41 @@ class UIInventoryFull(
                    internalWidth - UIItemInventoryEquippedView.WIDTH + (Terrarum.WIDTH - internalWidth) / 2,
                    109 + (Terrarum.HEIGHT - internalHeight) / 2
            )
+    private val gameMenuListWidth = 400
+    private val gameMenuListHeight = 40 * 5
+    private val gameMenuCharInfoHeight = 64 + 40 // no top margin, 40 bottom margin
+    private val gameMenuListTotalHeight = gameMenuListHeight + gameMenuCharInfoHeight
+    private val gameMenuButtons = UIItemTextButtonList(
+            this, arrayOf("MENU_LABEL_MAINMENU", "MENU_LABEL_DESKTOP", "MENU_OPTIONS_CONTROLS", "MENU_OPTIONS_SOUND", "MENU_LABEL_GRAPHICS"),
+            Terrarum.WIDTH + (Terrarum.WIDTH - gameMenuListWidth) / 2,
+            (itemList.height - gameMenuListTotalHeight) / 2 + itemList.posY + gameMenuCharInfoHeight,
+            gameMenuListWidth, gameMenuListHeight,
+            readFromLang = true,
+            textAreaWidth = gameMenuListWidth,
+            activeBackCol = Color(0),
+            highlightBackCol = Color(0),
+            backgroundCol = Color(0),
+            inactiveCol = Color.WHITE,
+            defaultSelection = null
+    )

+    private val SCREEN_MINIMAP = 2f
+    private val SCREEN_INVENTORY = 1f
+    private val SCREEN_MENU = 0f

-    private var currentScreen = 1f //
+    private var currentScreen = SCREEN_INVENTORY
    private var transitionRequested = false
+    private var transitionOngoing = false
+    private var transitionReqSource = SCREEN_INVENTORY
+    private var transitionReqTarget = SCREEN_INVENTORY
    private var transitionTimer = 0f
-    private val transitionLength = 0.5f
-
-    private val SCREEN_MINIMAP = 0
-    private val SCREEN_INVENTORY = 1
-    private val SCREEN_MENU = 2
+    private val transitionLength = 0.333f


    private val transitionalUpdateUIs = ArrayList<UIItem>()
    private val transitionalUpdateUIoriginalPosX = ArrayList<Int>()
-
-
+    
+    
    private fun addToTransitionalGroup(item: UIItem) {
        transitionalUpdateUIs.add(item)
        transitionalUpdateUIoriginalPosX.add(item.posX)
@@ -151,6 +173,7 @@ class UIInventoryFull(

        addToTransitionalGroup(itemList)
        addToTransitionalGroup(equipped)
+        addToTransitionalGroup(gameMenuButtons)
    }

    private var offsetX = ((Terrarum.WIDTH - internalWidth)   / 2).toFloat()
@@ -165,8 +188,9 @@ class UIInventoryFull(


        categoryBar.update(delta)
-        itemList.update(delta)
-        equipped.update(delta)
+
+        transitionalUpdateUIs.forEach { it.update(delta) }
+
    }

    private val gradStartCol = Color(0x404040_60)
@@ -179,13 +203,41 @@ class UIInventoryFull(
    private var xEnd = (Terrarum.WIDTH + internalWidth).div(2).toFloat()
    private var yEnd = (Terrarum.HEIGHT + internalHeight).div(2).toFloat()

+    fun requestTransition(target: Int) {
+        if (!transitionOngoing) {
+            transitionRequested = true
+            transitionReqSource = currentScreen.round()
+            transitionReqTarget = target.toFloat()
+        }
+    }
+
    override fun renderUI(batch: SpriteBatch, camera: Camera) {

-        currentScreen = 1f + 0.1f * FastMath.sin(transitionTimer)
-        transitionTimer += Gdx.graphics.deltaTime
+        if (transitionRequested && !transitionOngoing) {
+            transitionRequested = false
+            transitionOngoing = true
+            transitionTimer = 0f
+        }
+
+        if (transitionOngoing) {
+            transitionTimer += Gdx.graphics.deltaTime
+
+            currentScreen = UIUtils.moveQuick(transitionReqSource, transitionReqTarget, transitionTimer, transitionLength)
+
+            if (transitionTimer > transitionLength) {
+                transitionOngoing = false
+                currentScreen = transitionReqTarget
+            }
+        }
+
+

        // update at render time
        updateTransitionalItems()
+        if (debugvals) {
+            batch.color = Color.WHITE
+            AppLoader.fontSmallNumbers.draw(batch, "screen:$currentScreen", 500f, 20f)
+        }



@@ -213,16 +265,83 @@ class UIInventoryFull(
        categoryBar.render(batch, camera)


-        renderScreenInventory(batch, camera)
+        if (currentScreen > 1f + epsilon) {
+            renderScreenMinimap(batch, camera)
+
+            if (debugvals) {
+                batch.color = Color.CORAL
+                AppLoader.fontSmallNumbers.draw(batch, "Map", 300f, 10f)
+            }
+        }
+
+        if (currentScreen in epsilon..2f - epsilon) {
+            renderScreenInventory(batch, camera)
+
+            if (debugvals) {
+                batch.color = Color.CHARTREUSE
+                AppLoader.fontSmallNumbers.draw(batch, "Inv", 350f, 10f)
+            }
+        }
+
+        if (currentScreen < 1f - epsilon) {
+            renderScreenGamemenu(batch, camera)
+
+            if (debugvals) {
+                batch.color = Color.SKY
+                AppLoader.fontSmallNumbers.draw(batch, "Men", 400f, 10f)
+            }
+        }
+
+        if (debugvals) {
+            batch.color = Color.WHITE
+            AppLoader.fontSmallNumbers.draw(batch, "inventoryScrOffX:$inventoryScrOffX", 500f, 10f)
+        }
+
+
    }

+    private val epsilon = 0.001f
+
    private val minimapScrOffX: Float
-        get() = (currentScreen + 1f) * Terrarum.WIDTH
+        get() = (currentScreen - 2f) * Terrarum.WIDTH
+    /**
+     * - 0 on inventory screen
+     * - +WIDTH on minimap screen
+     * - -WIDTH on gamemenu screen
+     */
    private val inventoryScrOffX: Float
        get() = (currentScreen - 1f) * Terrarum.WIDTH
    private val menuScrOffX: Float
        get() = (currentScreen) * Terrarum.WIDTH

+    private fun renderScreenMinimap(batch: SpriteBatch, camera: Camera) {
+        // control hints
+        blendNormal(batch)
+        batch.color = Color.WHITE
+        Terrarum.fontGame.draw(batch, minimapControlHelp, offsetX + minimapScrOffX, yEnd - 20)
+    }
+
+    private fun renderScreenGamemenu(batch: SpriteBatch, camera: Camera) {
+        // control hints
+        blendNormal(batch)
+        batch.color = Color.WHITE
+        Terrarum.fontGame.draw(batch, gameMenuControlHelp, offsetX + menuScrOffX, yEnd - 20)
+
+        // text buttons
+        gameMenuButtons.render(batch, camera)
+
+        // character info window
+
+        // !! DUMMY !!
+        batch.color = itemList.backColour
+        batch.fillRect(
+                ((Terrarum.WIDTH - 400) / 2) + menuScrOffX,
+                (itemList.height - gameMenuListTotalHeight) / 2 + itemList.posY.toFloat(),
+                gameMenuListWidth.toFloat(),
+                64f
+        )
+    }
+
    private fun renderScreenInventory(batch: SpriteBatch, camera: Camera) {
        itemList.render(batch, camera)
        equipped.render(batch, camera)
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt
@@ -32,8 +32,14 @@ class UIItemInventoryDynamicList(
        override var posY: Int
 ) : UIItem(parentUI) {

-    override val width  = 496
-    override val height = 384
+    // deal with the moving position
+    override var oldPosX = posX
+    override var oldPosY = posY
+
+    override val width  = WIDTH
+    override val height = HEIGHT
+
+    val backColour = Color(0x404040_88)

    private val catArrangement = parentUI.catArrangement

@@ -94,7 +100,7 @@ class UIItemInventoryDynamicList(
                itemImage = null,
                mouseoverBackCol = Color(0x282828_ff),
                mouseoverBackBlendMode = BlendMode.SCREEN,
-                backCol = Color(0x404040_88),
+                backCol = backColour,
                backBlendMode = BlendMode.NORMAL,
                drawBackOnNull = true,
                inactiveTextCol = defaultTextColour
@@ -111,7 +117,7 @@ class UIItemInventoryDynamicList(
                itemImage = null,
                mouseoverBackCol = Color(0x282828_ff),
                mouseoverBackBlendMode = BlendMode.SCREEN,
-                backCol = Color(0x404040_88),
+                backCol = backColour,
                backBlendMode = BlendMode.NORMAL,
                drawBackOnNull = true,
                inactiveTextCol = defaultTextColour
@@ -165,9 +171,6 @@ class UIItemInventoryDynamicList(
            highlightable = false
    )

-    // deal with the moving position
-    private var oldPosX = posX
-
    fun scrollItemPage(relativeAmount: Int) {
        itemPage = if (itemPageCount == 0) 0 else (itemPage + relativeAmount).fmod(itemPageCount)
    }
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryEquippedView.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryEquippedView.kt
@@ -63,7 +63,8 @@ class UIItemInventoryEquippedView(
    private val spriteDrawCol = Color(0xddddddff.toInt())

    // deal with the moving position
-    private var oldPosX = posX
+    override var oldPosX = posX
+    override var oldPosY = posY

    override fun render(batch: SpriteBatch, camera: Camera) {
        val posXDelta = posX - oldPosX
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemModuleInfoCell.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemModuleInfoCell.kt
@@ -18,6 +18,10 @@ class UIItemModuleInfoCell(
        override var posY: Int
 ) : UIItem(parent) {

+    // deal with the moving position
+    override var oldPosX = posX
+    override var oldPosY = posY
+
    override val height: Int = Terrarum.fontGame.lineHeight.toInt() * 2

    private val numberAreaWidth = Terrarum.fontSmallNumbers.W * 3 + 4
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemSavegameInfoCell.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemSavegameInfoCell.kt
@@ -20,6 +20,10 @@ class UIItemSavegameInfoCell(
        override var posY: Int
 ) : UIItem(parent) {

+    // deal with the moving position
+    override var oldPosX = posX
+    override var oldPosY = posY
+
    override val height: Int = Terrarum.fontGame.lineHeight.toInt() * 2

    override fun render(batch: SpriteBatch, camera: Camera) {