Skip to content

Commit f5311eb

Browse files
committed
Add drawElements
1 parent cb78d7a commit f5311eb

File tree

9 files changed

+68
-0
lines changed

9 files changed

+68
-0
lines changed

.idea/kgl.iml

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kgl-android/src/main/kotlin/com/danielgergely/kgl/KglAndroid.kt

+2
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ object KglAndroid : Kgl {
203203

204204
override fun drawArrays(mode: Int, first: Int, count: Int) = GL.glDrawArrays(mode, first, count)
205205

206+
override fun drawElements(mode: Int, count: Int, type: Int) = GL.glDrawElements(mode, count, type, 0)
207+
206208
override fun getError(): Int = GL.glGetError()
207209
override fun finish() = GL.glFinish()
208210

kgl-ios/src/nativeMain/kotlin/com.danielgergely.kgl/KglIos.kt

+4
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,10 @@ object KglIos : Kgl {
361361
glDrawArrays(mode.toUInt(), first, count)
362362
}
363363

364+
override fun drawElements(mode: Int, count: Int, type: Int) {
365+
glDrawElements(mode.toUInt(), count, type.toUInt(), null)
366+
}
367+
364368
override fun getError(): Int {
365369
return glGetError().toInt()
366370
}

kgl-jogl/src/main/kotlin/com/danielgergely/kgl/KglJogl.kt

+1
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ class KglJogl(private val gl: GL) : Kgl {
260260
gl.glDeleteVertexArrays(1, intArrayOf(vertexArrayObject), 0)
261261

262262
override fun drawArrays(mode: Int, first: Int, count: Int) = gl.glDrawArrays(mode, first, count)
263+
override fun drawElements(mode: Int, count: Int, type: Int) = gl.glDrawElements(mode, count, type, 0)
263264

264265
override fun getError(): Int = gl.glGetError()
265266
override fun finish() = gl.glFinish()

kgl-lwjgl/src/main/kotlin/com/danielgergely/kgl/KglLwjgl.kt

+4
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ object KglLwjgl : Kgl {
119119
GL.glDrawArrays(mode, first, count)
120120
}
121121

122+
override fun drawElements(mode: Int, count: Int, type: Int) {
123+
GL.glDrawElements(mode, count, type, 0)
124+
}
125+
122126
override fun getError(): Int {
123127
return GL.glGetError()
124128
}

kgl/src/commonMain/kotlin/com/danielgergely/kgl/DebugKgl.kt

+7
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,13 @@ public class DebugKgl(
464464
return ret
465465
}
466466

467+
override fun drawElements(mode: Int, count: Int, type: Int) {
468+
runBefore("drawElements")
469+
val ret = kgl.drawElements(mode, count, type)
470+
runAfter("drawElements")
471+
return ret
472+
}
473+
467474
override fun getError(): Int {
468475
runBefore("getError")
469476
val ret = kgl.getError()

kgl/src/commonMain/kotlin/com/danielgergely/kgl/Kgl.kt

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public interface Kgl {
9595
public fun deleteVertexArray(vertexArrayObject: VertexArrayObject)
9696

9797
public fun drawArrays(mode: Int, first: Int, count: Int)
98+
public fun drawElements(mode: Int, count: Int, type: Int)
9899

99100
public fun getError(): Int
100101
public fun finish()

kgl/src/jsMain/kotlin/com/danielgergely/kgl/Kgl.kt kgl/src/jsMain/kotlin/com/danielgergely/kgl/KglJs.kt

+2
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ public class KglJs(private val gl: WebGLRenderingContext) : Kgl {
190190

191191
public override fun drawArrays(mode: Int, first: Int, count: Int): Unit = gl.drawArrays(mode, first, count)
192192

193+
public override fun drawElements(mode: Int, count: Int, type: Int): Unit = gl.drawElements(mode, count, type, 0)
194+
193195
public override fun getError(): Int = gl.getError()
194196
public override fun finish(): Unit = gl.finish()
195197

0 commit comments

Comments
 (0)