Enum setting & misc

Author: bladekt

common/src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

@@ -1,6 +1,8 @@
 package com.lambda.config.settings.comparable
 
 import com.lambda.config.AbstractSetting
+import com.lambda.util.Nameable
+import java.util.*
 
 class EnumSetting<T : Enum<T>>(
     override val name: String,
@@ -12,7 +14,13 @@ class EnumSetting<T : Enum<T>>(
     description,
     visibility,
 ) {
-    private val enumValues: Array<T> = defaultValue.declaringJavaClass.enumConstants
+    val displayValue get() = (value as? Nameable)?.name ?: value.name.split('_').joinToString(" ") { low ->
+        low.lowercase().replaceFirstChar {
+            if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
+        }
+    }
+
+    val enumValues: Array<T> = defaultValue.declaringJavaClass.enumConstants
 
     fun next() {
         value = enumValues[((value.ordinal + 1) % enumValues.size)]

common/src/main/kotlin/com/lambda/gui/api/component/InteractiveComponent.kt

@@ -3,27 +3,30 @@ package com.lambda.gui.api.component
 import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.core.IComponent
 import com.lambda.util.Mouse
+import com.lambda.util.math.Vec2d
 
 abstract class InteractiveComponent : IComponent {
-    protected var hovered = false
+    protected open val hovered get() = rect.contains(lastMouse)
     protected var activeButton: Mouse.Button? = null
 
     protected open fun onPress(e: GuiEvent.MouseClick) {}
     protected open fun onRelease(e: GuiEvent.MouseClick) {}
 
+    private var lastMouse = Vec2d.ZERO
+
     override fun onEvent(e: GuiEvent) {
         when (e) {
             is GuiEvent.Show -> {
-                hovered = false
+                lastMouse = Vec2d.ONE * -1000.0
                 activeButton = null
             }
 
             is GuiEvent.MouseMove -> {
-                hovered = rect.contains(e.mouse)
+                lastMouse = e.mouse
             }
 
             is GuiEvent.MouseClick -> {
-                hovered = rect.contains(e.mouse)
+                lastMouse = e.mouse
 
                 val prevPressed = activeButton != null
                 activeButton = if (hovered && e.button.isMainButton && e.action == Mouse.Action.Click) e.button else null

common/src/main/kotlin/com/lambda/gui/api/component/core/list/ChildComponent.kt

@@ -1,15 +1,10 @@
 package com.lambda.gui.api.component.core.list
 
-import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.InteractiveComponent
 
 abstract class ChildComponent(open val owner: ChildLayer<*, *>) : InteractiveComponent() {
     open var accessible = false
-
-    override fun onEvent(e: GuiEvent) {
-        super.onEvent(e)
-        if (e is GuiEvent.MouseMove || e is GuiEvent.MouseClick) hovered = hovered && accessible
-    }
+    override val hovered; get() = super.hovered && accessible
 
     open fun onAdd() {}
     open fun onRemove() {}

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/ModuleButton.kt

@@ -3,6 +3,7 @@ package com.lambda.gui.impl.clickgui.buttons
 import com.lambda.config.settings.NumericSetting
 import com.lambda.config.settings.StringSetting
 import com.lambda.config.settings.comparable.BooleanSetting
+import com.lambda.config.settings.comparable.EnumSetting
 import com.lambda.core.LambdaSound
 import com.lambda.core.SoundManager.playSoundRandomly
 import com.lambda.graphics.animation.Animation.Companion.exp
@@ -13,6 +14,7 @@ import com.lambda.gui.api.component.button.ListButton
 import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.api.layer.RenderLayer
 import com.lambda.gui.impl.clickgui.buttons.setting.BooleanButton
+import com.lambda.gui.impl.clickgui.buttons.setting.EnumSlider
 import com.lambda.gui.impl.clickgui.buttons.setting.NumberSlider
 import com.lambda.gui.impl.clickgui.buttons.setting.StringButton
 import com.lambda.module.Module
@@ -99,11 +101,13 @@ class ModuleButton(
             colorV(Color.BLACK.setAlpha(0.0), Color.BLACK.setAlpha(0.2 * progress))
         }
 
+        // TODO: resort when all settings are implemented
         module.settings.mapNotNull {
             when (it) {
                 is BooleanSetting -> BooleanButton(it, settingsLayer)
                 is NumericSetting<*> -> NumberSlider(it, settingsLayer)
                 is StringSetting -> StringButton(it, settingsLayer)
+                is EnumSetting<*> -> EnumSlider(it, settingsLayer)
                 else -> null
             }
         }.forEach(settingsLayer::addChild)

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/SettingButton.kt

@@ -26,8 +26,11 @@ abstract class SettingButton <V : Any, T : AbstractSetting<V>> (
         super.onEvent(e)
 
         if (e !is GuiEvent.Tick) return
+
         if (!prevTickVisible && visible) renderHeightAnimation = heightOffset
         prevTickVisible = visible
+
+        if (!visible) unfocus()
     }
 
     open fun unfocus() {}

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/EnumSlider.kt

@@ -0,0 +1,51 @@
+package com.lambda.gui.impl.clickgui.buttons.setting
+
+import com.lambda.config.settings.comparable.EnumSetting
+import com.lambda.gui.api.GuiEvent
+import com.lambda.gui.api.component.core.list.ChildLayer
+import com.lambda.gui.impl.clickgui.buttons.ModuleButton
+import com.lambda.gui.impl.clickgui.buttons.SettingButton
+import com.lambda.module.modules.client.ClickGui
+import com.lambda.util.math.ColorUtils.setAlpha
+import com.lambda.util.math.MathUtils.lerp
+import com.lambda.util.math.Vec2d
+import com.lambda.util.math.transform
+import java.awt.Color
+import kotlin.math.floor
+
+class EnumSlider <T : Enum<T>> (
+    setting: EnumSetting<T>,
+    owner: ChildLayer.Drawable<SettingButton<*, *>, ModuleButton>
+) : Slider<T, EnumSetting<T>>(setting, owner) {
+    private val values = setting.enumValues
+    private val enumSize = values.size
+
+    override val progress get() = if (dragProgress != -1.0) dragProgress else
+        transform(value.ordinal.toDouble(), 0.0, enumSize - 1.0, 0.0, 1.0)
+
+    private var dragProgress = -1.0
+
+    override fun setValueByProgress(progress: Double) {
+        val entryIndex = floor(progress * enumSize).toInt().coerceIn(0, enumSize - 1)
+        value = values[entryIndex]
+        dragProgress = progress
+    }
+
+    override fun onPress(e: GuiEvent.MouseClick) {}
+
+    override fun onRelease(e: GuiEvent.MouseClick) {
+        if (dragProgress == -1.0) setting.next()
+        dragProgress = -1.0
+    }
+
+    init {
+        renderer.font {
+            text = setting.displayValue
+
+            val progress = 1.0 - activeAnimation
+            scale = lerp(0.5, 1.0, progress)
+            position = Vec2d(rect.right, rect.center.y) - Vec2d(ClickGui.windowPadding + stringWidth, 0.0)
+            color = Color.WHITE.setAlpha(lerp(0.0, progress, showAnimation))
+        }
+    }
+}

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/NumberSlider.kt

@@ -1,7 +1,6 @@
 package com.lambda.gui.impl.clickgui.buttons.setting
 
 import com.lambda.config.settings.NumericSetting
-import com.lambda.graphics.animation.Animation.Companion.exp
 import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.button.InputBarOverlay
 import com.lambda.gui.api.component.core.list.ChildLayer
@@ -19,13 +18,11 @@ import com.lambda.util.math.normalize
 class NumberSlider <N>(
     setting: NumericSetting<N>,
     owner: ChildLayer.Drawable<SettingButton<*, *>, ModuleButton>
-) : SliderSetting<N, NumericSetting<N>>(
+) : Slider<N, NumericSetting<N>>(
     setting, owner
 ) where N : Number, N : Comparable<N> {
     private val doubleRange get() = setting.range.let { it.start.toDouble()..it.endInclusive.toDouble() }
-    private val targetProgress get() = doubleRange.normalize(value.toDouble())
-    private val renderProgress0 by animation.exp(::targetProgress, 0.6)
-    override val renderProgress get() = lerp(0.0, renderProgress0, showAnimation)
+    override val progress get() = doubleRange.normalize(value.toDouble())
 
     private val layer = ChildLayer.Drawable(owner.gui, this, owner.renderer, ::rect, InputBarOverlay::isActive)
     private val inputBar: InputBarOverlay = object : InputBarOverlay(renderer, layer) {

…lickgui/buttons/setting/SliderSetting.kt …/impl/clickgui/buttons/setting/Slider.ktcommon/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/SliderSetting.kt renamed to common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/Slider.kt common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/SliderSetting.kt renamed to common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/Slider.kt

@@ -3,6 +3,7 @@ package com.lambda.gui.impl.clickgui.buttons.setting
 import com.lambda.config.AbstractSetting
 import com.lambda.core.LambdaSound
 import com.lambda.core.SoundManager.playSound
+import com.lambda.graphics.animation.Animation.Companion.exp
 import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.impl.clickgui.buttons.ModuleButton
@@ -14,10 +15,13 @@ import com.lambda.util.math.MathUtils.lerp
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.transform
 
-abstract class SliderSetting <V : Any, T : AbstractSetting<V>>(
+abstract class Slider <V : Any, T : AbstractSetting<V>>(
     setting: T, owner: ChildLayer.Drawable<SettingButton<*, *>, ModuleButton>
 ) : SettingButton<V, T>(setting, owner) {
-    protected abstract val renderProgress: Double
+    protected abstract val progress: Double
+    private val progressAnimation by animation.exp(::progress, 0.6)
+    private val renderProgress get() = lerp(0.0, progressAnimation, showAnimation)
+
     protected abstract fun setValueByProgress(progress: Double)
     private var lastPlayedValue = value
     private var lastPlayedTiming = 0L

common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt

@@ -17,7 +17,7 @@ object ClickGui : Module(
     val windowRadius by setting("Window Radius", 2.0, 0.0..10.0, 0.1)
     val windowPadding by setting("Window Padding", 2.0, 0.0..10.0, 0.1)
     val buttonHeight by setting("Button Height", 11.0, 8.0..20.0, 0.1)
-    val buttonStep by setting("Button Step", 1.0, 0.0..5.0, 0.1)
+    val buttonStep by setting("Button Step", 0.0, 0.0..5.0, 0.1)
     val windowBlur by setting("Window Blur", 30, 0..100, 1)
 
     // Animation