Fix bounding box rendering with new uniforms

Author: einarf

demosys/scene/mesh.py

@@ -33,13 +33,12 @@ def draw(self, proj_mat, view_mat):
             self.mesh_shader.draw(self, proj_mat, view_mat)
 
     def draw_bbox(self, proj_matrix, view_matrix, shader, vao):
-        vao.bind(shader)
-        shader.uniform_mat4("m_proj", proj_matrix)
-        shader.uniform_mat4("m_mv", view_matrix)
-        shader.uniform_3fv("bb_min", self.bbox_min)
-        shader.uniform_3fv("bb_max", self.bbox_max)
-        shader.uniform_3fv("color", [0.75, 0.75, 0.75])
-        vao.draw()
+        shader.uniform("m_proj", proj_matrix.astype('f4').tobytes())
+        shader.uniform("m_mv", view_matrix.astype('f4').tobytes())
+        shader.uniform("bb_min", self.bbox_min.astype('f4').tobytes())
+        shader.uniform("bb_max", self.bbox_max.astype('f4').tobytes())
+        shader.uniform("color", (0.75, 0.75, 0.75))
+        vao.draw(shader)
 
     def add_attribute(self, attr_type, name, components):
         """

demosys/scene/scene.py

@@ -39,13 +39,12 @@ def draw(self, m_proj, m_mv):
     def draw_bbox(self, m_proj, m_mv, all=True):
         """Draw scene and mesh bounding boxes"""
         # Scene bounding box
-        self.bbox_vao.bind(self.bbox_shader)
-        self.bbox_shader.uniform_mat4("m_proj", m_proj)
-        self.bbox_shader.uniform_mat4("m_mv", m_mv)
-        self.bbox_shader.uniform_3fv("bb_min", self.bbox_min)
-        self.bbox_shader.uniform_3fv("bb_max", self.bbox_max)
-        self.bbox_shader.uniform_3fv("color", [1.0, 0.0, 0.0])
-        self.bbox_vao.draw()
+        self.bbox_shader.uniform("m_proj", m_proj.astype('f4').tobytes())
+        self.bbox_shader.uniform("m_mv", m_mv.astype('f4').tobytes())
+        self.bbox_shader.uniform("bb_min", self.bbox_min.astype('f4').tobytes())
+        self.bbox_shader.uniform("bb_max", self.bbox_max.astype('f4').tobytes())
+        self.bbox_shader.uniform("color", (1.0, 0.0, 0.0))
+        self.bbox_vao.draw(self.bbox_shader)
 
         if not all:
             return