From e5f3c9ea1a2d79308643d5c2cd70f8ea7bcad394 Mon Sep 17 00:00:00 2001 From: Tyrannova Date: Tue, 15 Jan 2019 16:40:18 +0100 Subject: Settings --- src/main/kotlin/de/romjaki/pluggabledino/api/Button.kt | 9 ++++++--- src/main/kotlin/de/romjaki/pluggabledino/api/Renderable.kt | 7 +++++++ src/main/kotlin/de/romjaki/pluggabledino/api/SettingsElement.kt | 6 ++++++ src/main/kotlin/de/romjaki/pluggabledino/api/ToggleButton.kt | 9 ++++++--- src/main/kotlin/de/romjaki/pluggabledino/api/Updateable.kt | 8 ++++++++ 5 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 src/main/kotlin/de/romjaki/pluggabledino/api/Renderable.kt create mode 100644 src/main/kotlin/de/romjaki/pluggabledino/api/SettingsElement.kt create mode 100644 src/main/kotlin/de/romjaki/pluggabledino/api/Updateable.kt (limited to 'src/main/kotlin/de/romjaki/pluggabledino/api') diff --git a/src/main/kotlin/de/romjaki/pluggabledino/api/Button.kt b/src/main/kotlin/de/romjaki/pluggabledino/api/Button.kt index edced5a..439acb8 100644 --- a/src/main/kotlin/de/romjaki/pluggabledino/api/Button.kt +++ b/src/main/kotlin/de/romjaki/pluggabledino/api/Button.kt @@ -6,7 +6,10 @@ import org.newdawn.slick.Input import java.awt.Rectangle import kotlin.math.max -class Button(private val text: String, val x: Float, val y: Float) { +class Button(private val text: String, val x: Float, val y: Float) : SettingsElement { + override fun render(g: Graphics) { + draw(g) + } val width = max(buttonImage.width, font.getWidth(text) + 10) val image = buttonImage.getScaledCopy(width, buttonImage.height) @@ -40,14 +43,14 @@ class Button(private val text: String, val x: Float, val y: Float) { override fun toString(): String = "X: $leftX - $rightX, $topY - $bottomY, width=$width" - fun enter() { + override fun enter() { lastClicked = true } fun isClicked(input: Input): Boolean = input.isMouseButtonDown(Input.MOUSE_LEFT_BUTTON) && isMouseOver(input) - fun update(input: Input) { + override fun update(input: Input) { val ret = isClicked(input) if (!lastClicked && ret) { clickHandlers.forEach({ it() }) diff --git a/src/main/kotlin/de/romjaki/pluggabledino/api/Renderable.kt b/src/main/kotlin/de/romjaki/pluggabledino/api/Renderable.kt new file mode 100644 index 0000000..f7ac4be --- /dev/null +++ b/src/main/kotlin/de/romjaki/pluggabledino/api/Renderable.kt @@ -0,0 +1,7 @@ +package de.romjaki.pluggabledino.api + +import org.newdawn.slick.Graphics + +interface Renderable { + fun render(g: Graphics) +} diff --git a/src/main/kotlin/de/romjaki/pluggabledino/api/SettingsElement.kt b/src/main/kotlin/de/romjaki/pluggabledino/api/SettingsElement.kt new file mode 100644 index 0000000..8ca7a37 --- /dev/null +++ b/src/main/kotlin/de/romjaki/pluggabledino/api/SettingsElement.kt @@ -0,0 +1,6 @@ +package de.romjaki.pluggabledino.api + +import de.romjaki.pluggabledino.api.Renderable +import de.romjaki.pluggabledino.api.Updateable + +interface SettingsElement : Renderable, Updateable diff --git a/src/main/kotlin/de/romjaki/pluggabledino/api/ToggleButton.kt b/src/main/kotlin/de/romjaki/pluggabledino/api/ToggleButton.kt index cce59fc..b776637 100644 --- a/src/main/kotlin/de/romjaki/pluggabledino/api/ToggleButton.kt +++ b/src/main/kotlin/de/romjaki/pluggabledino/api/ToggleButton.kt @@ -8,7 +8,10 @@ import kotlin.math.max typealias ChangeListener = (index: Int) -> Unit -class ToggleButton(private val texts: List, val x: Float, val y: Float) { +class ToggleButton(private val texts: List, val x: Float, val y: Float) : SettingsElement { + override fun render(g: Graphics) { + draw(g) + } val width = max(buttonImage.width, texts.map { font.getWidth(it) + 10 }.max()!!) val image = buttonImage.getScaledCopy(width, buttonImage.height) @@ -43,14 +46,14 @@ class ToggleButton(private val texts: List, val x: Float, val y: Float) override fun toString(): String = "X: $leftX - $rightX, $topY - $bottomY, width=$width" - fun enter() { + override fun enter() { lastClicked = true } fun isClicked(input: Input): Boolean = input.isMouseButtonDown(Input.MOUSE_LEFT_BUTTON) && isMouseOver(input) - fun update(input: Input) { + override fun update(input: Input) { val ret = isClicked(input) if (!lastClicked && ret) { index = (index + 1) % texts.size diff --git a/src/main/kotlin/de/romjaki/pluggabledino/api/Updateable.kt b/src/main/kotlin/de/romjaki/pluggabledino/api/Updateable.kt new file mode 100644 index 0000000..42798bc --- /dev/null +++ b/src/main/kotlin/de/romjaki/pluggabledino/api/Updateable.kt @@ -0,0 +1,8 @@ +package de.romjaki.pluggabledino.api + +import org.newdawn.slick.Input + +interface Updateable { + fun update(input: Input) + fun enter() +} -- cgit