remove display lists and qt3d-ize overpainting/hellogl example

On the way to making opengl examples portable, remove display lists
and go to triangles only. Use QMatrix4x4. While on the job use Qt/3D
stylee to make the QtLogo as an example of 3D programming more Qt-like.

Reviewed-by: Rhys Weatherley

1 files changed, 3 insertions, 7 deletions

diff --git a/examples/opengl/hellogl/glwidget.h b/examples/opengl/hellogl/glwidget.h
index b202a61..4ffd4d7 100644
--- a/examples/opengl/hellogl/glwidget.h
+++ b/examples/opengl/hellogl/glwidget.h
@@ -44,6 +44,8 @@
 
 #include <QGLWidget>
 
+class QtLogo;
+
 //! [0]
 class GLWidget : public QGLWidget
 {
@@ -80,13 +82,7 @@ protected:
 
 //! [3]
 private:
-    GLuint makeObject();
-    void quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
-              GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4);
-    void extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-    void normalizeAngle(int *angle);
-
-    GLuint object;
+    QtLogo *logo;
     int xRot;
     int yRot;
     int zRot;