misc ui changes

Author: Blade-kt

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/FontRenderer.kt

@@ -27,6 +27,7 @@ import com.lambda.graphics.shader.Shader.Companion.shader
 import com.lambda.graphics.texture.TextureOwner.bind
 import com.lambda.module.modules.client.LambdaMoji
 import com.lambda.module.modules.client.RenderSettings
+import com.lambda.util.math.MathUtils.toInt
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.a
 import com.lambda.util.math.setAlpha
@@ -69,7 +70,7 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
 
         bind(chars, emojis)
 
-        processText(text, color, scale, shadow, parseEmoji) { char, pos1, pos2, col ->
+        processText(text, color, scale, shadow, parseEmoji) { char, pos1, pos2, col, _ ->
             buildGlyph(char, position, pos1, pos2, col)
         }
     }
@@ -142,7 +143,9 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
         parseEmoji: Boolean = LambdaMoji.isEnabled,
     ): Double {
         var width = 0.0
-        processText(text, scale = scale, parseEmoji = parseEmoji) { char, _, _, _ -> width += char.width }
+        processText(text, scale = scale, parseEmoji = parseEmoji) {
+                char, _, _, _, isShadow -> width += char.width * isShadow.toInt()
+        }
         return width * getScaleFactor(scale)
     }
 
@@ -170,7 +173,7 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
         scale: Double = 1.0,
         shadow: Boolean = RenderSettings.shadow,
         parseEmoji: Boolean = LambdaMoji.isEnabled,
