Update examples using new VAO methods

Author: einarf

demosys/opengl/draw.py

@@ -38,7 +38,7 @@ def draw(self, texture, pos=(0.0, 0.0), scale=(1.0, 1.0)):
         texture.use(location=0)
         self._texture2d_sampler.use(location=0)
         self._texture2d_shader["texture0"].value = 0
-        self._quad.draw(self._texture2d_shader)
+        self._quad.render(self._texture2d_shader)
         self._texture2d_sampler.clear(location=0)
 
     def draw_depth(self, texture, near, far, pos=(0.0, 0.0), scale=(1.0, 1.0)):
@@ -62,7 +62,7 @@ def draw_depth(self, texture, near, far, pos=(0.0, 0.0), scale=(1.0, 1.0)):
         self._depth_sampler.use(location=0)
         texture.use(location=0)
         self._depth_shader["texture0"].value = 0
-        self._quad.draw(self._depth_shader)
+        self._quad.render(self._depth_shader)
         self._depth_sampler.clear(location=0)
 
     def _init_texture2d_draw(self):

demosys/scene/mesh.py

@@ -51,7 +51,7 @@ def draw_bbox(self, proj_matrix, view_matrix, cam_matrix, program, vao):
         program["bb_min"].write(self.bbox_min.astype('f4').tobytes())
         program["bb_max"].write(self.bbox_max.astype('f4').tobytes())
         program["color"].value = (0.75, 0.75, 0.75)
-        vao.draw(program)
+        vao.render(program)
 
     def add_attribute(self, attr_type, name, components):
         """

demosys/scene/programs.py

@@ -25,7 +25,7 @@ def draw(self, mesh, projection_matrix=None, view_matrix=None, camera_matrix=Non
         """
         self.program["m_proj"].write(projection_matrix)
         self.program["m_mv"].write(view_matrix)
