suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move glortho2d to GLKMatrix4MakeOrtho as to avoid Deprecated Warning on Mac OS

Browse Source
This commit is contained in:
Jean-Marie Verdun 2017-03-03 22:37:23 +01:00 committed by wmayer
parent adca327b34
commit 569f2636bd
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Image/Gui/GLImageBox.cpp
View File

@ -26,15 +26,16 @@
# include <GL/gl.h>
# include <GL/glext.h>
#elif defined (FC_OS_MACOSX)
# include <OpenGL/gl.h>
# include <OpenGL/glu.h>
# include <OpenGL/gl.h>
# include <OpenGL/glu.h>
# include <GLKit/GLKMatrix4.h>
#elif defined (FC_OS_WIN32)
# include <Windows.h>
# include <GL/gl.h>
# include <GL/glu.h>
# include <GL/gl.h>
# include <GL/glu.h>
#else
# include <GL/gl.h>
# include <GL/glu.h>
# include <GL/gl.h>
# include <GL/glu.h>
#endif
#include "GLImageBox.h"
@ -99,7 +100,12 @@ void GLImageBox::resizeGL( int w, int h )
glViewport( 0, 0, (GLint)w, (GLint)h );
glMatrixMode( GL_PROJECTION );
glLoadIdentity();
#if defined (FC_OS_MACOSX)
GLKMatrix4 orthoMat = GLKMatrix4MakeOrtho(0, width() - 1, height() - 1, 0, -1, 1);
glLoadMatrixf(orthoMat.m);
#else
gluOrtho2D(0, width() - 1, height() - 1, 0);
#endif
glMatrixMode(GL_MODELVIEW);
}