added text alignment, simple boolean button

Author: bladekt

common/src/main/kotlin/com/lambda/graphics/gl/Matrices.kt

@@ -10,19 +10,19 @@ object Matrices {
 
     var vertexTransformer: Matrix4d? = null
 
-    fun translate(x: Double, y: Double, z: Double) {
+    fun translate(x: Double, y: Double, z: Double = 0.0) {
         translate(x.toFloat(), y.toFloat(), z.toFloat())
     }
 
-    fun translate(x: Float, y: Float, z: Float) {
+    fun translate(x: Float, y: Float, z: Float = 0f) {
         stack.last().translate(x, y, z)
     }
 
-    fun scale(x: Double, y: Double, z: Double) {
+    fun scale(x: Double, y: Double, z: Double = 1.0) {
         stack.last().scale(x.toFloat(), y.toFloat(), z.toFloat())
     }
 
-    fun scale(x: Float, y: Float, z: Float) {
+    fun scale(x: Float, y: Float, z: Float = 1f) {
         stack.last().scale(x, y, z)
     }
 

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

@@ -5,9 +5,9 @@ import com.lambda.module.ModuleRegistry
 import com.lambda.module.tag.ModuleTag
 import com.lambda.newgui.ScreenLayout.Companion.gui
 import com.lambda.newgui.component.core.FilledRect.Companion.rect
+import com.lambda.newgui.component.layout.Layout.Companion.layout
 import com.lambda.newgui.impl.clickgui.ModuleLayout.Companion.moduleLayout
 import com.lambda.newgui.impl.clickgui.ModuleWindow.Companion.moduleWindow
-import com.lambda.util.math.Rect
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.setAlpha
 import java.awt.Color
@@ -17,7 +17,8 @@ object NewCGui : Module(
     description = "ggs",
     defaultTags = setOf(ModuleTag.CLIENT)
 ) {
-    val titleBarHeight by setting("Title Bar Height", 18.0, 0.0..25.0, 0.1)
+    val titleBarHeight by setting("Title Bar Height", 18.0, 10.0..25.0, 0.1)
+    val settingsHeight by setting("Settings Height", 16.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)
@@ -34,15 +35,14 @@ object NewCGui : Module(
     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 }
+    val fontScale by setting("Font Scale", 1.0, 0.5..2.0, 0.1)
+    val fontOffset by setting("Font Offset", 2.0, 0.0..5.0, 0.1)
 
     val moduleEnabledColor by setting("Module Enabled Color", Color.WHITE.setAlpha(0.25))
     val moduleDisabledColor by setting("Module Disabled Color", Color.WHITE.setAlpha(0.05))
 
     private val SCREEN get() = gui("New Click Gui") {
-        rect {
-            rectangle = Rect(Vec2d.ZERO, this.size)
-            setColor(backgroundTint)
-        }
+
 
         val tags = ModuleTag.defaults
         val modules = ModuleRegistry.modules

common/src/main/kotlin/com/lambda/newgui/GuiManager.kt

@@ -1,36 +1,34 @@
 package com.lambda.newgui
 
+import com.lambda.config.settings.comparable.BooleanSetting
 import com.lambda.core.Loadable
-import com.lambda.module.Module
 import com.lambda.newgui.component.core.UIBuilder
 import com.lambda.newgui.component.layout.Layout
-import com.lambda.newgui.impl.clickgui.ModuleLayout.Companion.moduleLayout
+import com.lambda.newgui.impl.clickgui.settings.BooleanButton.Companion.booleanSetting
+import java.lang.reflect.Type
+import kotlin.reflect.KClass
 
 object GuiManager : Loadable {
-    val typeMap = mutableMapOf<Class<*>, (owner: Layout, converted: Any) -> Layout>()
+    val typeMap = mutableMapOf<Type, (owner: Layout, converted: Any) -> Layout>()
 
-    private inline fun <reified T> typeAdapter(noinline block: (Layout, T) -> Layout) {
+    private inline fun <reified T : Any> typeAdapter(noinline block: (Layout, T) -> Layout) {
         typeMap[T::class.java] = { owner, converted -> block(owner, converted as T) }
     }
 
     override fun load(): String {
-        // Example, not meant to be used
-        typeAdapter<Module> { owner, ref ->
-            owner.moduleLayout(ref)
+        typeAdapter<BooleanSetting> { owner, ref ->
+            owner.booleanSetting(ref)
         }
 
-        return super.load()
+        return "Loaded ${typeMap.size} gui type adapters."
     }
 
     /**
      * Attempts to convert the given [reference] to the [Layout]
-     *
-     * Or throws [IllegalStateException] if there's no registered ui adapter for the type of the [reference]
      */
     @UIBuilder
-    inline fun <reified T : Any> Layout.layoutOf(reference: T, block: Layout.() -> Unit = {}): Layout {
-        val clazz = T::class.java
-        val adapter = typeMap[clazz] ?: throw IllegalArgumentException("Unable to convert ${clazz.simpleName} to a layout")
+    inline fun <reified T : Any> Layout.layoutOf(reference: T, block: Layout.() -> Unit = {}): Layout? {
+        val adapter = typeMap[T::class.java] ?: return null
         return adapter(this, reference).apply(children::add).apply(block)
     }
 }

common/src/main/kotlin/com/lambda/newgui/component/core/TextField.kt

@@ -1,7 +1,10 @@
 package com.lambda.newgui.component.core
 
+import com.lambda.newgui.component.HAlign
+import com.lambda.newgui.component.VAlign
 import com.lambda.newgui.component.layout.Layout
 import com.lambda.util.math.Vec2d
+import com.lambda.util.math.lerp
 import java.awt.Color
 
 class TextField(
@@ -16,8 +19,12 @@ class TextField(
     val textWidth  get() = fr.getWidth(text, scale)
     val textHeight get() = fr.getHeight(scale)
 
-    private val fr get() = if (bold) renderer.boldFont else renderer.font
+    var textHAlignment = HAlign.LEFT
+    var textVAlignment = VAlign.CENTER
+    var offsetX = 0.0
+    var offsetY = 0.0
 
+    private val fr get() = if (bold) renderer.boldFont else renderer.font
     private val updateActions = mutableListOf<TextField.() -> Unit>()
 
     fun onUpdate(block: TextField.() -> Unit) {
@@ -26,13 +33,17 @@ class TextField(
 
     init {
         properties.interactionPassthrough = true
+        fillParent()
 
         onRender {
             updateActions.forEach { action ->
                 action(this@TextField)
             }
 
-            val renderPos = Vec2d(renderPositionX, renderPositionY + textHeight * 0.5)
+            val rx = renderPositionX + lerp(textHAlignment.multiplier, offsetX, renderWidth - textWidth - offsetX)
+            val ry = renderPositionY + lerp(textVAlignment.multiplier, offsetY, renderHeight - textHeight - offsetY)
+            val renderPos = Vec2d(rx, ry + textHeight * 0.5)
+
             fr.build(text, renderPos, color, scale, shadow)
         }
     }

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

@@ -278,6 +278,21 @@ open class Layout(
         heightTransform = height
     }
 
+    /**
+     * Makes this layout expand up to parents rect
+     */
+    fun fillParent(
+        overrideX: () -> Double = { owner?.renderPositionX ?: ownerX },
+        overrideY: () -> Double = { owner?.renderPositionY ?: ownerY },
+        overrideWidth: () -> Double = { owner?.renderWidth?: ownerWidth },
+        overrideHeight: () -> Double = { owner?.renderHeight?: ownerHeight }
+    ) {
+        overrideX(overrideX)
+        overrideY(overrideY)
+        overrideWidth(overrideWidth)
+        overrideHeight(overrideHeight)
+    }
+
     fun onEvent(e: GuiEvent) {
         if (e is GuiEvent.Render) {
             screenSize = RenderMain.screenSize
@@ -334,32 +349,32 @@ open class Layout(
                 mouseClickActions.forEach { it(e.button, action) }
             }
             is GuiEvent.Render -> {
-                val drawAction = {
-                    val drawChildren = renderWidth > 0.1 && renderHeight > 0.1
+                if (properties.scissor) {
+                    scissor(rect) { render(e) }
+                } else render(e)
+            }
+        }
+    }
 
-                    val partition by lazy {
-                        children.partition { !it.owningRenderer }
-                    }
+    protected open fun render(e: GuiEvent) {
+        val drawChildren = renderWidth > 0.1 && renderHeight > 0.1
 
-                    renderActions.forEach { it(renderer) }
+        val partition by lazy {
+            children.partition { !it.owningRenderer }
+        }
 
-                    if (drawChildren) {
-                        partition.first.forEach { it.onEvent(e) }
-                    }
+        renderActions.forEach { it(renderer) }
 
-                    if (owningRenderer) {
-                        renderer.render()
-                    }
+        if (drawChildren) {
+            partition.first.forEach { it.onEvent(e) }
+        }
 
-                    if (drawChildren) {
-                        partition.second.forEach { it.onEvent(e) }
-                    }
-                }
+        if (owningRenderer) {
+            renderer.render()
+        }
 
-                if (properties.scissor) {
-                    scissor(rect, drawAction)
-                } else drawAction()
-            }
+        if (drawChildren) {
+            partition.second.forEach { it.onEvent(e) }
         }
     }
 

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

@@ -21,10 +21,11 @@ class TitleBar(
         text = title
         bold = true
 
-        val tb = this@TitleBar
+        textHAlignment = HAlign.CENTER
 
-        overrideX { tb.renderPositionX + tb.renderWidth * 0.5 - textWidth * 0.5 }
-        overrideY { tb.renderPositionY + tb.renderHeight * 0.5 - textHeight * 0.5 }
+        onUpdate {
+            scale = NewCGui.fontScale
+        }
     }
 
     private var dragOffset: Vec2d? = null

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

@@ -100,9 +100,7 @@ open class Window(
         position = initialPosition
         size = initialSize
 
-        overrideWidth(animation.exp(::width, 0.8)::value)
-
-        overrideHeight {
+        overrideSize(animation.exp(::width, 0.8)::value) {
             titleBar.renderHeight + when (minimizing) {
                 Minimizing.Disabled -> targetHeight
                 Minimizing.Relative -> heightAnimation

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

@@ -1,6 +1,7 @@
 package com.lambda.newgui.component.window
 
 import com.lambda.graphics.animation.Animation.Companion.exp
+import com.lambda.gui.api.GuiEvent
 import com.lambda.module.modules.client.NewCGui
 import com.lambda.newgui.component.core.UIBuilder
 import com.lambda.newgui.component.layout.Layout
@@ -15,7 +16,10 @@ class WindowContent(
     private var dwheel = 0.0
     private var scrollOffset = 0.0
     private var rubberbandDelta = 0.0
+
     private var renderScrollOffset by animation.exp({ scrollOffset + rubberbandDelta }, 0.7)
+    private val scaleAnimation by animation.exp(1.0, 0.9, 0.7, ::scrolling)
+    private var scrolling = false
 
     init {
         overrideX { owner.titleBar.renderPositionX }
@@ -37,10 +41,11 @@ class WindowContent(
                 scrollOffset + dwheel
             } else 0.0
 
+            scrolling = dwheel != 0.0
             dwheel = 0.0
 
             val prevOffset = scrollOffset
-            val maxScroll = renderHeight - getContentHeight() - NewCGui.padding * 2
+            val maxScroll = renderHeight - getContentHeight() - NewCGui.padding
             scrollOffset = scrollOffset.coerceAtLeast(maxScroll).coerceAtMost(0.0)
 
             rubberbandDelta += prevOffset - scrollOffset

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

@@ -1,5 +1,6 @@
 package com.lambda.newgui.impl.clickgui
 
+import com.lambda.config.settings.comparable.BooleanSetting
 import com.lambda.graphics.animation.Animation.Companion.exp
 import com.lambda.module.Module
 import com.lambda.module.modules.client.NewCGui
@@ -8,10 +9,10 @@ import com.lambda.newgui.component.core.FilledRect
 import com.lambda.newgui.component.core.UIBuilder
 import com.lambda.newgui.component.layout.Layout
 import com.lambda.newgui.component.window.Window
+import com.lambda.newgui.impl.clickgui.settings.BooleanButton.Companion.booleanSetting
 import com.lambda.util.Mouse
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.lerp
-import com.lambda.util.math.multAlpha
 
 class ModuleLayout(
     owner: Layout,
@@ -20,8 +21,8 @@ class ModuleLayout(
     owner,
     module.name,
     Vec2d.ZERO, Vec2d.ZERO,
-    false, false, Minimizing.Relative, false,
-    AutoResize.Disabled, // ToDo: should be ForceEnabled, temporarily using this mode to set the height manually
+    false, true, Minimizing.Relative, false,
+    AutoResize.ForceEnabled,
     true
 ) {
     private val animation = animationTicker()
@@ -42,9 +43,10 @@ class ModuleLayout(
         with(titleBar) {
             with(textField) {
                 bold = false
+                textHAlignment = HAlign.LEFT
 
-                overrideX {
-                    titleBar.renderPositionX + (titleBar.renderHeight - textHeight) * 0.5
+                onUpdate {
+                    offsetX = NewCGui.fontOffset
                 }
             }
 
@@ -79,6 +81,16 @@ class ModuleLayout(
             val cursor = if (titleBar.isHovered) Mouse.Cursor.Pointer else Mouse.Cursor.Arrow
             cursorController.setCursor(cursor)
         }
+
+        content.apply {
+            module.settings.forEach { setting ->
+                //layoutOf(setting) doesn't work
+
+                when (setting) {
+                    is BooleanSetting -> booleanSetting(setting)
+                }
+            }
+        }
     }
 
     private fun FilledRect.correctRadius() {

common/src/main/kotlin/com/lambda/newgui/impl/clickgui/settings/BooleanButton.kt

@@ -0,0 +1,31 @@
+package com.lambda.newgui.impl.clickgui.settings
+
+import com.lambda.config.settings.comparable.BooleanSetting
+import com.lambda.module.modules.client.NewCGui
+import com.lambda.newgui.component.core.TextField.Companion.textField
+import com.lambda.newgui.component.core.UIBuilder
+import com.lambda.newgui.component.layout.Layout
+
+class BooleanButton(
+    owner: Layout,
+    val setting: BooleanSetting
+) : Layout(owner, true, true) {
+    init {
+        overrideSize(owner::renderWidth, NewCGui::settingsHeight)
+
+        textField {
+            text = setting.name
+            scale = NewCGui.fontScale * 0.95
+            offsetX = NewCGui.fontOffset
+        }
+    }
+
+    companion object {
+        /**
+         * Creates a [BooleanButton] - visual representation of the [BooleanSetting]
+         */
+        @UIBuilder
+        fun Layout.booleanSetting(setting: BooleanSetting) =
+            BooleanButton(this, setting).apply(children::add)
+    }
+}