Skip to content

Commit ad6b71a

Browse files
committed
Bump to kgl 0.6.2.
1 parent 512fb52 commit ad6b71a

File tree

3 files changed

+71
-1
lines changed

3 files changed

+71
-1
lines changed

buildSrc/src/main/kotlin/Versions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object Versions {
77
const val dokka = "1.7.10"
88

99
// GL:
10-
const val kgl = "0.6.1"
10+
const val kgl = "0.6.2"
1111
const val jogl = "2.3.2"
1212
const val lwjgl = "3.3.1"
1313

src/commonMain/kotlin/baaahs/gl/KglTracer.kt

+35
Original file line numberDiff line numberDiff line change
@@ -327,21 +327,41 @@ class KglTracer(private val kgl: Kgl) : Kgl {
327327
return kgl.uniform1f(location, f)
328328
}
329329

330+
override fun uniform1fv(location: UniformLocation, value: FloatArray) {
331+
log("uniform1fv", location, value)
332+
return kgl.uniform1fv(location, value)
333+
}
334+
330335
override fun uniform1i(location: UniformLocation, i: Int) {
331336
log("uniform1i", location, i)
332337
return kgl.uniform1i(location, i)
333338
}
334339

340+
override fun uniform1iv(location: UniformLocation, value: IntArray) {
341+
log("uniform1iv", location, value)
342+
return kgl.uniform1iv(location, value)
343+
}
344+
335345
override fun uniform2f(location: UniformLocation, x: Float, y: Float) {
336346
log("uniform2f", location, x, y)
337347
return kgl.uniform2f(location, x, y)
338348
}
339349

350+
override fun uniform2fv(location: UniformLocation, value: FloatArray) {
351+
log("uniform2fv", location, value)
352+
return kgl.uniform2fv(location, value)
353+
}
354+
340355
override fun uniform2i(location: UniformLocation, x: Int, y: Int) {
341356
log("uniform2i", location, x, y)
342357
return kgl.uniform2i(location, x, y)
343358
}
344359

360+
override fun uniform2iv(location: UniformLocation, value: IntArray) {
361+
log("uniform2iv", location, value)
362+
return kgl.uniform2iv(location, value)
363+
}
364+
345365
override fun uniform3f(location: UniformLocation, x: Float, y: Float, z: Float) {
346366
log("uniform3f", location, x, y, z)
347367
return kgl.uniform3f(location, x, y, z)
@@ -357,16 +377,31 @@ class KglTracer(private val kgl: Kgl) : Kgl {
357377
return kgl.uniform3i(location, x, y, z)
358378
}
359379

380+
override fun uniform3iv(location: UniformLocation, value: IntArray) {
381+
log("uniform3iv", location, value)
382+
return kgl.uniform3iv(location, value)
383+
}
384+
360385
override fun uniform4f(location: UniformLocation, x: Float, y: Float, z: Float, w: Float) {
361386
log("uniform4f", location, x, y, z, w)
362387
return kgl.uniform4f(location, x, y, z, w)
363388
}
364389

390+
override fun uniform4fv(location: UniformLocation, value: FloatArray) {
391+
log("uniform4fv", location, value)
392+
return kgl.uniform4fv(location, value)
393+
}
394+
365395
override fun uniform4i(location: UniformLocation, x: Int, y: Int, z: Int, w: Int) {
366396
log("uniform4i", location, x, y, z, w)
367397
return kgl.uniform4i(location, x, y, z, w)
368398
}
369399

400+
override fun uniform4iv(location: UniformLocation, value: IntArray) {
401+
log("uniform4iv", location, value)
402+
return kgl.uniform4iv(location, value)
403+
}
404+
370405
override fun uniformMatrix3fv(location: UniformLocation, transpose: Boolean, value: FloatArray) {
371406
log("uniformMatrix3fv", location, transpose, value)
372407
return kgl.uniformMatrix3fv(location, transpose, value)

src/commonTest/kotlin/baaahs/shows/FakeKgl.kt

+35
Original file line numberDiff line numberDiff line change
@@ -347,21 +347,41 @@ class FakeKgl : Kgl {
347347
location.set(f)
348348
}
349349

350+
override fun uniform1fv(location: UniformLocation, value: FloatArray) {
351+
checkContext()
352+
location.set(value)
353+
}
354+
350355
override fun uniform1i(location: UniformLocation, i: Int) {
351356
checkContext()
352357
location.set(i)
353358
}
354359

360+
override fun uniform1iv(location: UniformLocation, value: IntArray) {
361+
checkContext()
362+
location.set(value)
363+
}
364+
355365
override fun uniform2f(location: UniformLocation, x: Float, y: Float) {
356366
checkContext()
357367
location.set(listOf(x, y))
358368
}
359369

370+
override fun uniform2fv(location: UniformLocation, value: FloatArray) {
371+
checkContext()
372+
location.set(value)
373+
}
374+
360375
override fun uniform2i(location: UniformLocation, x: Int, y: Int) {
361376
checkContext()
362377
location.set(listOf(x, y))
363378
}
364379

380+
override fun uniform2iv(location: UniformLocation, value: IntArray) {
381+
checkContext()
382+
location.set(value)
383+
}
384+
365385
override fun uniform3f(location: UniformLocation, x: Float, y: Float, z: Float) {
366386
checkContext()
367387
location.set(listOf(x, y, z))
@@ -377,16 +397,31 @@ class FakeKgl : Kgl {
377397
location.set(listOf(x, y, z))
378398
}
379399

400+
override fun uniform3iv(location: UniformLocation, value: IntArray) {
401+
checkContext()
402+
location.set(value)
403+
}
404+
380405
override fun uniform4f(location: UniformLocation, x: Float, y: Float, z: Float, w: Float) {
381406
checkContext()
382407
location.set(listOf(x, y, z, w))
383408
}
384409

410+
override fun uniform4fv(location: UniformLocation, value: FloatArray) {
411+
checkContext()
412+
location.set(value)
413+
}
414+
385415
override fun uniform4i(location: UniformLocation, x: Int, y: Int, z: Int, w: Int) {
386416
checkContext()
387417
location.set(listOf(x, y, z, w))
388418
}
389419

420+
override fun uniform4iv(location: UniformLocation, value: IntArray) {
421+
checkContext()
422+
location.set(value)
423+
}
424+
390425
override fun uniformMatrix3fv(location: UniformLocation, transpose: Boolean, value: FloatArray) {
391426
checkContext()
392427
location.set(value.toList())

0 commit comments

Comments
 (0)