Fix ShapesRenderer

Author: mhochsteger

webgpu/camera.py

@@ -12,6 +12,7 @@ class CameraUniforms(UniformBase):
     _fields_ = [
         ("model_view", ct.c_float * 16),
         ("model_view_projection", ct.c_float * 16),
+        ("rot_mat", ct.c_float * 16),
         ("normal_mat", ct.c_float * 16),
         ("aspect", ct.c_float),
         ("padding", ct.c_uint32 * 3),
@@ -210,4 +211,5 @@ def _update_uniforms(self):
         self.uniforms.model_view[:] = model_view.transpose().flatten()
         self.uniforms.model_view_projection[:] = model_view_proj.transpose().flatten()
         self.uniforms.normal_mat[:] = normal_mat.flatten()
+        self.uniforms.rot_mat[:] = self.transform._rot_mat.flatten()
         self.uniforms.update_buffer()

webgpu/shaders/camera.wgsl

@@ -1,6 +1,7 @@
 struct CameraUniforms {
   model_view: mat4x4<f32>,
   model_view_projection: mat4x4<f32>,
+  rot_mat: mat4x4<f32>,
   normal_mat: mat4x4<f32>,
   aspect: f32,
 

webgpu/shapes.py

@@ -305,6 +305,10 @@ def update(self, options: RenderOptions):
         elif n_colors == 2:
             color_stride = 0
             color_top_offset = itemsize
+        else:
+            raise ValueError(
+                f"Invalid number of colors/values: {n_colors}. Expected {self.n_instances}, {2 * self.n_instances}, 1, or 2."
+            )
 
         bmin, bmax = self.shape_data.get_bounding_box()
         z_range = [bmin[2], bmax[2]]

webgpu/webgpu_api.py

@@ -1710,24 +1710,22 @@ def setScissorRect(self, x: int = 0, y: int = 0, width: int = 0, height: int = 0
     def setVertexBuffer(
         self,
         slot: int = 0,
-        buffer: "Buffer | None" = None,
+        buffer: Buffer | None = None,
         offset: int = 0,
-        size: int = 0,
+        size: int | None = None,
     ) -> None:
         return self.handle.setVertexBuffer(
             slot, None if buffer is None else buffer.handle, offset, size
         )
 
     def setIndexBuffer(
         self,
-        buffer: "Buffer | None" = None,
-        format: "IndexFormat | None" = None,
+        buffer: Buffer | None = None,
+        format: IndexFormat | None = None,
         offset: int = 0,
-        size: int = 0,
+        size: int | None = None,
     ) -> None:
-        return self.handle.setIndexBuffer(
-            None if buffer is None else buffer.handle, format, offset, size
-        )
+        return self.handle.setIndexBuffer(buffer and buffer.handle, format, offset, size)
 
     def beginOcclusionQuery(self, queryIndex: int = 0) -> None:
         return self.handle.beginOcclusionQuery(queryIndex)