Fancy design

Author: Blade-kt

common/src/main/kotlin/com/lambda/graphics/animation/Animation.kt

@@ -52,7 +52,7 @@ class Animation(initialValue: Double, val update: (Double) -> Double) {
         fun AnimationTicker.exp(min: Double, max: Double, speed: Double, flag: () -> Boolean) =
             exp({ min }, { max }, { speed }, flag)
 
-        fun AnimationTicker.exp(target: () -> Double, speed: Double) =
+        fun AnimationTicker.exp(speed: Double, target: () -> Double) =
             exp(target, target, { speed }, { true })
 
         fun AnimationTicker.exp(min: () -> Double, max: () -> Double, speed: () -> Double, flag: () -> Boolean) =

common/src/main/kotlin/com/lambda/graphics/buffer/VertexPipeline.kt

@@ -39,13 +39,14 @@ import java.awt.Color
 class VertexPipeline(
     private val mode: VertexMode,
     attributes: VertexAttrib.Group,
+    usage: Int = GL_DYNAMIC_DRAW
 ) : IRenderContext {
     private val stride = attributes.stride
     private val size = stride * mode.indicesCount
 
     private val vao = VertexArray()
-    private val vbo = VertexBuffer(mode, attributes)
-    private val ebo = ElementBuffer(mode)
+    private val vbo = VertexBuffer(mode, attributes, usage)
+    private val ebo = ElementBuffer(mode, usage)
 
     private var vertices = byteBuffer(size * 1.kibibyte)
     private var verticesPointer = address(vertices)

common/src/main/kotlin/com/lambda/graphics/buffer/vertex/ElementBuffer.kt

@@ -23,10 +23,10 @@ import com.lambda.graphics.gl.kibibyte
 import org.lwjgl.opengl.GL30C.*
 import java.nio.ByteBuffer
 
-class ElementBuffer(mode: VertexMode) :
-    Buffer(buffers = 1)
-{
-    override val usage: Int = GL_DYNAMIC_DRAW
+class ElementBuffer(
+    mode: VertexMode,
+    override val usage: Int = GL_DYNAMIC_DRAW,
+) : Buffer(buffers = 1) {
     override val target: Int = GL_ELEMENT_ARRAY_BUFFER
     override val access: Int = GL_MAP_WRITE_BIT
 

common/src/main/kotlin/com/lambda/graphics/buffer/vertex/VertexBuffer.kt

@@ -27,8 +27,8 @@ import java.nio.ByteBuffer
 class VertexBuffer(
     mode: VertexMode,
     attributes: VertexAttrib.Group,
-) : Buffer(buffers = 1) {
     override val usage: Int = GL_DYNAMIC_DRAW
+) : Buffer(buffers = 1) {
     override val target: Int = GL_ARRAY_BUFFER
     override val access: Int = GL_MAP_WRITE_BIT
 

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

@@ -60,7 +60,7 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
         position: Vec2d = Vec2d.ZERO,
         color: Color = Color.WHITE,
         scale: Double = 1.0,
-        shadow: Boolean = RenderSettings.shadow,
+        shadow: Boolean = true,
         parseEmoji: Boolean = LambdaMoji.isEnabled
     ) = render {
         shader["u_FontTexture"] = 0
@@ -213,7 +213,7 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
 
                     val glyph = chars[char] ?: return@forEach
 
-                    if (shadow) drawGlyph(glyph, shadowColor, true)
+                    if (shadow && RenderSettings.shadow) drawGlyph(glyph, shadowColor, true)
                     drawGlyph(glyph, color)
                 }
             } else {

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

@@ -28,7 +28,7 @@ object FilledRectRenderer : AbstractGUIRenderer(
     VertexAttrib.Group.RECT_FILLED, shader("renderer/rect_filled")
 ) {
     private const val MIN_SIZE = 0.5
-    private const val MIN_ALPHA = 3
+    private const val MIN_ALPHA = 1
 
     fun filledRect(
         rect: Rect,

common/src/main/kotlin/com/lambda/gui/component/core/FilledRect.kt

@@ -18,6 +18,7 @@
 package com.lambda.gui.component.core
 
 import com.lambda.graphics.renderer.gui.rect.FilledRectRenderer.filledRect
+import com.lambda.gui.component.core.FilledRect.Companion.rectBehind
 import com.lambda.gui.component.layout.Layout
 import com.lambda.util.math.Rect
 import java.awt.Color
@@ -97,7 +98,26 @@ class FilledRect(
          * Creates a [FilledRect] component - layout-based rect representation
          */
         @UIBuilder
-        fun Layout.rect(block: FilledRect.() -> Unit = {}) =
-            FilledRect(this).apply(children::add).apply(block)
+        fun Layout.rect(
+            block: FilledRect.() -> Unit = {}
+        ) = FilledRect(this).apply(children::add).apply(block)
+
+        /**
+         * Adds a [FilledRect] behind given [layout]
+         */
+        @UIBuilder
+        fun Layout.rectBehind(
+            layout: Layout,
+            block: FilledRect.() -> Unit = {}
+        ) = FilledRect(this).relativeLayout(this, layout, false).apply(block)
+
+        /**
+         * Adds a [FilledRect] over given [layout]
+         */
+        @UIBuilder
+        fun Layout.rectOver(
+            layout: Layout,
+            block: FilledRect.() -> Unit = {}
+        ) = FilledRect(this).relativeLayout(this, layout, true).apply(block)
     }
 }

common/src/main/kotlin/com/lambda/gui/component/core/OutlineRect.kt

@@ -18,6 +18,7 @@
 package com.lambda.gui.component.core
 
 import com.lambda.graphics.renderer.gui.rect.OutlineRectRenderer.outlineRect
+import com.lambda.gui.component.core.FilledRect.Companion.rectBehind
 import com.lambda.gui.component.layout.Layout
 import java.awt.Color
 
@@ -62,10 +63,29 @@ class OutlineRect(
 
     companion object {
         /**
-         * Creates a [OutlineRect] component - layout-based rect representation
+         * Creates an [OutlineRect] component - layout-based rect representation
          */
         @UIBuilder
-        fun Layout.outline(block: OutlineRect.() -> Unit = {}) =
-            OutlineRect(this).apply(children::add).apply(block)
+        fun Layout.outline(
+            block: OutlineRect.() -> Unit = {}
+        ) = OutlineRect(this).apply(children::add).apply(block)
+
+        /**
+         * Adds a [OutlineRect] behind given [layout]
+         */
+        @UIBuilder
+        fun Layout.outlineBehind(
+            layout: Layout,
+            block: OutlineRect.() -> Unit = {}
+        ) = OutlineRect(this).relativeLayout(this, layout, false).apply(block)
+
+        /**
+         * Creates an [OutlineRect] component - layout-based rect representation
+         */
+        @UIBuilder
+        fun Layout.outlineOver(
+            layout: Layout,
+            block: OutlineRect.() -> Unit = {}
+        ) = OutlineRect(this).relativeLayout(this, layout, true).apply(block)
     }
 }

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

@@ -21,6 +21,7 @@ import com.lambda.graphics.renderer.gui.font.FontRenderer
 import com.lambda.graphics.renderer.gui.font.FontRenderer.drawString
 import com.lambda.gui.component.HAlign
 import com.lambda.gui.component.VAlign
+import com.lambda.gui.component.core.OutlineRect.Companion.outlineBehind
 import com.lambda.gui.component.layout.Layout
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.lerp
@@ -62,5 +63,23 @@ class TextField(
         fun Layout.textField(
             block: TextField.() -> Unit = {}
         ) = TextField(this).apply(children::add).apply(block)
+
+        /**
+         * Adds a [TextField] behind given [layout]
+         */
+        @UIBuilder
+        fun Layout.textFieldBehind(
+            layout: Layout,
+            block: TextField.() -> Unit = {}
+        ) = TextField(this).relativeLayout(this, layout, false).apply(block)
+
+        /**
+         * Adds a [TextField] over given [layout]
+         */
+        @UIBuilder
+        fun Layout.textFieldOver(
+            layout: Layout,
+            block: TextField.() -> Unit = {}
+        ) = TextField(this).relativeLayout(this, layout, true).apply(block)
     }
 }

common/src/main/kotlin/com/lambda/gui/component/core/UIBuilder.kt

@@ -17,6 +17,9 @@
 
 package com.lambda.gui.component.core
 
+import com.lambda.gui.component.layout.Layout
+import com.lambda.util.math.MathUtils.toInt
+
 @DslMarker
 annotation class UIBuilder
 
@@ -25,3 +28,13 @@ annotation class LayoutBuilder
 
 @DslMarker
 annotation class UIRenderPr0p3rty
+
+fun <T : Layout> T.relativeLayout(
+    owner: Layout,
+    base: Layout,
+    next: Boolean
+) = apply {
+    val index = owner.children.indexOf(base)
+    check(index != -1 && base.owner == owner) { "Given layout belongs to different owner" }
+    owner.children.add(index + next.toInt(), this)
+}