Merge branch 'main' into shortbuffer

gergelydaniel · Dec 29, 2023 · 3b5c92a · 3b5c92a
2 parents b5ceec7 + f5311eb
commit 3b5c92a
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 0 deletions.
diff --git a/.idea/kgl.iml b/.idea/kgl.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/kgl-android/src/main/kotlin/com/danielgergely/kgl/KglAndroid.kt b/kgl-android/src/main/kotlin/com/danielgergely/kgl/KglAndroid.kt
@@ -203,6 +203,8 @@ object KglAndroid : Kgl {
 
     override fun drawArrays(mode: Int, first: Int, count: Int) = GL.glDrawArrays(mode, first, count)
 
+    override fun drawElements(mode: Int, count: Int, type: Int) = GL.glDrawElements(mode, count, type, 0)
+
     override fun getError(): Int = GL.glGetError()
     override fun finish() = GL.glFinish()
 

diff --git a/kgl-ios/src/nativeMain/kotlin/com.danielgergely.kgl/KglIos.kt b/kgl-ios/src/nativeMain/kotlin/com.danielgergely.kgl/KglIos.kt
@@ -362,6 +362,10 @@ object KglIos : Kgl {
         glDrawArrays(mode.toUInt(), first, count)
     }
 
+    override fun drawElements(mode: Int, count: Int, type: Int) {
+        glDrawElements(mode.toUInt(), count, type.toUInt(), null)
+    }
+
     override fun getError(): Int {
         return glGetError().toInt()
     }

diff --git a/kgl-jogl/src/main/kotlin/com/danielgergely/kgl/KglJogl.kt b/kgl-jogl/src/main/kotlin/com/danielgergely/kgl/KglJogl.kt
@@ -260,6 +260,7 @@ class KglJogl(private val gl: GL) : Kgl {
         gl.glDeleteVertexArrays(1, intArrayOf(vertexArrayObject), 0)
 
     override fun drawArrays(mode: Int, first: Int, count: Int) = gl.glDrawArrays(mode, first, count)
+    override fun drawElements(mode: Int, count: Int, type: Int) = gl.glDrawElements(mode, count, type, 0)
 
     override fun getError(): Int = gl.glGetError()
     override fun finish() = gl.glFinish()

diff --git a/kgl-lwjgl/src/main/kotlin/com/danielgergely/kgl/KglLwjgl.kt b/kgl-lwjgl/src/main/kotlin/com/danielgergely/kgl/KglLwjgl.kt
@@ -119,6 +119,10 @@ object KglLwjgl : Kgl {
         GL.glDrawArrays(mode, first, count)
     }
 
+    override fun drawElements(mode: Int, count: Int, type: Int) {
+        GL.glDrawElements(mode, count, type, 0)
+    }
+
     override fun getError(): Int {
         return GL.glGetError()
     }

diff --git a/kgl/src/commonMain/kotlin/com/danielgergely/kgl/DebugKgl.kt b/kgl/src/commonMain/kotlin/com/danielgergely/kgl/DebugKgl.kt
@@ -464,6 +464,13 @@ public class DebugKgl(
         return ret
     }
 
+    override fun drawElements(mode: Int, count: Int, type: Int) {
+        runBefore("drawElements")
+        val ret = kgl.drawElements(mode, count, type)
+        runAfter("drawElements")
+        return ret
+    }
+
     override fun getError(): Int {
         runBefore("getError")
         val ret = kgl.getError()

diff --git a/kgl/src/commonMain/kotlin/com/danielgergely/kgl/Kgl.kt b/kgl/src/commonMain/kotlin/com/danielgergely/kgl/Kgl.kt
@@ -95,6 +95,7 @@ public interface Kgl {
     public fun deleteVertexArray(vertexArrayObject: VertexArrayObject)
 
     public fun drawArrays(mode: Int, first: Int, count: Int)
+    public fun drawElements(mode: Int, count: Int, type: Int)
 
     public fun getError(): Int
     public fun finish()

diff --git a/...sMain/kotlin/com/danielgergely/kgl/Kgl.kt → ...ain/kotlin/com/danielgergely/kgl/KglJs.kt b/...sMain/kotlin/com/danielgergely/kgl/Kgl.kt → ...ain/kotlin/com/danielgergely/kgl/KglJs.kt
@@ -190,6 +190,8 @@ public class KglJs(private val gl: WebGLRenderingContext) : Kgl {
 
     public override fun drawArrays(mode: Int, first: Int, count: Int): Unit = gl.drawArrays(mode, first, count)
 
+    public override fun drawElements(mode: Int, count: Int, type: Int): Unit = gl.drawElements(mode, count, type, 0)
+
     public override fun getError(): Int = gl.getError()
     public override fun finish(): Unit = gl.finish()