cleaning of GL/glew includes

CMakeLists.txt

@@ -135,6 +135,7 @@ IF(APPLE)
 	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined -Wl,dynamic_lookup")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAC_OSX")
 	SET(CMAKE_OSX_ARCHITECTURES x86_64)
+	SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} "-framework Foundation -framework cocoa" )
 ENDIF(APPLE)
 
 IF(WIN32)

include/Algo/Modelisation/extrusion.hpp

@@ -22,7 +22,7 @@
 *                                                                              *
 *******************************************************************************/
 
-#include <GL/glew.h>
+#include "Utils/gl_def.h"
 #include "Geometry/transfo.h"
 
 namespace CGoGN

include/Algo/Render/GL2/colorPerFaceRender.h

@@ -25,7 +25,6 @@
 #ifndef _COLOR_PER_FACE_RENDER
 #define _COLOR_PER_FACE_RENDER
 
-#include <GL/glew.h>
 
 #include "Topology/generic/dart.h"
 #include "Topology/generic/attributeHandler.h"

include/Algo/Render/GL2/explodeVolumeRender.h

@@ -25,8 +25,6 @@
 #ifndef _EXPLODE_VOLUME_VBO_RENDER
 #define _EXPLODE_VOLUME_VBO_RENDER
 
-#include <GL/glew.h>
-
 #include <vector>
 #include <list>
 

include/Algo/Render/GL2/mapRender.h

@@ -28,7 +28,6 @@
 #define _USE_MATH_DEFINES
 #include <cmath>
 
-#include <GL/glew.h>
 #include <vector>
 #include <list>
 #include <set>

include/Algo/Render/GL2/topo3Render.h

@@ -25,8 +25,6 @@
 #ifndef _TOPO3_VBO_RENDER
 #define _TOPO3_VBO_RENDER
 
-#include <GL/glew.h>
-
 #include <vector>
 #include <list>
 

include/Algo/Render/GL2/topoRender.h

@@ -25,8 +25,6 @@
 #ifndef _GL2_TOPO_RENDER_
 #define _GL2_TOPO_RENDER_
 
-#include <GL/glew.h>
-
 #include <vector>
 #include <list>
 

include/Utils/Qt/macgl3.h

+//#include <QApplication>
+#include <QGLWidget>
+#include <QGLContext>
+#include <iostream>
+
+//external Objective C function
+void* select_3_2_mac_visual(GDHandle handle);
+
+namespace CGoGN
+{
+
+/// Use with  GLWidget(...):QGLWidget(new Core3_2_context(QGLFormat::defaultFormat()))
+/// check with std::cout<<glGetString(GL_VERSION)<<std::endl;
+struct Core3_2_context : public QGLContext
+{
+	Core3_2_context(const QGLFormat& format, QPaintDevice* device) : QGLContext(format,device) {}
+	Core3_2_context(const QGLFormat& format) : QGLContext(format) {}
+
+	virtual void* chooseMacVisual(GDHandle handle)
+	{
+		return select_3_2_mac_visual(handle);
+	}
+};
+
+}

include/Utils/Qt/qtgl.h

@@ -25,7 +25,7 @@
 #ifndef __QT_GL2__
 #define __QT_GL2__
 
-#include <GL/glew.h>
+#include "Utils/gl_def.h"
 #include <QGLWidget>
 #include <QMouseEvent>
 #include <QKeyEvent>

include/Utils/drawer.h

@@ -26,7 +26,7 @@
 #define _CGOGN_DRAWER_H_
 
 #include <vector>
-#include <GL/glew.h>
+#include "Utils/gl_def.h"
 #include "Geometry/vector_gen.h"
 
 namespace CGoGN { namespace Utils { class VBO; } }

include/Utils/fbo.h

@@ -25,7 +25,6 @@
 #ifndef __CGoGN_GLSL_FBO__
 #define __CGoGN_GLSL_FBO__
 
-#include <GL/glew.h>
 #include "Utils/gl_def.h"
 
 #include <iostream>

include/Utils/textures.h

@@ -27,7 +27,6 @@
 
 #include "Utils/gl_def.h"
 #include "Geometry/vector_gen.h"
-#include <GL/glew.h>
 #include <string>
 #include <QImage>
 

include/Utils/vbo.h

@@ -27,7 +27,6 @@
 
 
 #include <vector>
-#include <GL/glew.h>
 #include "Utils/gl_def.h"
 #include "Topology/generic/attributeHandler.h"
 #include "Container/convert.h"

include/Utils/vboRender.h

