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

still WIP inventory impl, held item impl

Browse Source 
Former-commit-id: 9468cfae21ff09c3dd30352a849910364e01d780
Former-commit-id: 50247ccebf3284f739877a1d6c6d8574449a9824
This commit is contained in:
Song Minjae
2016-12-14 00:28:42 +09:00
parent 6571bf5038
commit 4bafccdaa0
22 changed files with 126 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ class BasicDebugInfoWindow : UICanvas {
val ccR = GameFontBase.colToCode["r"]
val ccM = GameFontBase.colToCode["m"]
override fun processInput(input: Input) {
override fun processInput(gc: GameContainer, delta: Int, input: Input) {
}

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

@@ -128,7 +128,7 @@ class ConsoleWindow : UICanvas, KeyboardControlled {
}
override fun processInput(input: Input) {
override fun processInput(gc: GameContainer, delta: Int, input: Input) {
}

2
src/net/torvald/terrarum/ui/MessageWindow.kt
View File

@@ -85,7 +85,7 @@ constructor(override var width: Int, isBlackVariant: Boolean) : UICanvas {
}
}
override fun processInput(input: Input) {
override fun processInput(gc: GameContainer, delta: Int, input: Input) {
}

2
src/net/torvald/terrarum/ui/Notification.kt
View File

@@ -67,7 +67,7 @@ constructor() : UICanvas {
handler!!.opacity = 0f
}
override fun processInput(input: Input) {
override fun processInput(gc: GameContainer, delta: Int, input: Input) {
}
fun sendNotification(message: Array<String>) {

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

@@ -28,7 +28,7 @@ interface UICanvas {
fun render(gc: GameContainer, g: Graphics)
fun processInput(input: Input)
fun processInput(gc: GameContainer, delta: Int, input: Input)
/**
* Do not modify handler!!.openCloseCounter here.

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

@@ -190,9 +190,9 @@ constructor(val UI: UICanvas) {
}
}
fun processInput(input: Input) {
fun processInput(gc: GameContainer, delta: Int, input: Input) {
if (isVisible) {
UI.processInput(input)
UI.processInput(gc, delta, input)
}
}

2
src/net/torvald/terrarum/ui/UIPieMenu.kt
View File

@@ -68,7 +68,7 @@ class UIPieMenu : UICanvas {
}
}
override fun processInput(input: Input) {
override fun processInput(gc: GameContainer, delta: Int, input: Input) {
if (handler!!.isOpened || handler!!.isOpening) {
val cursorPos = Vector2(input.mouseX.toDouble(), input.mouseY.toDouble())
val centre = Vector2(Terrarum.WIDTH / 2.0, Terrarum.HEIGHT / 2.0)

2
src/net/torvald/terrarum/ui/UIQuickBar.kt
View File

@@ -51,7 +51,7 @@ class UIQuickBar : UICanvas, MouseControlled {
}
}
override fun processInput(input: Input) {
override fun processInput(gc: GameContainer, delta: Int, input: Input) {
}
override fun doOpening(gc: GameContainer, delta: Int) {