Renderer rewroriette

Author: bladekt

common/src/main/kotlin/com/lambda/graphics/renderer/IRenderEntry.kt

@@ -1,89 +1,15 @@
 package com.lambda.graphics.renderer
 
 import com.lambda.graphics.buffer.vao.VAO
-import com.lambda.graphics.gl.Matrices
-import com.lambda.graphics.shader.Shader
-import com.lambda.util.math.Vec2d
-import kotlinx.coroutines.*
-import kotlin.properties.Delegates
+import com.lambda.graphics.buffer.vao.vertex.VertexAttrib
+import com.lambda.graphics.buffer.vao.vertex.VertexMode
 
-abstract class Renderer <T: IRenderEntry<T>> (
-    protected val shader: Shader
-) : IRenderer<T> {
-    private val entrySet = mutableSetOf<T>()
-    protected var rebuild = false
-    private var destroyed = false
+abstract class Renderer(drawMode: VertexMode, attribGroup: VertexAttrib.Group) {
+    protected val vao = VAO(drawMode, attribGroup)
 
-    val asRenderer get() = this as IRenderer<T>
-
-    // Optimization tweak to reduce build calls when whole renderer moves
-    // Instead of rebuilding all entries you translate the matrix
-    var matrixOffset = Vec2d.ZERO
-
-    abstract val vao: VAO
-    protected abstract fun newEntry(block: T.() -> Unit): T
-
-    override fun build(block: T.() -> Unit): T {
-        return newEntry(block).process(entrySet::add)
-    }
-
-    override fun remove(entry: T): T {
-        return entry.process(entrySet::remove)
-    }
-
-    override fun render() {
-        if (destroyed) return
-
-        if (rebuild) {
-            rebuild = false
-
-            vao.clear()
-            entrySet.forEach { it.build(vao) }
-            vao.upload()
-        }
-
-        Matrices.push()
-        Matrices.translate(matrixOffset.x, matrixOffset.y, 0.0)
-
-        shader.use()
-        preRender()
+    open fun render() {
+        vao.upload()
         vao.render()
-
-        Matrices.pop()
-    }
-
-    protected open fun preRender() {}
-
-    override fun update() {
-        if (destroyed) return
-        entrySet.forEach(IRenderEntry<T>::update)
-    }
-
-    override fun clear() {
-        if (destroyed) return
-
-        entrySet.clear()
         vao.clear()
     }
-
-    override fun destroy() {
-        if (destroyed) return
-
-        entrySet.clear()
-        vao.destroy()
-        destroyed = true
-    }
-
-    private fun T.process(action: T.() -> Unit): T {
-        this.apply(action)
-        rebuild = true
-
-        return this
-    }
-
-    fun <T> field(initValue: T) =
-        Delegates.observable(initValue) { _, prev: T, curr: T ->
-            if (prev == curr) return@observable
-            rebuild = true
-        }
 }

common/src/main/kotlin/com/lambda/graphics/renderer/IRenderer.kt

@@ -1,12 +1,12 @@
-package com.lambda.graphics.renderer.immediate
+package com.lambda.graphics.renderer.gui
 
-import com.lambda.Lambda.mc
+import com.lambda.Lambda
 import com.lambda.graphics.RenderMain
 import com.lambda.graphics.buffer.vao.VAO
 import com.lambda.graphics.buffer.vao.vertex.VertexAttrib
 import com.lambda.graphics.buffer.vao.vertex.VertexMode
 import com.lambda.graphics.shader.Shader
-import com.lambda.graphics.texture.TextureUtils.bindTexture
+import com.lambda.graphics.texture.TextureUtils
 import com.lambda.util.math.Rect
 import com.lambda.util.math.Vec2d
 
@@ -41,11 +41,14 @@ object BlurPostProcessor {
             )
 
             shader.use()
-            shader["u_Direction"] = direction / Vec2d(mc.window.framebufferWidth, mc.window.framebufferHeight)
+            shader["u_Direction"] = direction / Vec2d(
+                Lambda.mc.window.framebufferWidth,
+                Lambda.mc.window.framebufferHeight
+            )
             shader["u_BlurLevel"] = level
             shader["u_Alpha"] = alpha
 
-            bindTexture(mc.framebuffer.colorAttachment)
+            TextureUtils.bindTexture(Lambda.mc.framebuffer.colorAttachment)
             upload()
             render()
             clear()