lib/glsl-view: support array uniforms

1 files changed, 15 insertions, 4 deletions

diff --git a/alv-lib/glsl-view.moon b/alv-lib/glsl-view.moon
index 4e8fd19..6142502 100644
--- a/alv-lib/glsl-view.moon
+++ b/alv-lib/glsl-view.moon
@@ -33,8 +33,14 @@ GLSL_SAMPLER_TYPES =
 Uniform = Struct type: T.str, val: T.str
 
 get_typestr = (type) ->
-  typestr = GLSL_TYPES[tostring type]
-  assert typestr, Error 'type', "can't wrap #{type} in uniform"
+  if typestr = GLSL_TYPES[tostring type]
+    return typestr
+
+  if type.__class == Array
+    if typestr = GLSL_TYPES[tostring type.type]
+      return "#{typestr}[#{type.size}]"
+
+  error Error 'type', "can't wrap #{type} in uniform"
 
 uniform = Constant.meta
   meta:
@@ -166,7 +172,7 @@ buffered_stream_source = Constant.meta
   meta:
     name: 'buffered-stream-source'
     summary: "load a stream as a 3d texture source."
-    examples: { '(stream-source [socket] type depth uri [format] [args])' }
+    examples: { '(buffered-stream-source [socket] type depth uri [format] [args])' }
     description: "Creates a circular buffer 3d texture from a capture source.
 
 - `type` must be `3D` or `2D_ARRAY`.
@@ -371,7 +377,12 @@ draw = Constant.meta
       with Bundle.new Timetag.new!
         chunks = { '#version 330 core\n' }
         for key, val in pairs shader.uniforms
-          table.insert chunks, "uniform #{val.type} #{key};"
+          typ, arrsuff = val.type\match "^(%w+)(%[%d+%])$"
+          table.insert chunks, if typ and arrsuff
+            print "typ and arrsuf", typ, arrsuff
+            "uniform #{typ} #{key}#{arrsuff};"
+          else
+            "uniform #{val.type} #{key};"
         table.insert chunks, shader.shader
 
         \add content: { address: '/shader', types: 's', table.concat chunks, '\n' }