Update tests after VAO changes

Author: einarf

demosys/effect_templates/cube_simple/effects.py

@@ -29,4 +29,4 @@ def draw(self, time, frametime, target):
         self.program["m_mv"].write(m_mv.astype('f4').tobytes())
         self.program["m_normal"].write(m_normal.astype('f4').tobytes())
         self.program["time"].value = time
-        self.cube.draw(self.program)
+        self.cube.render(self.program)

demosys/effect_templates/raymarching_simple/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)

demosys/effects/deferred/effects.py

@@ -99,7 +99,7 @@ def render_lights(self, camera_matrix, projection):
                 self.point_light_shader["screensize"].value = (self.width, self.height)
                 self.point_light_shader["proj_const"].value = projection.projection_constants
                 self.point_light_shader["radius"].value = light_size
-                self.unit_cube.draw(self.point_light_shader)
+                self.unit_cube.render(self.point_light_shader)
 
         texture._depth_sampler.clear(location=1)
 
@@ -114,7 +114,7 @@ def render_lights_debug(self, camera_matrix, projection):
             self.debug_shader["m_proj"].write(projection.tobytes())
             self.debug_shader["m_mv"].write(m_mv.astype('f4').tobytes())
             self.debug_shader["size"].value = light_size
-            self.unit_cube.draw(self.debug_shader, mode=moderngl.LINE_STRIP)
+            self.unit_cube.render(self.debug_shader, mode=moderngl.LINE_STRIP)
 
         self.ctx.disable(moderngl.BLEND)
 
@@ -127,7 +127,7 @@ def combine(self):
         self.combine_shader["diffuse_buffer"].value = 0
         self.lightbuffer.color_attachments[0].use(location=1)
         self.combine_shader["light_buffer"].value = 1
-        self.quad.draw(self.combine_shader)
+        self.quad.render(self.combine_shader)
 
     def clear(self):
         """clear all buffers"""

demosys/effects/text/effects/renderer_2d.py

@@ -45,7 +45,7 @@ def draw(self, pos, size=1.0):
         self._quad_program["yscale"].value = self._texture_height / self._texture_width
         self._quad_program["pos"].value = pos
         self._quad_program["size"].value = size
-        self._quad.draw(self._quad_program)
+        self._quad.render(self._quad_program)
 
     def _create_vao(self):
         data = numpy.array([

demosys/effects/text/effects/writer_2d.py

@@ -108,4 +108,4 @@ def draw(self, pos, length=-1, size=1.0):
         self._program["char_size"].value = csize
         self._program["line_length"].value = self.area[0]
 
-        self._vao.draw(self._program, instances=length)
+        self._vao.render(self._program, instances=length)

demosys/opengl/vao.py

@@ -119,7 +119,7 @@ def render(self, program: moderngl.Program, mode=None, vertices=-1, first=0, ins
 
         vao.render(mode, vertices=vertices, first=first, instances=instances)
 
-    def render_indirect(self, program, buffer, mode=None, count=-1, *, first=0):
+    def render_indirect(self, program: moderngl.Program, buffer, mode=None, count=-1, *, first=0):
         """
         The render primitive (mode) must be the same as the input primitive of the GeometryShader.
         The draw commands are 5 integers: (count, instanceCount, firstIndex, baseVertex, baseInstance).
@@ -205,7 +205,7 @@ def index_buffer(self, buffer, index_element_size=4):
         self._index_buffer = buffer
         self._index_element_size = index_element_size
 
-    def instance(self, program: moderngl.Program):
+    def instance(self, program: moderngl.Program) -> moderngl.VertexArray:
         """
         Obtain the moderngl.VertexArray instance for the program
 

docs/source/reference/vao.rst

@@ -11,11 +11,8 @@ Methods
 
 .. automethod:: VAO.buffer(buffer, buffer_format:str, attribute_names, per_instance=False)
 .. automethod:: VAO.index_buffer(buffer, index_element_size=4)
-.. automethod:: VAO.subroutines(shader, routines:tuple)
-.. automethod:: VAO.release(buffer=True)
-
-Draw Methods
-------------
-
-.. automethod:: VAO.draw(program:Program, mode=None, vertices=-1, first=0, instances=1)
+.. automethod:: VAO.instance(program:Program) -> VertexArray
+.. automethod:: VAO.render(program:Program, mode=None, vertices=-1, first=0, instances=1)
+.. automethod:: VAO.render_indirect(program:Program, buffer, mode=None, count=-1, first=0)
 .. automethod:: VAO.transform(program:Program, buffer:Buffer, mode=None, vertices=-1, first=0, instances=1)
+.. automethod:: VAO.release(buffer=True)

tests/test_context.py

@@ -18,7 +18,7 @@ def test_basic_render(self):
         vao = geometry.quad_fs()
         program = self.load_program(path='vf_pos_color.glsl')
         program["color"].value = (1.0, 1.0, 1.0, 1.0)
-        vao.draw(program)
+        vao.render(program)
 
         data = self.window.fbo.read()
         self.assertEqual(data[:10], b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff')

tests/test_deferred.py

@@ -27,7 +27,7 @@ def test_create(self):
         projection = Projection()
 
         with self.instance.gbuffer_scope:
-            cube.draw(geo_shader_color)
+            cube.render(geo_shader_color)
 
         self.instance.render_lights(
             matrix44.create_identity(dtype='f4'),

tests/test_docs.py

@@ -31,8 +31,9 @@
     'buffer.',
     'depth.',
     'texture_array.',
-    'array.',
     'program.',
+    'vertex_array.',
+    'array.',
 ]
 
 class TestCase(unittest.TestCase):
@@ -52,13 +53,15 @@ def validate(self, filename, module, classname, ignore):
         for method, docsig in methods:
             classname, methodname = method.split('.')
             sig = str(inspect.signature(getattr(getattr(module, classname), methodname)))
+            print(sig)
             sig = sig.replace('self, ', '').replace('typing.', '').replace(' -> None', '')
 
             for m in MODULES:
                 sig = sig.replace(m, '')
 
             sig = sig.replace('(self)', '()').replace(', *,', ',').replace('(*, ', '(')
             sig = re.sub(r'-> \'(\w+)\'', r'-> \1', sig)
+
             self.assertEqual(docsig, sig, msg=filename + '::' + method)
 
     def test_effect_docs(self):