Merge pull request #7 from gnudles/mac_integration

Mac integration

Author: gnudles

.gitignore

@@ -0,0 +1,2 @@
+
+*.user

glmodelview.cpp

@@ -1,51 +1,60 @@
 #include "glmodelview.h"
 #include "stereomaker.h"
-#include "imageviewer.h"
+#if defined(__APPLE__)
+#define GL_SILENCE_DEPRECATION
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
 #include <GL/glu.h>
+#endif
 #include <math.h>
 #include <stdio.h>
-#include <QGLShader>
-#include <QGLShaderProgram>
+#include <QOpenGLShader>
+#include <QOpenGLShaderProgram>
 #include <QMessageBox>
 #include <QProcess>
 #include <QCoreApplication>
+#include <QOpenGLContext>
 #include "modeldepthviewer.h"
 #include "trirender.h"
 
 GlModelView::GlModelView(QWidget *parent) :
-    QGLWidget(parent),m_zoom(500),m_contrast(100)
+    QOpenGLWidget(parent),m_zoom(500),m_contrast(100)
 {
     m_antialias=true;
     m_noShaders=false;
     m_new_width=1024;
     m_new_height=768;
     BasicImageWidget::setBasicImageParent(parent);
+    QSurfaceFormat glf = QSurfaceFormat::defaultFormat();
+    glf.setSamples(4);
+    setFormat(glf);
 }
 
 void GlModelView::initializeGL()
 {
-    if (!context()->isValid())
+    if (!(context()) ||  !context()->isValid())
     {
         QMessageBox::warning(this,"No OpenGL Driver","Depth Map generation is still available");
     }
 
-
-    if (QGLShader::hasOpenGLShaders(QGLShader::Vertex,context()) )
+    if (QOpenGLShader::hasOpenGLShaders(QOpenGLShader::Vertex,context()) )
     {
         QString declarations= "//uniform mat4 gl_ModelViewMatrix;  uniform mat4 gl_ProjectionMatrix; attribute vec4 gl_Vertex;\n";
         QString codev=       "void main()  {gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;"\
                 "float zmax=-1.0;"\
                 "float zmin=1.0;"\
                 "float scale=(zmax-zmin);float offs=-zmin;float z=(gl_Position.z/gl_Position.w); gl_FrontColor = vec4((z+offs)/scale,(z+offs)/scale,(z+offs)/scale,1.0); } ";
-        QGLShader shaderv(QGLShader::Vertex);
+        QOpenGLShader shaderv(QOpenGLShader::Vertex);
         bool compile_success=shaderv.compileSourceCode(declarations+codev);
         if (!compile_success)
         {
             compile_success=shaderv.compileSourceCode(codev);
         }
         if (compile_success)
         {
-            QGLShaderProgram program(context());
+            QOpenGLShaderProgram program(context());
             program.addShader(&shaderv);
             program.link();
             program.bind();

glmodelview.h

@@ -1,12 +1,12 @@
 #ifndef GLMODELVIEW_H
 #define GLMODELVIEW_H
 
-#include <QGLWidget>
+#include <QOpenGLWidget>
 #include <QImage>
 #include <model3d.h>
 #include "basicimagewidget.h"
 
-class GlModelView : public QGLWidget,public BasicImageWidget
+class GlModelView : public QOpenGLWidget,public BasicImageWidget
 {
     Q_OBJECT
 public:

main.cpp

@@ -1,15 +1,11 @@
 #include <QApplication>
 #include "mainwindow.h"
-#include <QGLFormat>
+#include <QSurfaceFormat>
 
 #include "parse.h"
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-    QGLFormat glf = QGLFormat::defaultFormat();
-    glf.setSampleBuffers(true);
-    glf.setSamples(4);
-    QGLFormat::setDefaultFormat(glf);
     a.setWindowIcon(QIcon(":/images/stereograma.svg"));
     QCoreApplication::setOrganizationName("Kapandaria");
     QCoreApplication::setApplicationName("Stereograma");

model3d.cpp

@@ -1,5 +1,11 @@
 #include "model3d.h"
+#if defined(__APPLE__)
+#define GL_SILENCE_DEPRECATION
+#include <OpenGL/gl.h>
+#include <qopenglext.h>
+#else
 #include "qgl.h"
+#endif
 #include <stdio.h>
 #include <math.h>
 #include <limits.h>

stereograma.pro

@@ -4,8 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui network opengl \
-    widgets
+QT       += core gui network opengl widgets
 
 TARGET = stereograma
 TEMPLATE = app
@@ -57,7 +56,6 @@ HEADERS  += mainwindow.h \
     RPly/rply.h \
     RPly/rplyfile.h \
     parse.h \
-    exprtk/exprtk.h \
     FormulaGen.h
 
 FORMS    += mainwindow.ui \

stereomaker.cpp

@@ -1,7 +1,7 @@
 //algorithm was taken from http://www.techmind.org/stereo/stech.html
 #include "stereomaker.h"
 #include <QPainter>
-#include <QTime>
+#include <QElapsedTimer>
 
 
 QVector<QRgb> StereoMaker::grayscale;
@@ -149,7 +149,7 @@ QImage StereoMaker::render(const QImage & map, const QImage & ptrn, Preset *pset
     int progbarval=0;
     int maxheight=dpi*(psettings->getMaximumDepth()-psettings->getMinimumDepth());
     //benchmark
-    QTime t_time;
+    QElapsedTimer t_time;
     t_time.start();
     unsigned int **patternptr=(unsigned int **)malloc(pattern_height*sizeof(void*));
     for (int i=pattern_height-1;i>=0;i--)
@@ -263,7 +263,7 @@ QImage StereoMaker::render(const QImage & map, const QImage & ptrn, Preset *pset
             qpbar->setValue(progbarval);
         }
     }
-    qDebug("Time elapsed: %d ms", t_time.elapsed());
+    qDebug("Time elapsed: %lld ms", t_time.elapsed());
     free(lookL);
     free(lookR);
     free(mapptr);