quantum/punyverse
1
0
Fork 0
mirror of https://github.com/quantum5/punyverse.git synced 2025-04-24 13:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make matrices directly passable to ctypes.

Browse source
This commit is contained in:
Quantum 2018-08-26 14:08:30 -04:00
parent ac7a4d0f13
commit 3770ec617b
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
punyverse/entity.py
View file

@ -58,7 +58,7 @@ class Asteroid(Entity):
self.rotation = rx + 1, ry + 1, rz + 1 self.rotation = rx + 1, ry + 1, rz + 1
def draw(self, options): def draw(self, options):
glLoadMatrixf(self.mv_matrix.as_gl()) glLoadMatrixf(self.mv_matrix)
self.model.draw() self.model.draw()
@ -109,7 +109,7 @@ class Belt(Entity):
self.rotation = pitch, self.world.tick * self.rotation_angle % 360, roll self.rotation = pitch, self.world.tick * self.rotation_angle % 360, roll
def draw(self, options): def draw(self, options):
glLoadMatrixf(self.mv_matrix.as_gl()) glLoadMatrixf(self.mv_matrix)
glCallList(self.belt_id) glCallList(self.belt_id)
@ -239,7 +239,7 @@ class Body(Entity):
def _draw_orbits(self, distance): def _draw_orbits(self, distance):
with glRestore(GL_ENABLE_BIT | GL_LINE_BIT | GL_CURRENT_BIT): 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) glDisable(GL_LIGHTING)
solid = distance < self.parent.orbit_opaque solid = distance < self.parent.orbit_opaque
@ -425,7 +425,7 @@ class SphericalBody(Body):
with glRestore(GL_ENABLE_BIT | GL_CURRENT_BIT | GL_TEXTURE_BIT): with glRestore(GL_ENABLE_BIT | GL_CURRENT_BIT | GL_TEXTURE_BIT):
mv = self.mv_matrix.matrix 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]) 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) glDisable(GL_LIGHTING)
glEnable(GL_TEXTURE_2D) glEnable(GL_TEXTURE_2D)
@ -437,7 +437,7 @@ class SphericalBody(Body):
def _draw_clouds(self): def _draw_clouds(self):
with glRestore(GL_ENABLE_BIT | GL_TEXTURE_BIT): with glRestore(GL_ENABLE_BIT | GL_TEXTURE_BIT):
glLoadMatrixf(self.mv_matrix.as_gl()) glLoadMatrixf(self.mv_matrix)
glEnable(GL_BLEND) glEnable(GL_BLEND)
glEnable(GL_ALPHA_TEST) glEnable(GL_ALPHA_TEST)
glEnable(GL_CULL_FACE) glEnable(GL_CULL_FACE)
@ -450,7 +450,7 @@ class SphericalBody(Body):
def _draw_rings(self): def _draw_rings(self):
with glRestore(GL_ENABLE_BIT | GL_TEXTURE_BIT): with glRestore(GL_ENABLE_BIT | GL_TEXTURE_BIT):
glLoadMatrixf(self.mv_matrix.as_gl()) glLoadMatrixf(self.mv_matrix)
glDisable(GL_LIGHTING) glDisable(GL_LIGHTING)
glEnable(GL_TEXTURE_2D) glEnable(GL_TEXTURE_2D)
glEnable(GL_BLEND) glEnable(GL_BLEND)
@ -487,5 +487,5 @@ class ModelBody(Body):
info.get('sz', scale)) info.get('sz', scale))
def _draw(self, options): def _draw(self, options):
glLoadMatrixf(self.mv_matrix.as_gl()) glLoadMatrixf(self.mv_matrix)
self.vbo.draw() self.vbo.draw()

3
punyverse/glgeom.py
View file

@ -114,7 +114,8 @@ class Matrix4f(object):
m[0xF] = 1 m[0xF] = 1
return cls(m) return cls(m)
def as_gl(self): @property
def _as_parameter_(self):
return array_to_ctypes(self.matrix) return array_to_ctypes(self.matrix)
@property @property

2
punyverse/shader.py
View file

@ -85,7 +85,7 @@ class Program(object):
self.active_attributes.clear() self.active_attributes.clear()
def uniform_mat4(self, name, matrix): 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): def uniform_texture(self, name, index):
glUniform1i(self.uniforms[name], index) glUniform1i(self.uniforms[name], index)

4
punyverse/ui.py
View file

@ -213,7 +213,7 @@ class Punyverse(pyglet.window.Window):
glMatrixMode(GL_PROJECTION) glMatrixMode(GL_PROJECTION)
self.world.resize(width, height) self.world.resize(width, height)
glLoadMatrixf(self.world.projection_matrix().as_gl()) glLoadMatrixf(self.world.projection_matrix())
glMatrixMode(GL_MODELVIEW) glMatrixMode(GL_MODELVIEW)
def on_mouse_scroll(self, x, y, scroll_x, scroll_y): def on_mouse_scroll(self, x, y, scroll_x, scroll_y):
@ -235,7 +235,7 @@ class Punyverse(pyglet.window.Window):
def on_draw(self): def on_draw(self):
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) 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 c = self.world.cam
x, y, z = c.x, c.y, c.z x, y, z = c.x, c.y, c.z