geometry module should not access context

Author: einarf

demosys/geometry/bbox.py

@@ -1,6 +1,6 @@
-import moderngl
 import numpy
 
+import moderngl
 from demosys.opengl import VAO
 
 

demosys/geometry/points.py

@@ -1,7 +1,9 @@
+import random
+
+import numpy
+
 import moderngl
 from demosys.opengl import VAO
-import numpy
-import random
 
 
 def points_random_3d(count, range_x=(-10.0, 10.0), range_y=(-10.0, 10.0), range_z=(-10.0, 10.0), seed=None) -> VAO:

demosys/geometry/quad.py

@@ -1,7 +1,7 @@
-import moderngl
 import numpy
+
+import moderngl
 from demosys.opengl import VAO
-from demosys import context
 
 # Cache fullscreen quad
 QUAD_FS = None
@@ -26,32 +26,32 @@ def quad_2d(width, height, xpos=0.0, ypos=0.0) -> VAO:
     :param xpos: Center position x
     :param ypos: Center position y
     """
-    pos = context.ctx().buffer(numpy.array([
+    pos = numpy.array([
         xpos - width / 2.0, ypos + height / 2.0, 0.0,
         xpos - width / 2.0, ypos - height / 2.0, 0.0,
         xpos + width / 2.0, ypos - height / 2.0, 0.0,
         xpos - width / 2.0, ypos + height / 2.0, 0.0,
         xpos + width / 2.0, ypos - height / 2.0, 0.0,
         xpos + width / 2.0, ypos + height / 2.0, 0.0,
-    ], dtype=numpy.float32).tobytes())
+    ], dtype=numpy.float32)
 
-    normals = context.ctx().buffer(numpy.array([
+    normals = numpy.array([
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
         0.0, 0.0, 1.0,
-    ], dtype=numpy.float32).tobytes())
+    ], dtype=numpy.float32)
 
-    uvs = context.ctx().buffer(numpy.array([
+    uvs = numpy.array([
         0.0, 1.0,
         0.0, 0.0,
         1.0, 0.0,
         0.0, 1.0,
         1.0, 0.0,
         1.0, 1.0,
-    ], dtype=numpy.float32).tobytes())
+    ], dtype=numpy.float32)
 
     vao = VAO("geometry:quad", mode=moderngl.TRIANGLES)
     vao.buffer(pos, '3f', ["in_position"])

demosys/geometry/sphere.py

@@ -1,8 +1,8 @@
 import math
-import moderngl as mlg
+
 import numpy
 
-from demosys import context
+import moderngl as mlg
 from demosys.opengl import VAO
 
 
@@ -57,10 +57,10 @@ def sphere(radius=0.5, sectors=32, rings=16) -> VAO:
             indices[i + 5] = (r + 1) * sectors + (s + 1)
             i += 6
 
-    vbo_vertices = context.ctx().buffer(numpy.array(vertices, dtype=numpy.float32).tobytes())
-    vbo_normals = context.ctx().buffer(numpy.array(normals, dtype=numpy.float32).tobytes())
-    vbo_uvs = context.ctx().buffer(numpy.array(uvs, dtype=numpy.float32).tobytes())
-    vbo_elements = context.ctx().buffer(numpy.array(indices, dtype=numpy.uint32).tobytes())
+    vbo_vertices = numpy.array(vertices, dtype=numpy.float32)
+    vbo_normals = numpy.array(normals, dtype=numpy.float32)
+    vbo_uvs = numpy.array(uvs, dtype=numpy.float32)
+    vbo_elements = numpy.array(indices, dtype=numpy.uint32)
 
     vao = VAO("sphere", mode=mlg.TRIANGLES)
     # VBOs