Many misc cgui changes

Author: bladekt

common/src/main/kotlin/com/lambda/graphics/renderer/gui/rect/OutlineRectRenderer.kt

@@ -22,29 +22,24 @@ class OutlineRectRenderer : AbstractRectRenderer(
     fun build(
         rect: Rect,
         roundRadius: Double = 0.0,
-        innerGlow: Double = 1.0,
-        outerGlow: Double = 1.0,
+        glowRadius: Double = 1.0,
         color: Color = Color.WHITE,
         shade: Boolean = false,
-    ) = build(rect, roundRadius, innerGlow, outerGlow, color, color, color, color, shade)
+    ) = build(rect, roundRadius, glowRadius, color, color, color, color, shade)
 
     fun build(
         rect: Rect,
         roundRadius: Double = 0.0,
-        innerGlow: Double = 1.0,
-        outerGlow: Double = 1.0,
+        glowRadius: Double = 1.0,
         leftTop: Color = Color.WHITE,
         rightTop: Color = Color.WHITE,
         rightBottom: Color = Color.WHITE,
         leftBottom: Color = Color.WHITE,
         shade: Boolean = false,
     ) = vao.use {
-        val drawInner = innerGlow >= 1
-        val drawOuter = outerGlow >= 1
+        if (glowRadius < 1) return@use
 
-        if (!drawInner && !drawOuter) return@use
-
-        grow(verticesCount * (1 + drawInner.toInt() + drawOuter.toInt()))
+        grow(verticesCount * 3)
 
         fun IRenderContext.genVertices(size: Double, isGlow: Boolean): MutableList<Int> {
             val r = rect.expand(size)
@@ -89,8 +84,8 @@ class OutlineRectRenderer : AbstractRectRenderer(
             }
         }
 
-        if (drawInner) drawStripWith(genVertices(-innerGlow, true))
-        if (drawOuter) drawStripWith(genVertices(outerGlow, true))
+        drawStripWith(genVertices(-(glowRadius.coerceAtMost(1.0)), true))
+        drawStripWith(genVertices(glowRadius, true))
     }
 
     companion object {

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

@@ -9,6 +9,7 @@ import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.impl.AbstractClickGui
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.modules.client.GuiSettings
+import com.lambda.module.modules.client.GuiSettings.primaryColor
 import com.lambda.util.Mouse
 import com.lambda.util.math.ColorUtils.multAlpha
 import com.lambda.util.math.ColorUtils.setAlpha
@@ -81,9 +82,8 @@ abstract class WindowComponent<T : ChildComponent>(
                 renderer.outline.build(
                     rect = rect,
                     roundRadius = ClickGui.windowRadius,
-                    innerGlow = ClickGui.windowRadius.coerceAtMost(1.0),
-                    outerGlow = ClickGui.windowRadius,
-                    color = GuiSettings.mainColor.multAlpha(alpha),
+                    glowRadius = ClickGui.glowRadius,
+                    color = (if (GuiSettings.shadeBackground) Color.WHITE else primaryColor).multAlpha(alpha),
                     shade = GuiSettings.shadeBackground
                 )
 
@@ -123,7 +123,7 @@ abstract class WindowComponent<T : ChildComponent>(
 
                             isOpen = !isOpen
 
-                            if (isOpen) onEvent(GuiEvent.Show())
+                            if (isOpen) contentComponents.onEvent(GuiEvent.Show())
                         }
                     }
                 }

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

