Renderer cleanup

Author: bladekt

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

@@ -13,7 +13,7 @@ object Scissor {
     private var stack = ArrayDeque<Rect>()
 
     fun scissor(rect: Rect, block: () -> Unit) {
-        // clamp corners so children scissor box can't overlap parent
+        // clamp corners so children scissor boxes can't overlap parent
         val processed = stack.lastOrNull()?.let(rect::clamp) ?: rect
         registerScissor(processed, block)
     }
@@ -25,7 +25,7 @@ object Scissor {
         block()
 
         stack.removeLast()
-        stack.lastOrNull().apply(::scissor)
+        scissor(stack.lastOrNull())
     }
 
     private fun scissor(entry: Rect?) {

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

@@ -1,8 +1,8 @@
 package com.lambda.graphics.renderer.gui.font
 
+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.renderer.Renderer
 import com.lambda.graphics.renderer.gui.font.glyph.GlyphInfo
 import com.lambda.graphics.shader.Shader
 import com.lambda.module.modules.client.FontSettings
@@ -14,7 +14,9 @@ import java.awt.Color
 class FontRenderer(
     private val font: LambdaFont,
     private val emojis: LambdaMoji
-) : Renderer(VertexMode.TRIANGLES, VertexAttrib.Group.FONT) {
+) {
+    private val vao = VAO(VertexMode.TRIANGLES, VertexAttrib.Group.FONT)
+
     private val scaleMultiplier = 1.0
     private val emojiRegex = Regex(":[a-zA-Z0-9_]+:")
 
@@ -144,14 +146,16 @@ class FontRenderer(
         )
     }
 
-    override fun render() {
+    fun render() {
         shader.use()
         shader["u_EmojiTexture"] = 1
 
         font.glyphs.bind()
         emojis.glyphs.bind()
 
-        super.render()
+        vao.upload()
+        vao.render()
+        vao.clear()
     }
 
     companion object {

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

@@ -1,9 +1,9 @@
 package com.lambda.graphics.renderer.gui.rect
 
-import com.lambda.Lambda.mc
+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.renderer.Renderer
 import com.lambda.graphics.shader.Shader
 import com.lambda.module.modules.client.GuiSettings
 import com.lambda.util.math.Vec2d
@@ -12,16 +12,19 @@ import org.lwjgl.glfw.GLFW.glfwGetTime
 abstract class AbstractRectRenderer(
     attribGroup: VertexAttrib.Group,
     val shader: Shader
-) : Renderer(VertexMode.TRIANGLES, attribGroup) {
-    override fun render() {
+) {
+    protected val vao = VAO(VertexMode.TRIANGLES, attribGroup)
+
+    open fun render() {
         shader.use()
         shader["u_Time"] = glfwGetTime() * GuiSettings.colorSpeed * 5.0
         shader["u_Color1"] = GuiSettings.shadeColor1
         shader["u_Color2"] = GuiSettings.shadeColor2
 
-        val screen = Vec2d(mc.window.framebufferWidth, mc.window.framebufferHeight)
-        val size = Vec2d(GuiSettings.colorWidth, GuiSettings.colorHeight)
-        shader["u_Size"] = screen / size
-        super.render()
+        shader["u_Size"] = RenderMain.screenSize /Vec2d(GuiSettings.colorWidth, GuiSettings.colorHeight)
+
+        vao.upload()
+        vao.render()
+        vao.clear()
     }
 }

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

@@ -59,7 +59,6 @@ class FilledRectRenderer : AbstractRectRenderer(
 
     override fun render() {
         shader.use()
-
         super.render()
     }
 

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

@@ -15,15 +15,4 @@ abstract class Texture {
     protected abstract fun init()
 
     open fun bind(slot: Int = 0) = bindTexture(id, slot)
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Texture
-
-        return id == other.id
-    }
-
-    override fun hashCode() = id
 }