Working immediate mode ui

Author: blade1234567

common/src/main/kotlin/com/lambda/event/events/GuiEvent.kt

@@ -26,6 +26,7 @@ sealed class GuiEvent : Event {
     data object Show : GuiEvent()
     data object Hide : GuiEvent()
     data object Tick : GuiEvent()
+    data object Update : GuiEvent()
     data object Render : GuiEvent()
 
     class KeyPress(val key: KeyCode) : GuiEvent()

common/src/main/kotlin/com/lambda/event/events/RenderEvent.kt

@@ -21,7 +21,6 @@ import com.lambda.Lambda.mc
 import com.lambda.event.Event
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
-import com.lambda.graphics.pipeline.UIPipeline
 import com.lambda.graphics.renderer.esp.global.DynamicESP
 import com.lambda.graphics.renderer.esp.global.StaticESP
 import com.lambda.util.math.Vec2d

common/src/main/kotlin/com/lambda/graphics/RenderMain.kt

@@ -23,7 +23,6 @@ import com.lambda.event.events.RenderEvent
 import com.lambda.graphics.gl.GlStateUtils.setupGL
 import com.lambda.graphics.gl.Matrices
 import com.lambda.graphics.gl.Matrices.resetMatrices
-import com.lambda.graphics.pipeline.UIPipeline
 import com.lambda.module.modules.client.GuiSettings
 import com.lambda.util.math.Vec2d
 import com.mojang.blaze3d.systems.RenderSystem.getProjectionMatrix
@@ -35,22 +34,19 @@ object RenderMain {
     val projModel get() = Matrix4f(projectionMatrix).mul(modelViewMatrix)
 
     var screenSize = Vec2d.ZERO
+    var scaleFactor = 1.0
 
     @JvmStatic
     fun render2D() {
         resetMatrices(Matrix4f().translate(0f, 0f, -3000f))
 
         setupGL {
-            UIPipeline.reset()
-
             rescale(1.0)
             RenderEvent.GUI.Fixed().post()
 
             rescale(GuiSettings.scale)
             RenderEvent.GUI.HUD(GuiSettings.scale).post()
             RenderEvent.GUI.Scaled(GuiSettings.scale).post()
-
-            UIPipeline.render()
         }
     }
 
@@ -72,6 +68,8 @@ object RenderMain {
         val scaledHeight = height / factor
 
         screenSize = Vec2d(scaledWidth, scaledHeight)
+        scaleFactor = factor
+
         projectionMatrix.setOrtho(0f, scaledWidth.toFloat(), scaledHeight.toFloat(), 0f, 1000f, 21000f)
     }
 }

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

@@ -121,7 +121,12 @@ abstract class Buffer(
     /**
      * Binds current the buffer [index] to the [target]
      */
-    fun bind() = bind(bufferIds[index])
+    fun bind() = bind(bufferAt(index))
+
+    /**
+     * Returns the id of the buffer based on the index
+     */
+    fun bufferAt(index: Int) = bufferIds[index]
 
     /**
      * Swaps the buffer [index] if [buffers] is greater than 1

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

@@ -32,6 +32,7 @@ import com.lambda.graphics.gl.Memory.vector2f
 import com.lambda.graphics.gl.Memory.vector3f
 import com.lambda.graphics.gl.kibibyte
 import org.joml.Vector4d
+import org.lwjgl.opengl.GL15C
 import org.lwjgl.opengl.GL20C.*
 import java.awt.Color
 
@@ -183,6 +184,10 @@ class VertexPipeline(
         uploadedIndices = 0
     }
 
+    fun finalize() {
+
+    }
+
     init {
         // All the buffers have been generated, all we have to
         // do now it bind them correctly and populate them

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

@@ -41,26 +41,19 @@ enum class VertexAttrib(
         FONT(
             Vec3, // pos
             Vec2, // uv
-            Vec2, Vec2, // scissor test bounds
             Color
         ),
 
         RECT_FILLED(
             Vec3, // pos
             Vec2, // uv
-            Vec2, // size
-            Vec2, Vec2, // roundL, roundR
-            Float, // shade
-            Vec2, Vec2, // scissor test bounds
             Color
         ),
 
         RECT_OUTLINE(
             Vec3, // pos
             Vec2, // uv
             Float, // alpha
-            Float, // shade
-            Vec2, Vec2, // scissor test bounds
             Color
         ),
 

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

@@ -38,6 +38,11 @@ object Matrices {
      */
     var vertexTransformer: Matrix4d? = null
 
+    /**
+     * An optional vec3 offset for applying vertex transformations.
+     */
+    var vertexOffset: Vec3d? = null
+
     /**
      * Executes a block of code within the context of a new matrix.
      * The current matrix is pushed onto the stack before the block executes and popped after the block completes.
@@ -51,7 +56,7 @@ object Matrices {
      */
     fun push(block: Matrices.() -> Unit) {
         push()
-        block()
+        block.invoke(this)
         pop()
     }
 
@@ -146,6 +151,20 @@ object Matrices {
         vertexTransformer = null
     }
 
+    /**
+     * Temporarily sets a vertex offset vector for the duration of a block.
+     *
+     * Use this to avoid precision loss when using matrices while being on huge coordinates.
+     *
+     * @param offset The transformation offset to apply to vertices.
+     * @param block The block of code to execute with the transformation applied.
+     */
+    fun withVertexOffset(offset: Vec3d, block: () -> Unit) {
+        vertexOffset = offset
+        block()
+        vertexOffset = null
+    }
+
     /**
      * Builds a world projection matrix for a given position, scale, and rotation mode.
      *

common/src/main/kotlin/com/lambda/graphics/pipeline/ScissorAdapter.kt

@@ -17,71 +17,43 @@
 
 package com.lambda.graphics.pipeline
 
-import com.lambda.graphics.renderer.gui.font.core.GlyphInfo
+import com.lambda.Lambda.mc
+import com.lambda.graphics.RenderMain
+import com.lambda.util.math.MathUtils.ceilToInt
+import com.lambda.util.math.MathUtils.floorToInt
 import com.lambda.util.math.Rect
-import com.lambda.util.math.transform
+import com.mojang.blaze3d.systems.RenderSystem.disableScissor
+import com.mojang.blaze3d.systems.RenderSystem.enableScissor
 
 object ScissorAdapter {
     private var stack = ArrayDeque<Rect>()
-    private val scissorInstance = ScissorRect()
 
     fun scissor(rect: Rect, block: () -> Unit) {
-        // clamp corners so children scissor boxes can't overlap parent
         val processed = stack.lastOrNull()?.let(rect::clamp) ?: rect
 
-        // push the stack
         stack.add(processed)
+        scissorRect(processed)
 
-        // do render tasks
         block()
 
-        // pop the stack
         stack.removeLast()
+        stack.lastOrNull()?.let { scissorRect(it) } ?: disableScissor()
     }
 
-    fun scissorTest(x1: Double, y1: Double, x2: Double, y2: Double, glyph: GlyphInfo? = null): ScissorRect {
-        reset()
+    private fun scissorRect(rect: Rect) {
+        val pos1 = rect.leftTop * RenderMain.scaleFactor
+        val pos2 = rect.rightBottom * RenderMain.scaleFactor
 
-        run {
-            val entry = stack.lastOrNull() ?: return@run
+        val width = pos2.x - pos1.x
+        val height = pos2.y - pos1.y
 
-            val width = x2 - x1
-            val height = y2 - y1
+        val y = mc.window.framebufferHeight - pos1.y - height
 
-            if (width <= 0 || height <= 0) {
-                nullify()
-                return@run
-            }
-
-            val si = scissorInstance
-
-            si.x1 = transform(entry.left, x1, x2, glyph?.u1 ?: 0.0, glyph?.u2 ?: 1.0)
-            si.y1 = transform(entry.top, y1, y2, glyph?.v1 ?: 0.0, glyph?.v2 ?: 1.0)
-            si.x2 = transform(entry.right, x1, x2, glyph?.u1 ?: 0.0, glyph?.u2 ?: 1.0)
-            si.y2 = transform(entry.bottom, y1, y2, glyph?.v1 ?: 0.0, glyph?.v2 ?: 1.0)
-        }
-
-        return scissorInstance
-    }
-
-    private fun reset() = scissorInstance.apply {
-        x1 = 0.0
-        y1 = 0.0
-        x2 = 1.0
-        y2 = 1.0
-    }
-
-    private fun nullify() = scissorInstance.apply {
-        x1 = 0.0
-        y1 = 0.0
-        x2 = 0.0
-        y2 = 0.0
-    }
-
-    class ScissorRect {
-        var x1 = 0.0
-        var y1 = 0.0
-        var x2 = 1.0
-        var y2 = 1.0
+        enableScissor(
+            pos1.x.floorToInt(),
+            y.floorToInt(),
+            width.ceilToInt(),
+            height.ceilToInt()
+        )
     }
 }

common/src/main/kotlin/com/lambda/graphics/pipeline/UIPipeline.kt

@@ -23,6 +23,7 @@ import com.lambda.graphics.buffer.vertex.attributes.VertexAttrib
 import com.lambda.graphics.buffer.vertex.attributes.VertexMode
 import com.lambda.graphics.gl.GlStateUtils
 import com.lambda.graphics.shader.Shader
+import com.lambda.graphics.shader.Shader.Companion.shader
 import com.lambda.module.modules.client.RenderSettings
 import com.lambda.util.extension.partialTicks
 
@@ -59,12 +60,12 @@ open class ESPRenderer(tickedMode: Boolean) {
     }
 
     companion object {
-        private val staticMode = Shader(
+        private val staticMode = shader(
             "renderer/pos_color",
             "renderer/box_static"
         ) to VertexAttrib.Group.STATIC_RENDERER
 
-        private val dynamicMode = Shader(
+        private val dynamicMode = shader(
             "renderer/pos_color",
             "renderer/box_dynamic"
         ) to VertexAttrib.Group.DYNAMIC_RENDERER