Added support for arrays in uniforms. (#814)

* Added support for arrays in uniforms. * Update gfx.ts removed the semicolon... * Update types.ts --------- Co-authored-by: nanopoison <[email protected]>
replit · Jan 6, 2024 · 79422c2 · 79422c2
1 parent 62e1f9a
commit 79422c2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v3000.2.1
+- added support for arrays in uniforms
+
 ## v3000.2
 - added `loadMusic()` to load streaming audio (doesn't block in loading screen)
 

diff --git a/src/gfx.ts b/src/gfx.ts
@@ -260,7 +260,19 @@ export class Shader {
 				gl.uniform3f(loc, val.r, val.g, val.b)
 			} else if (val instanceof Vec2) {
 				gl.uniform2f(loc, val.x, val.y)
-			}
+			} else if (Array.isArray(val)) {
+				const first = val[0]
+				if (typeof first === "number") {
+					gl.uniform1fv(loc, val)
+				} else if (first instanceof Vec2) {
+					gl.uniform2fv(loc, val.map(v => [v.x, v.y]).flat())
+				} else if (first instanceof Color) {
+					gl.uniform3fv(loc, val.map(v => [v.r, v.g, v.b]).flat())
+				}
+			} else if (typeof val === "object") {
+				throw new Error("Unsupported uniform data type.")
+				// TODO allow for struct like objects to be sent as a uniform
+ 			}
 		}
 	}
 

diff --git a/src/types.ts b/src/types.ts
@@ -4882,6 +4882,9 @@ export type UniformValue =
 	| Vec2
 	| Color
 	| Mat4
+	| number[]
+	| Vec2[]
+	| Color[]
 
 export type UniformKey = Exclude<string, "u_tex">
 export type Uniform = Record<UniformKey, UniformValue>