Mercurial > touhou

changeset 382:b9aecdc6f72f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the anmviewer, broken since changeset 370:74471afbac37.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Fri, 07 Sep 2012 13:04:30 +0200
parents f1649d6c6397
children 0537af9125a7
files pytouhou/ui/anmrenderer.py
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pytouhou/ui/anmrenderer.py
+++ b/pytouhou/ui/anmrenderer.py
@@ -18,7 +18,7 @@ import traceback
 
 from pyglet.gl import (glMatrixMode, glLoadIdentity, glEnable,
                        glHint, glEnableClientState, glViewport,
-                       gluPerspective, GL_PROJECTION,
+                       glLoadMatrixf, GL_PROJECTION, GL_MODELVIEW,
                        GL_TEXTURE_2D, GL_BLEND,
                        GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST,
                        GL_COLOR_ARRAY, GL_VERTEX_ARRAY, GL_TEXTURE_COORD_ARRAY,
@@ -67,12 +67,14 @@ class ANMRenderer(pyglet.window.Window, 
         glEnableClientState(GL_TEXTURE_COORD_ARRAY)
 
         # Switch to game projection
+        proj = self.perspective(30, float(self.width) / float(self.height),
+                                101010101./2010101., 101010101./10101.)
         glMatrixMode(GL_PROJECTION)
-        glLoadIdentity()
-        gluPerspective(30, float(self.width) / float(self.height),
-                       101010101./2010101., 101010101./10101.)
+        glLoadMatrixf(proj.get_c_data())
 
-        self.setup_camera(0, 0, 1)
+        view = self.setup_camera(0, 0, 1)
+        glMatrixMode(GL_MODELVIEW)
+        glLoadMatrixf(view.get_c_data())
 
         # Use our own loop to ensure 60 fps
         pyglet.clock.set_fps_limit(60)