Support uniform float/int arrays #15

xian · 2023-07-24T20:15:11Z

Add uniform[1234][fi]v().
Fixes apparent bug in JOGL uniform array support.

xian · 2023-07-24T20:16:29Z

@gergelydaniel if this looks good, a new release including it would be awesome.

gergelydaniel · 2023-07-27T06:42:40Z

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

+
    override fun uniform3f(location: UniformLocation, x: Float, y: Float, z: Float) = gl.glUniform3f(location, x, y, z)

-    override fun uniform3fv(location: UniformLocation, value: FloatArray) = gl.glUniform3fv(location, 1, value, 0)


This doesn't look right. Based on my understanding, count is supposed to be the number of typed elements to assign, not the number of primitives. For example, in uniform3fv, if the count is 2, then OpenGL is about to update 2 instances of vec3f (6 floats in total), and not just two floats.

I believe the best options we can consider with uniform*v calls is to:
A) Expose the count parameter through Kgl functions
B) Hide the count parameter in Kgl, and calculate it automatically. For example, for uniform3fv it should be value.size / 3

It seems that WebGL1 doesn't support the count parameterer, so with WebGL1 only the B) option is possible, however WebGL2 uniform*v calls do have the srcOffset and srcLength parameters, which makes option A) possible

So moving forward, regarding to this PR I'd suggest going with option B) (both for existing and new *fv functions) as it offers WebGL1 compatibility, and option A) can be implemented later at any time

Thanks @gergelydaniel, I made the change you describe in B), thanks for catching that!

gergelydaniel

Thank you for the updates, I still found some things before I could merge:

For the sake of consistency, please apply the count calculation on all targets where it's not done automatically (besides JOGL: Android, iOS)
JOGL matrix functions seem to be broken

If these are fixed I can do a round of testing, then merge it, as well as publish a new release soon

gergelydaniel · 2023-08-01T15:36:27Z

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

+
    override fun uniformMatrix3fv(location: UniformLocation, transpose: Boolean, value: FloatArray) =
-        gl.glUniformMatrix3fv(location, 1, transpose, value, 0)
+        gl.glUniformMatrix3fv(location, value.size, transpose, value, 0)


Suggested change

gl.glUniformMatrix3fv(location, value.size, transpose, value, 0)

gl.glUniformMatrix3fv(location, value.size / 9, transpose, value, 0)

gergelydaniel · 2023-08-01T15:36:55Z

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


    override fun uniformMatrix4fv(location: UniformLocation, transpose: Boolean, value: FloatArray) =
-        gl.glUniformMatrix4fv(location, 1, transpose, value, 0)
+        gl.glUniformMatrix4fv(location, value.size, transpose, value, 0)


Suggested change

gl.glUniformMatrix4fv(location, value.size, transpose, value, 0)

gl.glUniformMatrix4fv(location, value.size / 16, transpose, value, 0)

gergelydaniel · 2023-08-01T15:39:36Z

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

+    override fun uniform1iv(location: UniformLocation, value: IntArray) = GL.glUniform1iv(location, 1, value, 0)

    override fun uniform2f(location: UniformLocation, x: Float, y: Float) = GL.glUniform2f(location, x, y)
+    override fun uniform2fv(location: UniformLocation, value: FloatArray) = GL.glUniform2fv(location, 1, value, 0)


As we are about to do that manually on JOGL, and WebGL and LWJGL does that automatically, we should do the division thing manually on Android and iOS as well. (including matrices)

Suggested change

override fun uniform2fv(location: UniformLocation, value: FloatArray) = GL.glUniform2fv(location, 1, value, 0)

override fun uniform2fv(location: UniformLocation, value: FloatArray) = GL.glUniform2fv(location, value.size / 2, value, 0)

xian · 2023-08-01T16:47:49Z

Thanks @gergelydaniel! I added a check that the array sizes make sense as well.

xian · 2023-08-01T16:56:24Z

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

@@ -0,0 +1,13 @@
+package com.danielgergely.kgl
+
+public fun FloatArray.vSize(vecSize: Int): Int {


I couldn't make these internal (I guess because kotlin modules don't cross platform boundaries) so unfortunately this would become part of the kgl public API. I can make them private on each platform if you prefer.

Yea, unfortunately these would be annoying to have shown up in the IDE for float and int arrays in projects that I use KGL in. The "correct" way would probably be to create a separate Gradle module (eg named kgl-utils), and have the functions as public there, and import that Gradle module with implementation so it wouldn't be exposed.

It is also fine for now to just have these copied for jogl, android, ios, but I'd like to keep the public API clean

xian · 2023-08-04T17:09:07Z

lmk how this looks, would love to pull this in soon if possible to enable some nifty features for our mutant vehicle at burningman this year :-)

gergelydaniel

Sorry for the late reply and the nitpicking :D the function should be cleaned up from the API, but otherwise looks good!

