Slider progress rendering

Author: bladekt

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

@@ -26,7 +26,7 @@ class ModuleButton(val module: Module, owner: ChildLayer.Drawable<*>) : ListButt
     override var activeAnimation by animation.exp(0.0, 1.0, 0.15, ::enabled)
     private val toggleFxDirection by animation.exp(0.0, 1.0, 0.7, ::enabled)
 
-    override val listStep: Double get() = super.listStep * 2.0 + renderHeight
+    override val listStep: Double get() = super.listStep + renderHeight
 
     private var isOpen = false
     override val isActive get() = isOpen
@@ -126,7 +126,7 @@ class ModuleButton(val module: Module, owner: ChildLayer.Drawable<*>) : ListButt
             var lastStep = 0.0
             settingsLayer.children
                 .filter(SettingButton<*, *>::visible)
-                .sumOf {  lastStep = it.listStep;  it.size.y + it.listStep } - lastStep
+                .sumOf {  lastStep = it.listStep;  it.size.y + it.listStep } - lastStep + super.listStep
         } else 0.0
     }
 

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

@@ -1,13 +1,16 @@
 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.core.list.ChildLayer
 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.MathUtils.roundToStep
 import com.lambda.util.math.MathUtils.typeConvert
 import com.lambda.util.math.Vec2d
+import com.lambda.util.math.normalize
 import java.awt.Color
 
 class NumberSlider <N>(
@@ -16,6 +19,11 @@ class NumberSlider <N>(
 ) : SliderSetting<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)
+
     init {
         renderer.font {
             text = value.let(Number::toString)

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

@@ -4,11 +4,25 @@ import com.lambda.config.AbstractSetting
 import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.impl.clickgui.buttons.SettingButton
+import com.lambda.module.modules.client.GuiSettings
+import com.lambda.util.math.ColorUtils.multAlpha
+import com.lambda.util.math.Vec2d
 import com.lambda.util.math.transform
 
 abstract class SliderSetting <V : Any, T : AbstractSetting<V>>(
     setting: T, owner: ChildLayer.Drawable<*>
 ) : SettingButton<V, T>(setting, owner) {
+    protected abstract val renderProgress: Double
+    protected abstract fun setValueByProgress(progress: Double)
+
+    init {
+        renderer.filled {
+            position = rect.moveSecond(Vec2d(-rect.size.x * (1.0 - renderProgress), 0.0)).shrink(interactAnimation)
+            shade = GuiSettings.shade
+            color(GuiSettings.mainColor.multAlpha(showAnimation * 0.3))
+        }
+    }
+
     override fun onEvent(e: GuiEvent) {
         super.onEvent(e)
 
@@ -17,6 +31,4 @@ abstract class SliderSetting <V : Any, T : AbstractSetting<V>>(
             setValueByProgress(p.coerceIn(0.0, 1.0))
         }
     }
-
-    protected abstract fun setValueByProgress(progress: Double)
 }

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

@@ -20,8 +20,8 @@ object GuiSettings : Module(
     val backgroundColor by setting("Background Color", Color(50, 50, 50), visibility = { page == Page.Colors })
     val shade by setting("Shade", true, visibility = { page == Page.Colors })
     val shadeBackground by setting("Shade Background", true, visibility = { page == Page.Colors })
-    val colorWidth by setting("Color Width", 100.0, 1.0..100.0, 1.0, visibility = { page == Page.Colors && shade })
-    val colorHeight by setting("Color Height", 100.0, 1.0..100.0, 1.0, visibility = { page == Page.Colors && shade })
+    val colorWidth by setting("Color Width", 400.0, 10.0..1000.0, 10.0, visibility = { page == Page.Colors && shade })
+    val colorHeight by setting("Color Height", 400.0, 10.0..1000.0, 10.0, visibility = { page == Page.Colors && shade })
     val colorSpeed by setting("Color Speed", 1.0, 0.1..10.0, 0.1, visibility = { page == Page.Colors && shade })
 
     val mainColor: Color get() = if (shade) Color.WHITE else primaryColor