Wavefront properly array and cached loader

Author: einarf

demosys/opengl/vao.py

@@ -87,6 +87,7 @@ def __init__(self, name, mode=moderngl.TRIANGLES):
         :param name: The name for debug purposes
         :param mode: Default draw mode for this VAO
         """
+        self.ctx = context.ctx()
         self.name = name
         self.mode = mode
 
@@ -156,11 +157,14 @@ def buffer(self, buffer, buffer_format: str, attribute_names, per_instance=False
         if not isinstance(attribute_names, list):
             attribute_names = [attribute_names, ]
 
-        if not isinstance(buffer, moderngl.Buffer) and not isinstance(buffer, numpy.ndarray):
-            raise VAOError("buffer parameter must be a moderngl.Buffer or numpy.ndarray instance")
+        if not type(buffer) in [moderngl.Buffer, numpy.ndarray, bytes]:
+            raise VAOError("buffer parameter must be a moderngl.Buffer, numpy.ndarray or bytes instance")
 
         if isinstance(buffer, numpy.ndarray):
-            buffer = context.ctx().buffer(buffer.tobytes())
+            buffer = self.ctx.buffer(buffer.tobytes())
+
+        if isinstance(buffer, bytes):
+            buffer = self.ctx.buffer(data=buffer)
 
         formats = buffer_format.split()
         if len(formats) != len(attribute_names):
@@ -178,11 +182,14 @@ def index_buffer(self, buffer, index_element_size=4):
         :param buffer: Buffer object or ndarray
         :param index_element_size: Byte size of each element. 1, 2 or 4
         """
-        if not isinstance(buffer, moderngl.Buffer) and not isinstance(buffer, numpy.ndarray):
-            raise VAOError("buffer parameter must be a moderngl.Buffer or numpy.ndarray instance")
+        if not type(buffer) in [moderngl.Buffer, numpy.ndarray, bytes]:
+            raise VAOError("buffer parameter must be a moderngl.Buffer, numpy.ndarray or bytes instance")
 
         if isinstance(buffer, numpy.ndarray):
-            buffer = context.ctx().buffer(buffer.tobytes())
+            buffer = self.ctx.buffer(buffer.tobytes())
+
+        if isinstance(buffer, bytes):
+            buffer = self.ctx.buffer(data=buffer)
 
         self._index_buffer = buffer
         self._index_element_size = index_element_size

demosys/scene/loaders/wavefront.py

@@ -1,3 +1,5 @@
+import numpy
+
 import moderngl
 import pywavefront
 from pywavefront import cache
@@ -46,8 +48,8 @@ def load_vertex_buffer(self, fd, material, length):
         buffer_format, attributes, mesh_attributes = translate_buffer_format(material.vertex_format)
 
         vao = VAO(material.name, mode=moderngl.TRIANGLES)
-        buffer = context.ctx().buffer(fd.read(length))
-        vao.buffer(buffer, buffer_format, attributes)
+        # buffer = context.ctx().buffer(fd.read(length))
+        vao.buffer(fd.read(length), buffer_format, attributes)
 
         setattr(material, 'vao', vao)
         setattr(material, 'buffer_format', buffer_format)
@@ -74,13 +76,29 @@ def load(self, scene, file=None):
 
         for _, mat in data.materials.items():
 
-            if not hasattr(mat, 'vao'):
-                continue
-
             mesh = Mesh(mat.name)
-            mesh.vao = mat.vao
-            for attrs in mat.mesh_attributes:
-                mesh.add_attribute(*attrs)
+
+            # Traditional loader
+            if mat.vertices:
+                buffer_format, attributes, mesh_attributes = translate_buffer_format(mat.vertex_format)
+                vbo = numpy.array(mat.vertices, dtype='f4')
+
+                vao = VAO(mat.name, mode=moderngl.TRIANGLES)
+                vao.buffer(vbo, buffer_format, attributes)
+                mesh.vao = vao
+
+                for attrs in mesh_attributes:
+                    mesh.add_attribute(*attrs)
+
+            # Binary cache loader
+            elif hasattr(mat, 'vao'):
+                mesh = Mesh(mat.name)
+                mesh.vao = mat.vao
+                for attrs in mat.mesh_attributes:
+                    mesh.add_attribute(*attrs)
+            else:
+                # Empty
+                continue
 
             scene.meshes.append(mesh)