@@ -26,6 +26,7 @@ abstract class ButtonComponent(
     protected open val centerText = false
 
     protected abstract var activeAnimation: Double
+    protected open val roundRadius get() = ClickGui.buttonRadius
 
     private val actualSize get() = Vec2d(if (size.x == FILL_PARENT) owner.rect.size.x else size.x, size.y)
     final override val rect get() = Rect.basedOn(position, actualSize) + owner.rect.leftTop
@@ -58,6 +59,7 @@ abstract class ButtonComponent(
                 // Active color
                 renderer.filled.build(
                     rect = rect.shrink(shrinkAnimation),
+                    roundRadius = roundRadius,
                     color = GuiSettings.mainColor.multAlpha(activeAnimation * 0.3 * showAnimation),
                     shade = GuiSettings.shade
                 )
@@ -66,6 +68,7 @@ abstract class ButtonComponent(
                 val hoverRect = Rect.basedOn(rect.leftTop, rect.size.x * hoverRectAnimation, rect.size.y)
                 renderer.filled.build(
                     rect = hoverRect.shrink(shrinkAnimation),
+                    roundRadius = roundRadius,
                     color = GuiSettings.mainColor.multAlpha(interactAnimation * 0.2 * showAnimation),
                     shade = GuiSettings.shade
                 )

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

@@ -11,8 +11,10 @@ import com.lambda.module.HudModule
 import com.lambda.module.Module
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.modules.client.GuiSettings
+import com.lambda.module.modules.client.GuiSettings.primaryColor
 import com.lambda.util.math.ColorUtils.multAlpha
 import com.lambda.util.math.Vec2d
+import java.awt.Color
 
 object LambdaClickGui : AbstractClickGui("ClickGui", ClickGui) {
     override val moduleFilter: (Module) -> Boolean = {
@@ -39,6 +41,7 @@ object LambdaClickGui : AbstractClickGui("ClickGui", ClickGui) {
             override val size = Vec2d(30.0, 15.0)
             override val text = "HUD"
             override val centerText = true
+            override val roundRadius = ClickGui.windowRadius
 
             override var activeAnimation; get() = pressAnimation; set(_) {}
 
@@ -60,9 +63,8 @@ object LambdaClickGui : AbstractClickGui("ClickGui", ClickGui) {
                     renderer.outline.build(
                         rect = rect,
                         roundRadius = ClickGui.windowRadius,
-                        innerGlow = ClickGui.windowRadius.coerceAtMost(1.0),
-                        outerGlow = ClickGui.windowRadius,
-                        color = GuiSettings.mainColor.multAlpha(childShowAnimation),
+                        glowRadius = ClickGui.glowRadius,
+                        color = (if (GuiSettings.shadeBackground) Color.WHITE else primaryColor).multAlpha(childShowAnimation),
                         shade = GuiSettings.shadeBackground
                     )
                 }

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

@@ -14,6 +14,7 @@ import com.lambda.gui.api.component.button.ListButton
 import com.lambda.gui.api.component.core.list.ChildLayer
 import com.lambda.gui.impl.clickgui.buttons.setting.*
 import com.lambda.module.Module
+import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.modules.client.GuiSettings
 import com.lambda.sound.LambdaSound
 import com.lambda.sound.SoundManager.playSoundRandomly
@@ -143,7 +144,7 @@ class ModuleButton(
                     val leftColor = color.multAlpha(1.0 - toggleFxDirection)
                     val rightColor = color.multAlpha(toggleFxDirection)
 
-                    build(rect, 0.0, leftColor, rightColor, rightColor, leftColor, GuiSettings.shade)
+                    build(rect, roundRadius, leftColor, rightColor, rightColor, leftColor, GuiSettings.shade)
                 }
 
                 if (renderHeight > 0.5) {
@@ -166,7 +167,7 @@ class ModuleButton(
             var lastStep = 0.0
             settingsLayer.children
                 .filter(SettingButton<*, *>::visible)
-                .sumOf { lastStep = it.listStep; it.size.y + it.listStep } - lastStep + super.listStep * 2.0
+                .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/BooleanButton.kt

@@ -24,8 +24,9 @@ class BooleanButton(
     private val zoomAnimation get() = lerp(2.0, 0.0, showAnimation)
 
     private val checkboxRect
-        get() = Rect(rect.rightTop - Vec2d(rect.size.y * 1.75, 0.0), rect.rightBottom)
+        get() = Rect(rect.rightTop - Vec2d(rect.size.y * 1.65, 0.0), rect.rightBottom)
             .shrink(1.0 + zoomAnimation)
+            .moveFirst(Vec2d(0.0, 0.5)).moveSecond(Vec2d(0.0, -0.5))
 
     private val knobStart get() = Rect.basedOn(checkboxRect.leftTop, Vec2d.ONE * checkboxRect.size.y)
     private val knobEnd get() = Rect.basedOn(checkboxRect.rightBottom, Vec2d.ONE * checkboxRect.size.y * -1.0).inv()

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

@@ -6,6 +6,7 @@ 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.module.modules.client.GuiSettings
 import com.lambda.sound.LambdaSound
 import com.lambda.sound.SoundManager.playSound
@@ -41,7 +42,7 @@ abstract class Slider<V : Any, T : AbstractSetting<V>>(
                 // Slider rect
                 renderer.filled.build(
                     rect = rect.moveSecond(Vec2d(-rect.size.x * (1.0 - renderProgress), 0.0)).shrink(shrinkAnimation),
-                    roundRadius = 0.0,
+                    roundRadius = ClickGui.buttonRadius,
                     color = GuiSettings.mainColor.multAlpha(showAnimation * 0.3),
                     shade = GuiSettings.shade
                 )

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

@@ -1,8 +1,6 @@
 package com.lambda.module.modules.client
 
 import com.lambda.event.events.ClientEvent
-import com.lambda.event.events.TickEvent
-import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
 import com.lambda.gui.impl.clickgui.LambdaClickGui
 import com.lambda.gui.impl.hudgui.LambdaHudGui
@@ -18,6 +16,8 @@ object ClickGui : Module(
 ) {
     // General
     val windowRadius by setting("Window Radius", 2.0, 0.0..10.0, 0.1)
+    val glowRadius by setting("Glow Radius", 2.0, 0.0..20.0, 0.1)
+    val buttonRadius by setting("Button Radius", 0.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", 0.0, 0.0..5.0, 0.1)

common/src/main/resources/assets/lambda/shaders/fragment/renderer/rect_outline.frag

@@ -22,7 +22,7 @@ vec4 shade() {
 }
 
 vec4 glow() {
-    float newAlpha = min(1.0, (v_Alpha * v_Alpha));
+    float newAlpha = min(1.0, v_Alpha * v_Alpha * v_Alpha);
     return vec4(1.0, 1.0, 1.0, newAlpha);
 }