gergelydaniel · 2023-08-05T09:55:14Z

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

@@ -0,0 +1,13 @@
+package com.danielgergely.kgl
+
+public fun FloatArray.vSize(vecSize: Int): Int {


Yea, unfortunately these would be annoying to have shown up in the IDE for float and int arrays in projects that I use KGL in. The "correct" way would probably be to create a separate Gradle module (eg named kgl-utils), and have the functions as public there, and import that Gradle module with implementation so it wouldn't be exposed.

It is also fine for now to just have these copied for jogl, android, ios, but I'd like to keep the public API clean

xian · 2023-08-15T23:36:12Z

No problem, moved to the respective modules. Thanks!

xian · 2023-08-19T17:36:15Z

@gergelydaniel Bump

gergelydaniel

Looking good, thank you!

gergelydaniel · 2023-08-20T00:12:49Z

Note that this is present in the new release 0.6.2

xian · 2023-08-20T04:42:29Z

Thanks so much @gergelydaniel, much appreciated!

Add uniform[1234][fi]v() for uniform arrays.

af4b13e

gergelydaniel requested changes Jul 27, 2023

View reviewed changes

xian requested a review from gergelydaniel August 1, 2023 04:53

gergelydaniel requested changes Aug 1, 2023

View reviewed changes

xian requested a review from gergelydaniel August 1, 2023 16:46

xian added 2 commits August 1, 2023 09:49

Fix JOGL implementation of uniform*v.

87c6bee

Fix calculation of uniform*v count on JOGL, Android, and iOS.

400177d

xian force-pushed the uniform-v branch from 6157949 to 400177d Compare August 1, 2023 16:50

Reformat for consistency.

dca11a7

xian commented Aug 1, 2023

View reviewed changes

This was referenced Aug 2, 2023

First pass at implementing TrackData that holds info about the currently playing track. baaahs/sparklemotion#534

Draft

Identify panels by name baaahs/sparklemotion#535

Draft

gergelydaniel requested changes Aug 5, 2023

View reviewed changes

Move vSize to iOS, Android, and JOGL modules so they can be private.

5d71d03

xian requested a review from gergelydaniel August 15, 2023 23:36

gergelydaniel approved these changes Aug 19, 2023

View reviewed changes

gergelydaniel merged commit 8ffc18d into gergelydaniel:main Aug 19, 2023


		override fun uniform3f(location: UniformLocation, x: Float, y: Float, z: Float) = gl.glUniform3f(location, x, y, z)

		override fun uniform3fv(location: UniformLocation, value: FloatArray) = gl.glUniform3fv(location, 1, value, 0)

	gl.glUniformMatrix3fv(location, value.size, transpose, value, 0)
	gl.glUniformMatrix3fv(location, value.size / 9, transpose, value, 0)

	gl.glUniformMatrix4fv(location, value.size, transpose, value, 0)
	gl.glUniformMatrix4fv(location, value.size / 16, transpose, value, 0)

	override fun uniform2fv(location: UniformLocation, value: FloatArray) = GL.glUniform2fv(location, 1, value, 0)
	override fun uniform2fv(location: UniformLocation, value: FloatArray) = GL.glUniform2fv(location, value.size / 2, value, 0)

		@@ -0,0 +1,13 @@
		package com.danielgergely.kgl

		public fun FloatArray.vSize(vecSize: Int): Int {

Support uniform float/int arrays #15

Support uniform float/int arrays #15

Uh oh!

Conversation

xian commented Jul 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xian commented Jul 24, 2023

Uh oh!

gergelydaniel Jul 27, 2023

Choose a reason for hiding this comment

Uh oh!

xian Aug 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gergelydaniel left a comment

Choose a reason for hiding this comment

Uh oh!

gergelydaniel Aug 1, 2023

Choose a reason for hiding this comment

Uh oh!

gergelydaniel Aug 1, 2023

Choose a reason for hiding this comment

Uh oh!

gergelydaniel Aug 1, 2023

Choose a reason for hiding this comment

Uh oh!

xian commented Aug 1, 2023

Uh oh!

xian Aug 1, 2023

Choose a reason for hiding this comment

Uh oh!

gergelydaniel Aug 5, 2023

Choose a reason for hiding this comment

Uh oh!

xian commented Aug 4, 2023

Uh oh!

gergelydaniel left a comment

Choose a reason for hiding this comment

Uh oh!

gergelydaniel Aug 5, 2023

Choose a reason for hiding this comment

Uh oh!

xian commented Aug 15, 2023

Uh oh!

xian commented Aug 19, 2023

Uh oh!

gergelydaniel left a comment

Choose a reason for hiding this comment

Uh oh!

gergelydaniel commented Aug 20, 2023

Uh oh!

xian commented Aug 20, 2023

Uh oh!

Uh oh!

xian commented Jul 24, 2023 •

edited

Loading

xian Aug 1, 2023 •

edited

Loading