From 3770ec617b48db9b7a4eb3ded4ee8f7b59a3218a Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Sun, 26 Aug 2018 14:08:30 -0400
Subject: [PATCH] Make matrices directly passable to ctypes.

---
 punyverse/entity.py | 14 +++++++-------
 punyverse/glgeom.py |  3 ++-
 punyverse/shader.py |  2 +-
 punyverse/ui.py     |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/punyverse/entity.py b/punyverse/entity.py
index 331b1a4..f7f88aa 100644
--- a/punyverse/entity.py
+++ b/punyverse/entity.py
@@ -58,7 +58,7 @@ class Asteroid(Entity):
         self.rotation = rx + 1, ry + 1, rz + 1
 
     def draw(self, options):
-        glLoadMatrixf(self.mv_matrix.as_gl())
+        glLoadMatrixf(self.mv_matrix)
         self.model.draw()
 
 
@@ -109,7 +109,7 @@ class Belt(Entity):
         self.rotation = pitch, self.world.tick * self.rotation_angle % 360, roll
 
     def draw(self, options):
-        glLoadMatrixf(self.mv_matrix.as_gl())
+        glLoadMatrixf(self.mv_matrix)
         glCallList(self.belt_id)
 
 
@@ -239,7 +239,7 @@ class Body(Entity):
 
     def _draw_orbits(self, distance):
         with glRestore(GL_ENABLE_BIT | GL_LINE_BIT | GL_CURRENT_BIT):
-            glLoadMatrixf(self.parent.orbit_matrix.as_gl())
+            glLoadMatrixf(self.parent.orbit_matrix)
 
             glDisable(GL_LIGHTING)
             solid = distance < self.parent.orbit_opaque
@@ -425,7 +425,7 @@ class SphericalBody(Body):
         with glRestore(GL_ENABLE_BIT | GL_CURRENT_BIT | GL_TEXTURE_BIT):
             mv = self.mv_matrix.matrix
             matrix = Matrix4f([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, mv[12], mv[13], mv[14], 1])
-            glLoadMatrixf(matrix.as_gl())
+            glLoadMatrixf(matrix)
 
             glDisable(GL_LIGHTING)
             glEnable(GL_TEXTURE_2D)
@@ -437,7 +437,7 @@ class SphericalBody(Body):
 
     def _draw_clouds(self):
         with glRestore(GL_ENABLE_BIT | GL_TEXTURE_BIT):
-            glLoadMatrixf(self.mv_matrix.as_gl())
+            glLoadMatrixf(self.mv_matrix)
             glEnable(GL_BLEND)
             glEnable(GL_ALPHA_TEST)
             glEnable(GL_CULL_FACE)
@@ -450,7 +450,7 @@ class SphericalBody(Body):
 
     def _draw_rings(self):
         with glRestore(GL_ENABLE_BIT | GL_TEXTURE_BIT):
-            glLoadMatrixf(self.mv_matrix.as_gl())
+            glLoadMatrixf(self.mv_matrix)
             glDisable(GL_LIGHTING)
             glEnable(GL_TEXTURE_2D)
             glEnable(GL_BLEND)
@@ -487,5 +487,5 @@ class ModelBody(Body):
                                 info.get('sz', scale))
 
     def _draw(self, options):
-        glLoadMatrixf(self.mv_matrix.as_gl())
+        glLoadMatrixf(self.mv_matrix)
         self.vbo.draw()
diff --git a/punyverse/glgeom.py b/punyverse/glgeom.py
index bf3053d..74cce39 100644
--- a/punyverse/glgeom.py
+++ b/punyverse/glgeom.py
@@ -114,7 +114,8 @@ class Matrix4f(object):
         m[0xF] = 1
         return cls(m)
 
-    def as_gl(self):
+    @property
+    def _as_parameter_(self):
         return array_to_ctypes(self.matrix)
 
     @property
diff --git a/punyverse/shader.py b/punyverse/shader.py
index 1263cd7..cfa8dda 100644
--- a/punyverse/shader.py
+++ b/punyverse/shader.py
@@ -85,7 +85,7 @@ class Program(object):
         self.active_attributes.clear()
 
     def uniform_mat4(self, name, matrix):
-        glUniformMatrix4fv(self.uniforms[name], 1, GL_FALSE, matrix.as_gl())
+        glUniformMatrix4fv(self.uniforms[name], 1, GL_FALSE, matrix)
 
     def uniform_texture(self, name, index):
         glUniform1i(self.uniforms[name], index)
diff --git a/punyverse/ui.py b/punyverse/ui.py
index 3acdcbb..f66ead6 100644
--- a/punyverse/ui.py
+++ b/punyverse/ui.py
@@ -213,7 +213,7 @@ class Punyverse(pyglet.window.Window):
 
         glMatrixMode(GL_PROJECTION)
         self.world.resize(width, height)
-        glLoadMatrixf(self.world.projection_matrix().as_gl())
+        glLoadMatrixf(self.world.projection_matrix())
         glMatrixMode(GL_MODELVIEW)
 
     def on_mouse_scroll(self, x, y, scroll_x, scroll_y):
@@ -235,7 +235,7 @@ class Punyverse(pyglet.window.Window):
 
     def on_draw(self):
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
-        glLoadMatrixf(self.world.view_matrix().as_gl())
+        glLoadMatrixf(self.world.view_matrix())
 
         c = self.world.cam
         x, y, z = c.x, c.y, c.z