Better animations, refactor

Author: bladekt

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

@@ -15,6 +15,7 @@ import com.lambda.util.Mouse
 import com.lambda.util.math.MathUtils.toInt
 import com.lambda.util.math.Rect
 import com.lambda.util.math.Vec2d
+import kotlin.math.abs
 
 abstract class WindowComponent <T : ChildComponent> : InteractiveComponent(), IListComponent<T> {
     abstract val title: String
@@ -41,7 +42,8 @@ abstract class WindowComponent <T : ChildComponent> : InteractiveComponent(), IL
     override val children = mutableListOf<T>()
     val subLayer = RenderLayer(true)
 
-    private val renderHeight by animation.exp({ 0.0 }, { height + padding * 2 * isOpen.toInt() }, 0.5, ::isOpen)
+    private val actualHeight get() = height + padding * 2 * isOpen.toInt()
+    private var renderHeight by animation.exp({ 0.0 }, ::actualHeight, 0.5, ::isOpen)
 
     init {
         // Background
@@ -63,6 +65,7 @@ abstract class WindowComponent <T : ChildComponent> : InteractiveComponent(), IL
         super<IListComponent>.onShow()
 
         dragOffset = null
+        renderHeight = 0.0
     }
 
     override fun onHide() {
@@ -72,12 +75,12 @@ abstract class WindowComponent <T : ChildComponent> : InteractiveComponent(), IL
     override fun onTick() {
         animation.tick()
 
-        children.forEach { child ->
-            child.visible = isChildAccessible(child)
+        setChildrenAccessibility { child ->
+            child.rect in contentRect
         }
 
         children
-            .filter(ChildComponent::visible)
+            .filter(ChildComponent::accessible)
             .forEach(IComponent::onTick)
     }
 
@@ -115,13 +118,22 @@ abstract class WindowComponent <T : ChildComponent> : InteractiveComponent(), IL
         if (mouse in titleBar && action == Mouse.Action.Click) {
             when(button) {
                 Mouse.Button.Left -> dragOffset = mouse - position
-                Mouse.Button.Right -> isOpen = !isOpen
+                Mouse.Button.Right -> {
+                    // Don't let user spam
+                    val targetHeight = if (isOpen) actualHeight else 0.0
+                    if (abs(targetHeight - renderHeight) > 1) return
+
+                    isOpen = !isOpen
+                }
             }
         }
 
         super<IListComponent>.onMouseClick(button, action, mouse)
     }
 
-    override fun isChildAccessible(child: T) =
-        child.rect in contentRect
+    private fun setChildrenAccessibility(flag: (T) -> Boolean) {
+        children.forEach { child ->
+            child.accessible = flag(child)
+        }
+    }
 }

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

@@ -4,7 +4,7 @@ import com.lambda.gui.api.component.InteractiveComponent
 
 abstract class ChildComponent : InteractiveComponent(), IChildComponent {
     // mostly used to create an animation when an element appears
-    var visible = false; set(value) {
+    var accessible = false; set(value) {
         if (field == value) return
         field = value
 

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

@@ -8,7 +8,7 @@ import com.lambda.util.math.Vec2d
 interface IListComponent <T : IComponent> : IComponent {
     val children: List<T>
 
-    fun isChildAccessible(child: T): Boolean = true
+    fun isChildAccessible(child: T): Boolean = (child as? ChildComponent)?.accessible ?: true
 
     override fun onShow() {
         children.forEach(IComponent::onShow)

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

@@ -29,9 +29,10 @@ abstract class ButtonComponent(final override val owner: WindowComponent<*>) : C
     private val animation = AnimationTicker()
 
     private var activeAnimation by animation.exp(0.0, 1.0, 0.1, ::active)
-    private var hoverAnimation by animation.exp({ 0.0 }, { 1.0 }, { if (renderHovered || active) 0.5 else 0.1 }, ::renderHovered)
+    private var hoverRectAnimation by animation.exp({ 0.0 }, { 1.0 }, { if (renderHovered) 0.5 else 0.1 }, ::renderHovered)
+    private var hoverFontAnimation by animation.exp(0.0, 1.0, 0.5, ::renderHovered)
     private var pressAnimation by animation.exp(0.0, 1.0, 0.5, ::pressed)
-    private val interactAnimation get() = lerp(hoverAnimation, 1.5, pressAnimation) * 0.4
+    private val interactAnimation get() = lerp(hoverRectAnimation, 1.5, pressAnimation) * 0.4
 
     private var lastHoveredTime = 0L
     private val renderHovered get() = hovered ||
@@ -46,7 +47,7 @@ abstract class ButtonComponent(final override val owner: WindowComponent<*>) : C
 
         // Hover glint
         layer.rect.build {
-            val hoverRect = Rect.basedOn(rect.leftTop, rect.size.x * hoverAnimation, rect.size.y)
+            val hoverRect = Rect.basedOn(rect.leftTop, rect.size.x * hoverRectAnimation, rect.size.y)
             position = hoverRect.shrink(interactAnimation)
 
             val alpha = interactAnimation * 0.3
@@ -80,7 +81,7 @@ abstract class ButtonComponent(final override val owner: WindowComponent<*>) : C
 
             color = lerp(Color.WHITE, GuiSettings.mainColor, activeAnimation)
 
-            val x = rect.left + ClickGui.windowPadding + interactAnimation + hoverAnimation
+            val x = rect.left + ClickGui.windowPadding + interactAnimation + hoverFontAnimation * 2.0
             position = Vec2d(x, rect.center.y)
         }
     }
@@ -89,7 +90,12 @@ abstract class ButtonComponent(final override val owner: WindowComponent<*>) : C
 
     override fun onShow() {
         super.onShow()
-        activeAnimation = 0.0
+        reset()
+    }
+
+    override fun onHide() {
+        super.onHide()
+        reset()
     }
 
     override fun onTick() {
@@ -107,6 +113,13 @@ abstract class ButtonComponent(final override val owner: WindowComponent<*>) : C
         if (hovered) lastHoveredTime = time
     }
 
+    private fun reset() {
+        activeAnimation = 0.0
+        hoverRectAnimation = 0.0
+        pressAnimation = 0.0
+        lastHoveredTime = 0L
+    }
+
     companion object {
         const val FILL_PARENT = -1.0
     }

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

@@ -3,9 +3,8 @@ package com.lambda.gui.impl.clickgui
 import com.lambda.config.Configurable
 import com.lambda.config.configurations.GuiConfig
 import com.lambda.gui.impl.clickgui.windows.TagWindow
-import com.lambda.module.tag.ModuleTag
 
 object GuiConfigurable : Configurable(GuiConfig) {
     override val name = "gui"
-    val windows = setting("windows", listOf(TagWindow(ModuleTag("Test Window"))))
+    val windows = setting("windows", listOf(TagWindow()))
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/TagWindow.kt

@@ -1,6 +1,9 @@
 package com.lambda.gui.impl.clickgui.windows
 
+import com.lambda.gui.api.LambdaGui
 import com.lambda.gui.api.component.WindowComponent
+import com.lambda.gui.api.component.core.list.IChildComponent
+import com.lambda.gui.impl.clickgui.LambdaClickGui
 import com.lambda.gui.impl.clickgui.buttons.ModuleButton
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.modules.client.ClickGui
@@ -10,11 +13,12 @@ class TagWindow(
     val tags: Set<ModuleTag> = setOf(),
     override var title: String = "Untitled",
     override var width: Double = 110.0,
-    override var height: Double = 300.0
-) : WindowComponent<ModuleButton>() {
+    override var height: Double = 300.0,
+    override val owner: LambdaGui = LambdaClickGui
+) : WindowComponent<ModuleButton>(), IChildComponent {
     init {
         ModuleRegistry.modules.filter { module ->
-            module.customTags.value.any(tags::contains)
+            module.customTags.value.any(tags::contains) || tags.isEmpty()
         }.forEach {
             children.add(ModuleButton(it, this))
         }