Ticket #46218: pymol-use-glkit.diff

layer1/Scene.cpp

@@ -57 +57 @@
 #include"ScrollBar.h"
 #include "ShaderMgr.h"
 
+#include <GLKit/GLKMatrix4.h>
+
 #ifdef _PYMOL_IP_EXTRAS
 #include "IncentiveCopyToClipboard.h"
 #endif
@@ -9156 +9158 @@
     }
     if(!SettingGetGlobal_b(G, cSetting_ortho)) {
       float fov = SettingGetGlobal_f(G, cSetting_field_of_view);
-      gluPerspective(fov, aspRat, I->FrontSafe, I->BackSafe);
+      // gluPerspective(fov, aspRat, I->FrontSafe, I->BackSafe);
+      glMultMatrixf(GLKMatrix4MakePerspective(fov*PI/180., aspRat, I->FrontSafe, I->BackSafe).m);
     } else {
       height = fmax(R_SMALL4, -I->Pos[2]) * GetFovWidth(G) / 2.f;
       width = height * aspRat;

setup.py

@@ -279 +279 @@
         glut = posix_find_lib(['glut', 'freeglut'], lib_dirs)
         pyogl_libs += ["GL", "GLU", glut]
 
+    if sys.platform == 'darwin':
+       ext_link_args += [
+         "-framework", "GLKit",
+        ]
+
     libs += ["GLEW"]
     libs += pyogl_libs