r675@erker: lars | 2010-02-17 00:22:21 +0100

 fixed broken glGet calls (found by Lode)


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@133 bbaffbd6-741e-11dd-a85d-61de82d9cad9

pycam/Gui/OpenGLTools.py

@@ -140,7 +140,7 @@ class Camera:
 
     def position_camera(self):
         width, height = self._get_screen_dimensions()
-        prev_mode = GL.glGetDoublev(GL.GL_MATRIX_MODE)
+        prev_mode = GL.glGetIntegerv(GL.GL_MATRIX_MODE)
         GL.glMatrixMode(GL.GL_PROJECTION)
         GL.glLoadIdentity()
         v = self.view

pycam/Gui/Project.py

@@ -97,7 +97,7 @@ class GLView:
 
     def gtkgl_refresh(func):
         def refresh_wrapper(self, *args, **kwargs):
-            prev_mode = GL.glGetDoublev(GL.GL_MATRIX_MODE)
+            prev_mode = GL.glGetIntegerv(GL.GL_MATRIX_MODE)
             GL.glMatrixMode(GL.GL_MODELVIEW)
             GL.glClear(GL.GL_COLOR_BUFFER_BIT|GL.GL_DEPTH_BUFFER_BIT)
             result = func(self, *args, **kwargs)

pycam/Gui/common.py

@@ -26,17 +26,17 @@ COLORS = {
 
 def keep_gl_mode(func):
     def wrapper(*args, **kwargs):
-        prev_mode = GL.glGetDoublev(GL.GL_MATRIX_MODE)
+        prev_mode = GL.glGetIntegerv(GL.GL_MATRIX_MODE)
         func(*args, **kwargs)
         GL.glMatrixMode(prev_mode)
     return wrapper
 
 def keep_matrix(func):
     def wrapper(*args, **kwargs):
-        pushed_matrix_mode = GL.glGetDoublev(GL.GL_MATRIX_MODE)
+        pushed_matrix_mode = GL.glGetIntegerv(GL.GL_MATRIX_MODE)
         GL.glPushMatrix()
         func(*args, **kwargs)
-        final_matrix_mode = GL.glGetDoublev(GL.GL_MATRIX_MODE)
+        final_matrix_mode = GL.glGetIntegerv(GL.GL_MATRIX_MODE)
         GL.glMatrixMode(pushed_matrix_mode)
         GL.glPopMatrix()
         GL.glMatrixMode(final_matrix_mode)