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

uicanvas: updateUI/renderUI to updateImpl/renderImpl to match the naming scheme with the actor

Browse Source
This commit is contained in:
minjaesong
2024-02-12 17:28:23 +09:00
parent 5f1e63e370
commit 16c52a5e11
72 changed files with 147 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
View File

@@ -91,7 +91,7 @@ class BasicDebugInfoWindow : UICanvas() {
world = ingame?.world
}
override fun updateUI(delta: Float) {
override fun updateImpl(delta: Float) {
val player = ingame?.actorNowPlaying
val hitbox = player?.hitbox
@@ -135,7 +135,7 @@ class BasicDebugInfoWindow : UICanvas() {
private val tileCursX = 0; private val tileCursY = 4
override fun renderUI(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
TerrarumIngame.setCameraPosition(batch, App.shapeRender, camera, 0f, 0f)
// toggle show-something

4
src/net/torvald/terrarum/ui/ConsoleWindow.kt
View File

@@ -71,7 +71,7 @@ class ConsoleWindow : UICanvas() {
private val lb = ArrayList<String>()
override fun updateUI(delta: Float) {
override fun updateImpl(delta: Float) {
Terrarum.ingame?.let {
if (Authenticator.b()) {
lb.clear()
@@ -104,7 +104,7 @@ class ConsoleWindow : UICanvas() {
textinput.isEnabled = (isOpened && !isClosing)
}
override fun renderUI(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
// background
batch.color = UIColour
Toolkit.fillArea(batch, drawOffX, drawOffY, width.toFloat(), height.toFloat())

4
src/net/torvald/terrarum/ui/UIAutosaveNotifier.kt
View File

@@ -40,7 +40,7 @@ class UIAutosaveNotifier : UICanvas() {
private var normalCol = Color.WHITE
private var errorCol = Toolkit.Theme.COL_RED
override fun updateUI(delta: Float) {
override fun updateImpl(delta: Float) {
spinnerTimer += delta
while (spinnerTimer > spinnerInterval) {
spinnerFrame = (spinnerFrame + 1) % 32
@@ -56,7 +56,7 @@ class UIAutosaveNotifier : UICanvas() {
}
}
override fun renderUI(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
val spin = spinner.get(spinnerFrame % 8, spinnerFrame / 8)
val offX = App.scr.width - WIDTH - (App.scr.tvSafeGraphicsWidth * 1.25f).roundToInt().toFloat()
val offY = App.scr.height - HEIGHT - App.scr.tvSafeGraphicsHeight - 9f // +9 to align to quickslot and watch UI

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

@@ -1,11 +1,9 @@
package net.torvald.terrarum.ui
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.utils.Disposable
import net.torvald.terrarum.App
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.Second
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gamecontroller.TerrarumKeyboardEvent
@@ -145,7 +143,7 @@ abstract class UICanvas(
/** **DO NOT CALL THIS FUNCTION FOR THE ACTUAL UPDATING OF THE UI — USE update() INSTEAD**
*
* Override this for the actual update. Note that you must update uiItems by yourself. */
abstract fun updateUI(delta: Float)
abstract fun updateImpl(delta: Float)
/** **DO NOT CALL THIS FUNCTION FOR THE ACTUAL RENDERING OF THE UI — USE render() INSTEAD**
*
* Override this for the actual render. Note that you must render uiItems by yourself.
@@ -156,7 +154,7 @@ abstract class UICanvas(
* The transparency of the handler is independent of the draw, you must set the drawing color yourself
* (use handler.opacity or handler.opacityColour)
*/
abstract fun renderUI(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera)
abstract fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera)
/**
* Do not modify ui.handler.openCloseCounter here.

5
src/net/torvald/terrarum/ui/UIHandler.kt
View File

@@ -2,7 +2,6 @@ package net.torvald.terrarum.ui
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
@@ -227,7 +226,7 @@ void main() {
if (isVisible || alwaysUpdate) {
ui.updateUI(delta)
ui.updateImpl(delta)
}
if (isOpening) {
@@ -301,7 +300,7 @@ void main() {
batch.shader = shader
shader.setUniformf("opacity", opacity * parentOpacity)
ui.renderUI(frameDelta, batch, camera)
ui.renderImpl(frameDelta, batch, camera)
//ingameGraphics.flush()
batch.shader = null

7
src/net/torvald/terrarum/ui/UIItem.kt
View File

@@ -1,12 +1,9 @@
package net.torvald.terrarum.ui
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.utils.Disposable
import net.torvald.terrarum.App
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gamecontroller.TerrarumKeyboardEvent
/**
@@ -157,7 +154,7 @@ abstract class UIItem(var parentUI: UICanvas, val initialX: Int, val initialY: I
mouseOverCall?.setAsOpen()
}
mouseOverCall?.updateUI(delta)
mouseOverCall?.updateImpl(delta)
mouseUpListener.invoke(itemRelativeMouseX, itemRelativeMouseY)
}
else {
@@ -179,7 +176,7 @@ abstract class UIItem(var parentUI: UICanvas, val initialX: Int, val initialY: I
mouseOverCall?.render(frameDelta, batch, camera)
if (mouseUp) {
mouseOverCall?.renderUI(frameDelta, batch, camera)
mouseOverCall?.renderImpl(frameDelta, batch, camera)
}
// }
}

4
src/net/torvald/terrarum/ui/UINSMenu.kt
View File

@@ -172,7 +172,7 @@ class UINSMenu(
width -= poppedUIItem.ui.width
}
override fun updateUI(delta: Float) {
override fun updateImpl(delta: Float) {
/*listStack.forEach {
it.list.update(delta)
}*/ // fucking concurrent modification
@@ -186,7 +186,7 @@ class UINSMenu(
private val borderCol = Color(1f, 1f, 1f, 0.35f)
override fun renderUI(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
listStack.forEach {
// draw title bar
batch.color = titleBackCol