@@ -25,7 +25,7 @@
 #ifndef _VBO_RENDER_
 #define _VBO_RENDER_
 
-#include <GL/glew.h>
+#include "Utils/gl_def.h"
 
 namespace CGoGN
 {

src/Utils/Qt/qtgl.cpp

@@ -22,7 +22,6 @@
 *                                                                              *
 *******************************************************************************/
 
-#include <GL/glew.h>
 #include <iostream>
 #include "Utils/trackball.h"
 #include "Utils/Qt/qtgl.h"
@@ -30,6 +29,9 @@
 #include "glm/gtc/type_precision.hpp"
 #include "Utils/GLSLShader.h"
 
+#ifdef MAC_OSX
+  #include "Utils/Qt/macgl3.h"
+#endif
 namespace CGoGN
 {
 
@@ -42,7 +44,12 @@ namespace QT
 float GLWidget::FAR_PLANE = 500.0f;
 
 GLWidget::GLWidget(SimpleQT* cbs, QWidget *parent) :
+#ifdef MAC_OSX
+//	QGLWidget(new Core3_2_context(QGLFormat::defaultFormat()),parent),
 	QGLWidget(QGLFormat(QGL::Rgba | QGL::DoubleBuffer| QGL::DepthBuffer), parent),
+#else
+	QGLWidget(QGLFormat(QGL::Rgba | QGL::DoubleBuffer| QGL::DepthBuffer), parent),
+#endif
 	m_cbs(cbs),
 	m_state_modifier(0),
 	allow_rotation(true)
@@ -186,6 +193,7 @@ glm::vec3& GLWidget::getObjPos()
 
 void GLWidget::initializeGL()
 {
+	std::cout << "GL VERSION = "<< glGetString(GL_VERSION)<< std::endl;
 	glEnable(GL_DEPTH_TEST);
 
 	if (m_cbs)

src/Utils/Shaders/shaderColorPerVertex.cpp

@@ -22,7 +22,6 @@
 *                                                                              *
 *******************************************************************************/
 
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderColorPerVertex.h"
 
 

src/Utils/Shaders/shaderEnvMap.cpp

@@ -22,7 +22,6 @@
 *                                                                              *
 *******************************************************************************/
 
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderEnvMap.h"
 #include <string.h>
 

src/Utils/Shaders/shaderExplodeVolumes.cpp

@@ -23,7 +23,6 @@
 *******************************************************************************/
 
 #include <string.h>
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderExplodeVolumes.h"
 
 namespace CGoGN

src/Utils/Shaders/shaderExplodeVolumesLines.cpp

@@ -23,7 +23,6 @@
 *******************************************************************************/
 
 #include <string.h>
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderExplodeVolumesLines.h"
 
 namespace CGoGN

src/Utils/Shaders/shaderFlat.cpp

@@ -23,7 +23,6 @@
 *******************************************************************************/
 
 #include <string.h>
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderFlat.h"
 
 namespace CGoGN

src/Utils/Shaders/shaderFlatColor.cpp

@@ -23,7 +23,6 @@
 *******************************************************************************/
 
 #include <string>
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderFlatColor.h"
 
 namespace CGoGN

src/Utils/Shaders/shaderIsoLines.cpp

@@ -23,7 +23,6 @@
 *******************************************************************************/
 
 #include <string>
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderIsoLines.h"
 
 namespace CGoGN

src/Utils/Shaders/shaderScalarField.cpp

@@ -22,10 +22,8 @@
 *                                                                              *
 *******************************************************************************/
 
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderScalarField.h"
 
-
 namespace CGoGN
 {
 

src/Utils/Shaders/shaderSimpleColor.cpp

@@ -22,7 +22,6 @@
 *                                                                              *
 *******************************************************************************/
 
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderSimpleColor.h"
 
 namespace CGoGN

src/Utils/Shaders/shaderSimpleTexture.cpp

@@ -24,7 +24,6 @@
 
 #ifdef WITH_QT
 
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderSimpleTexture.h"
 
 

src/Utils/Shaders/shaderTextureMask.cpp

@@ -23,7 +23,6 @@
 *******************************************************************************/
 #ifdef WITH_QT
 
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderTextureMask.h"
 
 

src/Utils/Shaders/shaderVectorPerVertex.cpp

@@ -22,7 +22,6 @@
 *                                                                              *
 *******************************************************************************/
 
-#include <GL/glew.h>
 #include "Utils/Shaders/shaderVectorPerVertex.h"
 
 namespace CGoGN