-        mesh.vao.draw(self.program)
+        mesh.vao.render(self.program)
 
     def apply(self, mesh):
         """
@@ -63,7 +63,7 @@ def draw(self, mesh, projection_matrix=None, view_matrix=None, camera_matrix=Non
         self.program["m_proj"].write(projection_matrix)
         self.program["m_view"].write(view_matrix)
         self.program["m_cam"].write(camera_matrix)
-        mesh.vao.draw(self.program)
+        mesh.vao.render(self.program)
 
     def apply(self, mesh):
         if not mesh.material:
@@ -99,7 +99,7 @@ def draw(self, mesh, projection_matrix=None, view_matrix=None, camera_matrix=Non
         self.program["m_proj"].write(projection_matrix)
         self.program["m_view"].write(view_matrix)
         self.program["m_cam"].write(camera_matrix)
-        mesh.vao.draw(self.program)
+        mesh.vao.render(self.program)
 
     def apply(self, mesh):
         if not mesh.material:
@@ -135,7 +135,7 @@ def draw(self, mesh, projection_matrix=None, view_matrix=None, camera_matrix=Non
         else:
             self.program["color"].value = (1.0, 1.0, 1.0)
 
-        mesh.vao.draw(self.program)
+        mesh.vao.render(self.program)
 
     def apply(self, mesh):
         return self

demosys/scene/scene.py

@@ -85,7 +85,7 @@ def draw_bbox(self, projection_matrix=None, camera_matrix=None, all=True):
         self.bbox_program["bb_min"].write(self.bbox_min.astype('f4').tobytes())
         self.bbox_program["bb_max"].write(self.bbox_max.astype('f4').tobytes())
         self.bbox_program["color"].value = (1.0, 0.0, 0.0)
-        self.bbox_vao.draw(self.bbox_program)
+        self.bbox_vao.render(self.bbox_program)
 
         if not all:
             return

examples/cubes/effects.py

@@ -44,7 +44,7 @@ def draw(self, time, frametime, target):
 
         self.program["m_proj"].write(self.sys_camera.projection.tobytes())
         self.program["m_mv"].write(m_mv.astype('f4').tobytes())
-        self.cube.draw(self.program)
+        self.cube.render(self.program)
 
 
 class LightCube(Effect):
@@ -72,7 +72,7 @@ def draw(self, time, frametime, target):
         self.m_normal.write(m_normal.astype('f4').tobytes())
 
         # Draw the cube
-        self.cube.draw(self.program)
+        self.cube.render(self.program)
 
 
 class TexturedCube(Effect):
@@ -103,4 +103,4 @@ def draw(self, time, frametime, target):
         self.texture.use(location=0)
         self.wood.value = 0
 
-        self.cube.draw(self.program)
+        self.cube.render(self.program)

examples/feedback/effects.py

@@ -58,7 +58,7 @@ def draw(self, time, frametime, target):
         self.program["m_mv"].write(m_mv.astype('f4').tobytes())
         self.texture.use(location=0)
         self.program["texture0"].value = 0
-        self.particles.draw(self.program)
+        self.particles.render(self.program)
 
         # Swap buffers
         self.pos = self.pos1 if self.pos == self.pos2 else self.pos2

examples/geocubes/effects.py

@@ -44,15 +44,15 @@ def draw(self, time, frametime, target):
 
         self.fbo.use()
 
-        self.cube_prog1.uniform("m_proj", proj_m.astype('f4').tobytes())
-        self.cube_prog1.uniform("m_mv", mv_m.astype('f4').tobytes())
-        self.cube_prog1.uniform("m_normal", normal_m.astype('f4').tobytes())
+        self.cube_prog1["m_proj"].write(proj_m.astype('f4').tobytes())
+        self.cube_prog1["m_mv"].write(mv_m.astype('f4').tobytes())
+        self.cube_prog1["m_normal"].write(normal_m.astype('f4').tobytes())
         self.texture1.use(location=0)
         self.texture2.use(location=1)
-        self.cube_prog1.uniform("texture0", 0)
-        self.cube_prog1.uniform("texture1", 1)
-        self.cube_prog1.uniform("time", time)
-        self.cube.draw(self.cube_prog1)
+        self.cube_prog1["texture0"].value = 0
+        self.cube_prog1["texture1"].value = 1
+        self.cube_prog1["time"].value = time
+        self.cube.render(self.cube_prog1)
 
         target.use()
 
@@ -61,13 +61,13 @@ def draw(self, time, frametime, target):
         view_m = self.sys_camera.view_matrix
         normal_m = self.create_normal_matrix(view_m)
 
-        self.cube_prog2.uniform("m_proj", self.sys_camera.projection.tobytes())
-        self.cube_prog2.uniform("m_mv", view_m.astype('f4').tobytes())
-        self.cube_prog2.uniform("m_normal", normal_m.astype('f4').tobytes())
+        self.cube_prog2["m_proj"].write(self.sys_camera.projection.tobytes())
+        self.cube_prog2["m_mv"].write(view_m.astype('f4').tobytes())
+        self.cube_prog2["m_normal"].write(normal_m.astype('f4').tobytes())
         self.fbo.color_attachments[0].use(location=0)
-        self.cube_prog2.uniform("texture0", 0)
-        self.cube_prog2.uniform("time", time)
-        self.cube_prog2.uniform("lightpos", (0.0, 0.0, 0.0))
-        self.points.draw(self.cube_prog2)
+        self.cube_prog2["texture0"].value = 0
+        self.cube_prog2["time"].value = time
+        self.cube_prog2["lightpos"].value = (0.0, 0.0, 0.0)
+        self.points.render(self.cube_prog2)
 
         self.fbo.clear(red=0.5, green=0.5, blue=0.5, alpha=1.0, depth=1.0)

examples/minecraft/effects.py

@@ -63,7 +63,7 @@ def draw(self, mesh, projection_matrix=None, view_matrix=None, camera_matrix=Non
         self.program["m_proj"].write(projection_matrix)
         self.program["m_view"].write(view_matrix)
         self.program["m_cam"].write(camera_matrix)
-        mesh.vao.draw(self.program)
+        mesh.vao.render(self.program)
 
     def apply(self, mesh):
         return self

examples/raymarching/effects.py

@@ -53,4 +53,4 @@ def draw(self, time, frametime, target):
 
         self.program["resolution"].value = (self.window.width, self.window.height)
 
-        self.plane.draw(self.program)
+        self.plane.render(self.program)

examples/warpspeed/effects.py

@@ -26,4 +26,4 @@ def draw(self, time, frametime, target):
         self.program["speedlayer_alpha"].value = (math.sin(time) + 1.0) / 2
         self.program["accelerate"].value = 0.5
 
-        self.vao.draw(self.program)
+        self.vao.render(self.program)