Buffer bind block

Author: emyfops

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

@@ -113,19 +113,23 @@ abstract class Buffer(
     private val bufferIds = IntArray(buffers)
 
     /**
-     * Binds the buffer id to the [target].
+     * Execute the [block] in a bound context
      */
-    open fun bind(id: Int) = glBindBuffer(target, id)
+    fun bind(block: Buffer.() -> Unit) {
+        bind()
+        block(this)
+        bind(0)
+    }
 
     /**
-     * Binds current the buffer [index] to the [target].
+     * Binds the buffer id to the [target].
      */
-    fun bind() = bind(bufferAt(index))
+    open fun bind(id: Int) = glBindBuffer(target, id)
 
     /**
-     * Returns the id of the buffer based on the index.
+     * Binds current the buffer [index] to the [target].
      */
-    fun bufferAt(index: Int) = bufferIds[index]
+    fun bind() = bind(bufferIds[index])
 
     /**
      * Swaps the buffer [index] if [buffers] is greater than 1.

common/src/main/kotlin/com/lambda/graphics/buffer/pixel/PixelBuffer.kt

@@ -18,9 +18,7 @@
 package com.lambda.graphics.buffer.pixel
 
 import com.lambda.graphics.buffer.Buffer
-import com.lambda.graphics.gl.putTo
 import com.lambda.graphics.texture.Texture
-import com.lambda.threading.runSafeGameScheduled
 import com.lambda.util.math.MathUtils.toInt
 import org.lwjgl.opengl.GL45C.*
 import java.nio.ByteBuffer

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

@@ -37,17 +37,15 @@ class VertexArray(
         indicesSize: Long,
         indicesPointer: Long,
         verticesOffset: Int
-    ) {
-        bind()
-        glDrawElementsBaseVertex(
-            vertexMode.mode,
-            indicesSize.toInt() / UInt.SIZE_BYTES,
-            GL_UNSIGNED_INT,
-            indicesPointer,
-            verticesOffset / attributes.stride
-        )
-        bind(0)
-    }
+    ) = bind {
+            glDrawElementsBaseVertex(
+                vertexMode.mode,
+                indicesSize.toInt() / UInt.SIZE_BYTES,
+                GL_UNSIGNED_INT,
+                indicesPointer,
+                verticesOffset / attributes.stride
+            )
+        }
 
     override fun map(size: Long, offset: Long, block: (ByteBuffer) -> Unit) = throw UnsupportedOperationException()
     override fun upload(data: ByteBuffer, offset: Long) = throw UnsupportedOperationException()

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

@@ -95,11 +95,7 @@ class PersistentBuffer(
         cacheSize = 0
     }
 
-    fun use(block: () -> Unit) {
-        glBuffer.bind()
-        block()
-        glBuffer.bind(0)
-    }
+    fun use(block: () -> Unit) = glBuffer.bind { block() }
 
     private fun memcmp(a: ByteBuffer, b: ByteBuffer, pointer: Int, size: Int): Boolean {
         for (i in pointer..<(pointer + size)) {

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

@@ -145,8 +145,6 @@ class VertexPipeline(
     }
 
     init {
-        vao.bind()
-        vbo.use(attributes::link)
-        vao.bind(0)
+        vao.bind { vbo.use(attributes::link) }
     }
 }