From 8303597a865400a363ae574ccde819302495f498 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 2 Apr 2013 18:41:01 +0200
Subject: Just put everything new in. Conflict resolution will be later

---
 ftnoir_posewidget/glwidget.cpp | 22 +++++++++++++---------
 ftnoir_posewidget/glwidget.h   |  3 ++-
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'ftnoir_posewidget')

diff --git a/ftnoir_posewidget/glwidget.cpp b/ftnoir_posewidget/glwidget.cpp
index 55b65619..32723dc9 100644
--- a/ftnoir_posewidget/glwidget.cpp
+++ b/ftnoir_posewidget/glwidget.cpp
@@ -28,10 +28,14 @@
 #include <QtOpenGL>
 
 #include "glwidget.h"
+#include <QWidget>
 
 GLWidget::GLWidget(QWidget *parent, QGLWidget *shareWidget)
     : QGLWidget(parent, shareWidget)
 {
+#if !defined(_WIN32)
+    setAttribute(Qt::WA_NativeWindow, true);
+#endif
     clearColor = Qt::black;
     xRot = 0;
     yRot = 0;
@@ -74,7 +78,7 @@ void GLWidget::initializeGL()
 {
     makeObject();
 
-    glEnable(GL_DEPTH_TEST);
+    glDisable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
 #ifndef QT_OPENGL_ES_2
     glEnable(GL_TEXTURE_2D);
@@ -117,16 +121,20 @@ void GLWidget::initializeGL()
 
     program->bind();
     program->setUniformValue("texture", 0);
-
+#else
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glVertexPointer(3, GL_FLOAT, 0, vertices.constData());
+    glTexCoordPointer(2, GL_FLOAT, 0, texCoords.constData());
 #endif
 }
 
 void GLWidget::paintGL()
 {
-    qglClearColor(clearColor);
+    glClearColor(0, 0, 0, 1);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-#if !defined(QT_OPENGL_ES_2)
+#if 1
 
     glLoadIdentity();
     glTranslatef(0.0f, 0.0f, -10.0f);
@@ -135,11 +143,6 @@ void GLWidget::paintGL()
     glRotatef(yRot, 0.0f, 1.0f, 0.0f);
     glRotatef(-1.0f * zRot, 0.0f, 0.0f, 1.0f);
 
-    glVertexPointer(3, GL_FLOAT, 0, vertices.constData());
-    glTexCoordPointer(2, GL_FLOAT, 0, texCoords.constData());
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-
 #else
 
     QMatrix4x4 m;
@@ -163,6 +166,7 @@ void GLWidget::paintGL()
         glBindTexture(GL_TEXTURE_2D, textures[i]);
         glDrawArrays(GL_TRIANGLE_FAN, i * 4, 4);
     }
+    glFlush();
 }
 
 void GLWidget::resizeGL(int width, int height)
diff --git a/ftnoir_posewidget/glwidget.h b/ftnoir_posewidget/glwidget.h
index cff8cb83..3d0e590a 100644
--- a/ftnoir_posewidget/glwidget.h
+++ b/ftnoir_posewidget/glwidget.h
@@ -29,10 +29,11 @@
 
 #include <QtGui>
 #include <QGLWidget>
+#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
 
 class QGLShaderProgram;
 
-class GLWidget : public QGLWidget
+class FTNOIR_TRACKER_BASE_EXPORT GLWidget : public QGLWidget
 {
     Q_OBJECT
 
-- 
cgit v1.2.3