-        block: (GlyphInfo, Vec2d, Vec2d, Color) -> Unit
+        block: (GlyphInfo, Vec2d, Vec2d, Color, Boolean) -> Unit
     ) {
         val actualScale = getScaleFactor(scale)
         val scaledGap = gap * actualScale
@@ -183,13 +186,14 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
 
         fun drawGlyph(info: GlyphInfo?, color: Color, offset: Double = 0.0) {
             if (info == null) return
+            val isShadow = offset != 0.0
 
             val scaledSize = info.size * actualScale
             val pos1 = Vec2d(posX, posY) + offset * actualScale
             val pos2 = pos1 + scaledSize
 
-            block(info, pos1, pos2, color)
-            if (offset == 0.0) posX += scaledSize.x + scaledGap
+            block(info, pos1, pos2, color, isShadow)
+            if (!isShadow) posX += scaledSize.x + scaledGap
         }
 
         val parsed = if (parseEmoji) emojis.parse(text) else mutableListOf()
@@ -244,7 +248,7 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
      * @param scale The base scale factor.
      * @return The adjusted scale factor.
      */
-    fun getScaleFactor(scale: Double): Double = scale * 9.0 / chars.height
+    fun getScaleFactor(scale: Double): Double = scale * 8.5 / chars.height
 
     /**
      * Calculates the shadow color by adjusting the brightness of the input color.

common/src/main/kotlin/com/lambda/gui/component/layout/Layout.kt

@@ -317,6 +317,19 @@ open class Layout(
         overrideHeight(overrideHeight)
     }
 
+    /**
+     * Removes this layout from its parent
+     */
+    fun destroy() {
+        check(owner != null) {
+            "Unable to destroy root layout. Owner is null."
+        }
+
+        check(owner.children.remove(this)) {
+            "destroy() called twice. The layout was already removed"
+        }
+    }
+
     init {
         onUpdate { // Update the layout
             screenSize = RenderMain.screenSize

common/src/main/kotlin/com/lambda/gui/component/window/TitleBar.kt

@@ -19,11 +19,13 @@ package com.lambda.gui.component.window
 
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.gui.component.HAlign
+import com.lambda.gui.component.core.FilledRect.Companion.rect
 import com.lambda.gui.component.core.TextField.Companion.textField
 import com.lambda.gui.component.core.UIBuilder
 import com.lambda.gui.component.layout.Layout
 import com.lambda.util.Mouse
 import com.lambda.util.math.Vec2d
+import com.lambda.util.math.lerp
 
 /**
  * Represents a titlebar component
@@ -58,6 +60,23 @@ class TitleBar(
         }
     }
 
+    val backgroundRect = rect {
+        onUpdate {
+            rectangle = this@TitleBar.rect
+            setColor(ClickGui.titleBackgroundColor)
+
+            val radius = ClickGui.roundRadius
+            leftTopRadius = radius
+            rightTopRadius = radius
+
+            val bottomRadius = lerp(owner.content.renderHeight, radius, 0.0)
+            leftBottomRadius = bottomRadius
+            rightBottomRadius = bottomRadius
+
+            shade = ClickGui.backgroundShade
+        }
+    }
+
     val textField = textField {
         text = title
 

common/src/main/kotlin/com/lambda/gui/component/window/Window.kt

@@ -41,7 +41,7 @@ open class Window(
     owner: Layout,
     initialTitle: String = "Untitled",
     initialPosition: Vec2d = Vec2d.ZERO,
-    initialSize: Vec2d = Vec2d(120.0, 300.0),
+    initialSize: Vec2d = Vec2d(110, 300),
     draggable: Boolean = true,
     scrollable: Boolean = true,
     private val minimizing: Minimizing = Minimizing.Relative,
@@ -52,26 +52,9 @@ open class Window(
     private val cursorController = cursorController()
 
     val titleBar = titleBar(initialTitle, draggable)
-    val content = windowContent(scrollable)
 
-    protected val titleBarRect = rect {
-        onUpdate {
-            rectangle = titleBar.rect
-            setColor(ClickGui.titleBackgroundColor)
-
-            val radius = ClickGui.roundRadius
-            leftTopRadius = radius
-            rightTopRadius = radius
-
-            val bottomRadius = lerp(content.renderHeight, radius, 0.0)
-            leftBottomRadius = bottomRadius
-            rightBottomRadius = bottomRadius
-
-            shade = ClickGui.backgroundShade
-        }
-    }
-
-    protected val contentRect = rect {
+    protected val titleBarBackground by titleBar::backgroundRect
+    protected val contentBackground = rect { // It's here because content cannot contain something by default
         onUpdate {
             rectangle = Rect(titleBar.leftBottom, this@Window.rightBottom)
             setColor(ClickGui.backgroundColor)
@@ -83,6 +66,8 @@ open class Window(
         }
     }
 
+    val content = windowContent(scrollable)
+
     protected val outlineRect = outline {
         onUpdate {
             rectangle = this@Window.rect

common/src/main/kotlin/com/lambda/gui/component/window/WindowContent.kt

@@ -18,7 +18,6 @@
 package com.lambda.gui.component.window
 
 import com.lambda.graphics.animation.Animation.Companion.exp
-import com.lambda.event.events.GuiEvent
 import com.lambda.gui.component.core.LayoutBuilder
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.gui.component.core.UIBuilder

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

@@ -33,11 +33,13 @@ import java.awt.Color
 
 class ModuleLayout(
     owner: Layout,
-    module: Module
+    module: Module,
+    initialPosition: Vec2d = Vec2d.ZERO,
+    initialSize: Vec2d = Vec2d(100, 18)
 ) : Window(
     owner,
     module.name,
-    Vec2d.ZERO, Vec2d.ZERO,
+    initialPosition, initialSize,
     false, true, Minimizing.Relative, false,
     AutoResize.ForceEnabled
 ) {
@@ -117,12 +119,12 @@ class ModuleLayout(
             }
         }
 
-        titleBarRect.onUpdate {
+        titleBarBackground.onUpdate {
             setColor(lerp(enableAnimation, ClickGui.moduleDisabledColor, ClickGui.moduleEnabledColor))
             correctRadius()
         }
 
-        contentRect.onUpdate {
+        contentBackground.onUpdate {
             setColor(lerp(enableAnimation, ClickGui.moduleDisabledColor, ClickGui.moduleEnabledColor))
             correctRadius()
         }

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

@@ -35,7 +35,7 @@ abstract class SettingLayout <V : Any, T: AbstractSetting<V>> (
     owner: Layout,
     val setting: T,
     expandable: Boolean = false
-) : Window( // going to use window to easily implement expandable settings (such as color picker)
+) : Window(
     owner,
     setting.name,
     Vec2d.ZERO, Vec2d.ZERO,
@@ -73,7 +73,12 @@ abstract class SettingLayout <V : Any, T: AbstractSetting<V>> (
             }
         }
 
-        children.removeAll(listOf(titleBarRect, contentRect, outlineRect))
+        listOf(
+            titleBarBackground,
+            contentBackground,
+            outlineRect
+        ).forEach(Layout::destroy)
+
         if (!expandable) children.remove(content)
     }
 }

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

@@ -32,21 +32,21 @@ object ClickGui : Module(
     defaultTags = setOf(ModuleTag.CLIENT)
 ) {
     val titleBarHeight by setting("Title Bar Height", 18.0, 10.0..25.0, 0.1)
-    val moduleHeight by setting("Module Height", 18.0, 10.0..25.0, 0.1)
+    val moduleHeight by setting("Module Height", 16.0, 10.0..25.0, 0.1)
     val settingsHeight by setting("Settings Height", 14.0, 10.0..25.0, 0.1)
-    val padding by setting("Padding", 2.0, 1.0..6.0, 0.1)
-    val listStep by setting("List Step", 2.0, 0.0..6.0, 0.1)
-    val autoResize by setting("Auto Resize", false)
+    val padding by setting("Padding", 1.0, 1.0..6.0, 0.1)
+    val listStep by setting("List Step", 1.0, 0.0..6.0, 0.1)
+    val autoResize by setting("Auto Resize", true)
 
     val roundRadius by setting("Round Radius", 2.0, 0.0..10.0, 0.1)
 
     val backgroundTint by setting("Background Tint", Color.BLACK.setAlpha(0.4))
 
-    val titleBackgroundColor by setting("Title Background Color", Color.WHITE.setAlpha(0.4))
-    val backgroundColor by setting("Background Color", Color.WHITE.setAlpha(0.25))
+    val titleBackgroundColor by setting("Title Background Color", Color(40, 40, 40))
+    val backgroundColor by setting("Background Color", titleBackgroundColor)
     val backgroundShade by setting("Background Shade", true)
 
-    val outline by setting("Outline", true)
+    val outline by setting("Outline", false)
     val outlineWidth by setting("Outline Width", 10.0, 1.0..10.0, 0.1) { outline }
     val outlineColor by setting("Outline Color", Color.WHITE.setAlpha(0.6)) { outline }
     val outlineShade by setting("Outline Shade", true) { outline }

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

@@ -19,7 +19,7 @@ in vec4 v_Color;
 out vec4 color;
 
 #define SMOOTHING 0.25
-#define NOISE_GRANULARITY 0.005
+#define NOISE_GRANULARITY 0.004
 
 vec4 noise() {
     // https://shader-tutorial.dev/advanced/color-banding-dithering/