Settings open animation & refactor

bladekt · bladekt · commit 9e4ae2c1c7b4 · 2024-05-02T18:21:16.000+03:00
diff --git a/common/src/main/kotlin/com/lambda/gui/api/component/WindowComponent.kt b/common/src/main/kotlin/com/lambda/gui/api/component/WindowComponent.kt
@@ -4,7 +4,6 @@ import com.lambda.graphics.animation.Animation.Companion.exp
 import com.lambda.graphics.gl.Scissor.scissor
 import com.lambda.graphics.renderer.gui.font.IFontEntry
 import com.lambda.gui.api.GuiEvent
-import com.lambda.gui.api.component.button.ButtonComponent
 import com.lambda.gui.api.component.core.list.ChildComponent
 import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.api.layer.RenderLayer
@@ -47,11 +46,11 @@ abstract class WindowComponent <T : ChildComponent> (
     val subLayer = RenderLayer()
 
     val animation = owner.animation
-    val guiAnimation get() = owner.guiAnimation
+    open val showAnimation get() = owner.showAnimation
 
     private val actualHeight get() = height + padding * 2 * isOpen.toInt()
     private var renderHeightAnimation by animation.exp({ 0.0 }, ::actualHeight, 0.6, ::isOpen)
-    private val renderHeight get() = lerp(0.0, renderHeightAnimation, guiAnimation)
+    private val renderHeight get() = lerp(0.0, renderHeightAnimation, showAnimation)
 
     val contentComponents = ChildLayer<T> { child ->
         child.rect in contentRect && accessible && isOpen
@@ -67,15 +66,15 @@ abstract class WindowComponent <T : ChildComponent> (
             position = rect
             roundRadius = ClickGui.windowRadius
 
-            val alpha = (guiAnimation * 2.0).coerceIn(0.0, 1.0)
+            val alpha = (showAnimation * 2.0).coerceIn(0.0, 1.0)
             color(GuiSettings.backgroundColor.multAlpha(alpha))
         }
 
         // Title
         titleFont = renderer.font {
             text = title
             position = titleBar.center - widthVec * 0.5
-            color = Color.WHITE.setAlpha(guiAnimation)
+            color = Color.WHITE.setAlpha(showAnimation)
         }
     }
 
@@ -134,6 +133,14 @@ abstract class WindowComponent <T : ChildComponent> (
         //titleBarComponents.onEvent(e)
     }
 
+    fun destroy() {
+        owner.apply {
+            scheduleAction {
+                windows.removeChild(this@WindowComponent)
+            }
+        }
+    }
+
     override fun onRemove() {
         layer.destroy()
         subLayer.destroy()
diff --git a/common/src/main/kotlin/com/lambda/gui/api/component/button/ButtonComponent.kt b/common/src/main/kotlin/com/lambda/gui/api/component/button/ButtonComponent.kt
@@ -36,7 +36,7 @@ abstract class ButtonComponent(
     private var pressAnimation by animation.exp(0.0, 1.0, 0.5, ::pressed)
     private val interactAnimation get() = lerp(hoverRectAnimation, 1.5, pressAnimation) * 0.4
     private val showAnimationRaw by animation.exp(0.0, 1.0, 0.7, owner::isOpen)
-    private val showAnimation get() = lerp(0.0, showAnimationRaw, owner.guiAnimation)
+    private val showAnimation get() = lerp(0.0, showAnimationRaw, owner.showAnimation)
 
     private var lastHoveredTime = 0L
     private val renderHovered get() = hovered ||
diff --git a/common/src/main/kotlin/com/lambda/gui/api/component/button/ListButton.kt b/common/src/main/kotlin/com/lambda/gui/api/component/button/ListButton.kt
@@ -12,7 +12,7 @@ abstract class ListButton(owner: WindowComponent<*>) : ButtonComponent(owner) {
     override val size get() = Vec2d(FILL_PARENT, ClickGui.buttonHeight)
 
     var heightOffset = 0.0
-    private val targetHeightOffset get() = heightOffset * owner.guiAnimation * owner.isOpen.toInt()
+    private val targetHeightOffset get() = heightOffset * owner.showAnimation * owner.isOpen.toInt()
     private var renderHeightOffset by animation.exp(::targetHeightOffset, 0.5)
 
     override fun onEvent(e: GuiEvent) {
diff --git a/common/src/main/kotlin/com/lambda/gui/impl/clickgui/AbstractClickGui.kt b/common/src/main/kotlin/com/lambda/gui/impl/clickgui/AbstractClickGui.kt
@@ -16,7 +16,7 @@ abstract class AbstractClickGui(name: String = "ClickGui") : LambdaGui(name, Cli
     private var activeWindow: WindowComponent<*>? = null
 
     private var closing = false
-    var guiAnimation by animation.exp(0.0, 1.0, {
+    var showAnimation by animation.exp(0.0, 1.0, {
         if (closing) ClickGui.closeSpeed else ClickGui.openSpeed
     }) { !closing }; private set
 
@@ -30,11 +30,11 @@ abstract class AbstractClickGui(name: String = "ClickGui") : LambdaGui(name, Cli
             is GuiEvent.Show -> {
                 activeWindow = null
                 closing = false
-                guiAnimation = 0.0
+                showAnimation = 0.0
             }
 
             is GuiEvent.Tick -> {
-                if (closing && guiAnimation < 0.01) mc.setScreen(null)
+                if (closing && showAnimation < 0.01) mc.setScreen(null)
             }
 
             is GuiEvent.MouseClick -> {
diff --git a/common/src/main/kotlin/com/lambda/gui/impl/clickgui/LambdaClickGui.kt b/common/src/main/kotlin/com/lambda/gui/impl/clickgui/LambdaClickGui.kt
@@ -2,29 +2,22 @@ package com.lambda.gui.impl.clickgui
 
 import com.lambda.gui.GuiConfigurable
 import com.lambda.gui.api.GuiEvent
+import com.lambda.gui.api.component.WindowComponent
+import com.lambda.gui.impl.clickgui.windows.tag.CustomModuleWindow
 
 object LambdaClickGui : AbstractClickGui() {
     override fun onEvent(e: GuiEvent) {
-        if (e is GuiEvent.Show || e is GuiEvent.Tick) {
-            updateWindows()
-        }
-
+        if (e is GuiEvent.Show || e is GuiEvent.Tick) updateWindows()
         super.onEvent(e)
     }
 
     fun updateWindows() {
         windows.apply {
             val windows = GuiConfigurable.mainWindows + GuiConfigurable.customWindows
-            val new = windows.subtract(children.toSet())
-            children.addAll(new)
+            children.addAll(windows.subtract(children.toSet()))
 
-            children.forEach { window ->
-                if (window !in windows) {
-                    scheduleAction {
-                        removeChild(window)
-                    }
-                }
-            }
+            children.filter { it !in windows && it is CustomModuleWindow }
+                .forEach(WindowComponent<*>::destroy)
         }
     }
 }
diff --git a/common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/ModuleButton.kt b/common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/ModuleButton.kt
@@ -17,21 +17,18 @@ class ModuleButton(val module: Module, owner: WindowComponent<*>) : ListButton(o
             Mouse.Button.Left -> if (hovered) module.toggle()
             Mouse.Button.Right -> {
                 gui.apply {
-                    windows.children.forEach { child ->
-                        if (child is SettingsWindow && child.button == this@ModuleButton) {
-                            gui.scheduleAction {
-                                gui.windows.removeChild(child)
+                    // Open new settings window or move existing one to the cursor
+                    windows.children
+                        .firstOrNull { it is SettingsWindow && it.button == this@ModuleButton }
+                        ?.let { it.position = e.mouse }
+                        ?: run {
+                            scheduleAction {
+                                windows.addChild(SettingsWindow(this@ModuleButton, this).apply {
+                                    position = e.mouse
+                                })
                             }
                         }
-                    }
-
-                    scheduleAction {
-                        windows.addChild(SettingsWindow(this@ModuleButton, this).apply {
-                            position = e.mouse
-                        })
-                    }
                 }
-
             }
         }
     }
diff --git a/common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/SettingsWindow.kt b/common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/SettingsWindow.kt
@@ -1,10 +1,12 @@
 package com.lambda.gui.impl.clickgui.windows
 
+import com.lambda.graphics.animation.Animation.Companion.exp
 import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.ListWindow
 import com.lambda.gui.api.component.button.ListButton
 import com.lambda.gui.impl.clickgui.AbstractClickGui
 import com.lambda.gui.impl.clickgui.buttons.ModuleButton
+import com.lambda.module.modules.client.ClickGui
 
 class SettingsWindow(
     val button: ModuleButton,
@@ -16,9 +18,12 @@ class SettingsWindow(
     override var width = button.owner.width
     override var height = 0.0
 
+    override val showAnimation by animation.exp(0.0, 1.0, ClickGui.openSpeed, ::isOpen)
+
     override fun onEvent(e: GuiEvent) {
         if (e is GuiEvent.Tick) {
             height = contentComponents.children.sumOf { it.size.y }
+            if (showAnimation < 0.05 && !isOpen) destroy()
         }
 
         super.onEvent(e)

Original file line number	Diff line number	Diff line change
`@@ -17,21 +17,18 @@ class ModuleButton(val module: Module, owner: WindowComponent<*>) : ListButton(o`
`17`	`17`	`Mouse.Button.Left -> if (hovered) module.toggle()`
`18`	`18`	`Mouse.Button.Right -> {`
`19`	`19`	`gui.apply {`
`20`		`- windows.children.forEach { child ->`
`21`		`- if (child is SettingsWindow && child.button == this@ModuleButton) {`
`22`		`- gui.scheduleAction {`
`23`		`- gui.windows.removeChild(child)`
	`20`	`+ // Open new settings window or move existing one to the cursor`
	`21`	`+ windows.children`
	`22`	`+ .firstOrNull { it is SettingsWindow && it.button == this@ModuleButton }`
	`23`	`+ ?.let { it.position = e.mouse }`
	`24`	`+ ?: run {`
	`25`	`+ scheduleAction {`
	`26`	`+ windows.addChild(SettingsWindow(this@ModuleButton, this).apply {`
	`27`	`+ position = e.mouse`
	`28`	`+ })`
`24`	`29`	`}`
`25`	`30`	`}`
`26`		`- }`
`27`		`-`
`28`		`- scheduleAction {`
`29`		`- windows.addChild(SettingsWindow(this@ModuleButton, this).apply {`
`30`		`- position = e.mouse`
`31`		`- })`
`32`		`- }`
`33`	`31`	`}`
`34`		`-`
`35`	`32`	`}`
`36`	`33`	`}`
`37`	`34`	`}`