Add Qt3 development HEAD version

10 files changed, 474 insertions, 0 deletions

diff --git a/examples/opengl/texture/README b/examples/opengl/texture/README
new file mode 100644
index 0000000..5b85cd7
--- /dev/null
+++ b/examples/opengl/texture/README
@@ -0,0 +1,4 @@
+
+The texture example
+
+This example program demonstrates how to use OpenGL 2D textures.
diff --git a/examples/opengl/texture/gllogo.bmp b/examples/opengl/texture/gllogo.bmp
new file mode 100644
index 0000000..ee64a10
--- /dev/null
+++ b/examples/opengl/texture/gllogo.bmp
diff --git a/examples/opengl/texture/globjwin.cpp b/examples/opengl/texture/globjwin.cpp
new file mode 100644
index 0000000..4fe6b62
--- /dev/null
+++ b/examples/opengl/texture/globjwin.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of an example program for Qt.  This example
+** program may be used, distributed and modified without limitation.
+**
+*****************************************************************************/
+
+#include <qpushbutton.h>
+#include <qslider.h>
+#include <qlayout.h>
+#include <qframe.h>
+#include <qmenubar.h>
+#include <qpopupmenu.h>
+#include <qapplication.h>
+#include <qkeycode.h>
+#include "globjwin.h"
+#include "gltexobj.h"
+
+
+GLObjectWindow::GLObjectWindow( QWidget* parent, const char* name )
+    : QWidget( parent, name )
+{
+
+    // Create nice frames to put around the OpenGL widgets
+    QFrame* f1 = new QFrame( this, "frame1" );
+    f1->setFrameStyle( QFrame::Sunken | QFrame::Panel );
+    f1->setLineWidth( 2 );
+
+    // Create an OpenGL widget
+    GLTexobj* c = new GLTexobj( f1, "glbox1");
+
+    // Create a menu
+    QPopupMenu *file = new QPopupMenu( this );
+    file->insertItem( "Toggle Animation", c, SLOT(toggleAnimation()),
+		      CTRL+Key_A );
+    file->insertSeparator();
+    file->insertItem( "Exit",  qApp, SLOT(quit()), CTRL+Key_Q );
+    
+    // Create a menu bar
+    QMenuBar *m = new QMenuBar( this );
+    m->setSeparator( QMenuBar::InWindowsStyle );
+    m->insertItem("&File", file );
+
+    // Create the three sliders; one for each rotation axis
+    QSlider* x = new QSlider ( 0, 360, 60, 0, QSlider::Vertical, this, "xsl" );
+    x->setTickmarks( QSlider::Left );
+    connect( x, SIGNAL(valueChanged(int)), c, SLOT(setXRotation(int)) );
+
+    QSlider* y = new QSlider ( 0, 360, 60, 0, QSlider::Vertical, this, "ysl" );
+    y->setTickmarks( QSlider::Left );
+    connect( y, SIGNAL(valueChanged(int)), c, SLOT(setYRotation(int)) );
+
+    QSlider* z = new QSlider ( 0, 360, 60, 0, QSlider::Vertical, this, "zsl" );
+    z->setTickmarks( QSlider::Left );
+    connect( z, SIGNAL(valueChanged(int)), c, SLOT(setZRotation(int)) );
+
+
+    // Now that we have all the widgets, put them into a nice layout
+
+    // Put the sliders on top of each other
+    QVBoxLayout* vlayout = new QVBoxLayout( 20, "vlayout");
+    vlayout->addWidget( x );
+    vlayout->addWidget( y );
+    vlayout->addWidget( z );
+
+    // Put the GL widget inside the frame
+    QHBoxLayout* flayout1 = new QHBoxLayout( f1, 2, 2, "flayout1");
+    flayout1->addWidget( c, 1 );
+
+    // Top level layout, puts the sliders to the left of the frame/GL widget
+    QHBoxLayout* hlayout = new QHBoxLayout( this, 20, 20, "hlayout");
+    hlayout->setMenuBar( m );
+    hlayout->addLayout( vlayout );
+    hlayout->addWidget( f1, 1 );
+
+}
diff --git a/examples/opengl/texture/globjwin.h b/examples/opengl/texture/globjwin.h
new file mode 100644
index 0000000..68fa233
--- /dev/null
+++ b/examples/opengl/texture/globjwin.h
@@ -0,0 +1,32 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of an example program for Qt.  This example
+** program may be used, distributed and modified without limitation.
+**
+*****************************************************************************/
+
+/****************************************************************************
+**
+** The GLObjectWindow contains a GLBox and three sliders connected to
+** the GLBox's rotation slots.
+**
+****************************************************************************/
+
+#ifndef GLOBJWIN_H
+#define GLOBJWIN_H
+
+#include <qwidget.h>
+
+
+class GLObjectWindow : public QWidget
+{
+    Q_OBJECT
+public:
+    GLObjectWindow( QWidget* parent = 0, const char* name = 0 );
+
+};
+
+
+#endif // GLOBJWIN_H
diff --git a/examples/opengl/texture/gltexobj.cpp b/examples/opengl/texture/gltexobj.cpp
new file mode 100644
index 0000000..2fc05d6
--- /dev/null
+++ b/examples/opengl/texture/gltexobj.cpp
@@ -0,0 +1,240 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of an example program for Qt.  This example
+** program may be used, distributed and modified without limitation.
+**
+*****************************************************************************/
+
+/****************************************************************************
+**
+** This is a simple QGLWidget demonstrating the use of QImages for textures.
+**
+** Much of the GL code is inspired by the 'spectex' and 'texcyl' 
+** public domain demo programs by Brian Paul.
+**
+****************************************************************************/
+
+#include "gltexobj.h"
+#include <qimage.h>
+#include <qtimer.h>
+
+
+const int redrawWait = 50;
+
+/*!
+  Create a GLTexobj widget
+*/
+
+GLTexobj::GLTexobj( QWidget* parent, const char* name )
+    : QGLWidget( parent, name )
+{
+    xRot = yRot = zRot = 0.0;		// default object rotation
+    scale = 5.0;			// default object scale
+    object = 0;
+    animation = TRUE;
+    timer = new QTimer( this );
+    connect( timer, SIGNAL(timeout()), SLOT(update()) );
+    timer->start( redrawWait, TRUE );
+}
+
+
+/*!
+  Release allocated resources
+*/
+
+GLTexobj::~GLTexobj()
+{
+    makeCurrent();
+    glDeleteLists( object, 1 );
+}
+
+
+/*!
+  Paint the texobj. The actual openGL commands for drawing the texobj are
+  performed here.
+*/
+
+void GLTexobj::paintGL()
+{
+    if ( animation ) {
+	xRot += 1.0;
+	yRot += 2.5;
+	zRot -= 5.0;
+    }
+    glClear( GL_COLOR_BUFFER_BIT );
+    glPushMatrix();
+    glRotatef( xRot, 1.0, 0.0, 0.0 ); 
+    glRotatef( yRot, 0.0, 1.0, 0.0 ); 
+    glRotatef( zRot, 0.0, 0.0, 1.0 );
+    glScalef( scale, scale, scale );
+    glCallList( object );
+    glPopMatrix();
+
+    if ( animation ) {
+	glFlush(); // Make sure everything is drawn before restarting timer
+	timer->start( redrawWait, TRUE ); // Wait this many msecs before redraw
+    }
+}
+
+
+/*!
+  Set up the OpenGL rendering state, and define display list
+*/
+
+void GLTexobj::initializeGL()
+{
+    // Set up the lights
+
+    GLfloat whiteDir[4] = {2.0, 2.0, 2.0, 1.0};
+    GLfloat whiteAmb[4] = {1.0, 1.0, 1.0, 1.0};
+    GLfloat lightPos[4] = {30.0, 30.0, 30.0, 1.0};
+
+    glEnable(GL_LIGHTING);
+    glEnable(GL_LIGHT0);
+    glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
+    glLightModelfv(GL_LIGHT_MODEL_AMBIENT, whiteAmb);
+
+    glMaterialfv(GL_FRONT, GL_DIFFUSE, whiteDir);
+    glMaterialfv(GL_FRONT, GL_SPECULAR, whiteDir);
+    glMaterialf(GL_FRONT, GL_SHININESS, 20.0);
+
+    glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteDir);		// enable diffuse
+    glLightfv(GL_LIGHT0, GL_SPECULAR, whiteDir);	// enable specular
+    glLightfv(GL_LIGHT0, GL_POSITION, lightPos);
+
+    // Set up the textures
+
+    QImage tex1, tex2, buf;
+
+    if ( !buf.load( "gllogo.bmp" ) ) {	// Load first image from file
+	qWarning( "Could not read image file, using single-color instead." );
+	QImage dummy( 128, 128, 32 );
+	dummy.fill( Qt::green.rgb() );
+	buf = dummy;
+    }
+    tex1 = QGLWidget::convertToGLFormat( buf );  // flipped 32bit RGBA
+
+    if ( !buf.load( "qtlogo.bmp" ) ) {	// Load first image from file
+	qWarning( "Could not read image file, using single-color instead." );
+	QImage dummy( 128, 128, 32 );
+	dummy.fill( Qt::red.rgb() );
+	buf = dummy;
+    }
+    tex2 = QGLWidget::convertToGLFormat( buf );  // flipped 32bit RGBA
+
+    glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+    glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    glEnable( GL_TEXTURE_2D );
+
+    // Set up various other stuff
+
+    glClearColor( 0.0, 0.0, 0.0, 0.0 ); // Let OpenGL clear to black
+    glEnable( GL_CULL_FACE );  	// don't need Z testing for convex objects
+    glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST );
+
+    // Make the object display list
+
+    object = makeObject( tex1, tex2 );	// Generate an OpenGL display list
+}
+
+
+
+/*!
+  Set up the OpenGL view port, matrix mode, etc.
+*/
+
+void GLTexobj::resizeGL( int w, int h )
+{
+    glViewport( 0, 0, w, h );
+    glMatrixMode( GL_PROJECTION );
+    glLoadIdentity();
+    glFrustum( -1.0, 1.0, -1.0, 1.0, 10.0, 100.0 );
+    glMatrixMode( GL_MODELVIEW );
+    glLoadIdentity();
+    glTranslatef( 0.0, 0.0, -70.0 );
+}
+
+
+/*!
+  Generate an OpenGL display list for the object to be shown, i.e. the texobj
+*/
+
+GLuint GLTexobj::makeObject( const QImage& tex1, const QImage& tex2 )
+{
+    GLUquadricObj* q = gluNewQuadric();
+    GLuint cylinderObj = glGenLists(1);
+    glNewList( cylinderObj, GL_COMPILE );
+
+    glTranslatef( 0.0, 0.0, -1.0 );
+
+    // cylinder
+    glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1.width(), tex1.height(), 0,
+		  GL_RGBA, GL_UNSIGNED_BYTE, tex1.bits() );
+    gluQuadricTexture( q, GL_TRUE );
+    gluCylinder(q, 0.6, 0.6, 2.0, 24, 1);
+
+    // end cap
+    glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2.width(), tex2.height(), 0,
+		  GL_RGBA, GL_UNSIGNED_BYTE, tex2.bits() );
+    glTranslatef( 0.0, 0.0, 2.0 );
+    gluDisk( q, 0.0, 0.6, 24, 1 );
+
+    // other end cap
+    glTranslatef( 0.0, 0.0, -2.0 );
+    gluQuadricOrientation( q, (GLenum)GLU_INSIDE );
+    gluDisk( q, 0.0, 0.6, 24, 1 );
+
+    glEndList();
+    gluDeleteQuadric( q );
+
+    return cylinderObj;
+}
+
+
+/*!
+  Set the rotation angle of the object to \e degrees around the X axis.
+*/
+
+void GLTexobj::setXRotation( int degrees )
+{
+    xRot = (GLfloat)(degrees % 360);
+    updateGL();
+}
+
+
+/*!
+  Set the rotation angle of the object to \e degrees around the Y axis.
+*/
+
+void GLTexobj::setYRotation( int degrees )
+{
+    yRot = (GLfloat)(degrees % 360);
+    updateGL();
+}
+
+
+/*!
+  Set the rotation angle of the object to \e degrees around the Z axis.
+*/
+
+void GLTexobj::setZRotation( int degrees )
+{
+    zRot = (GLfloat)(degrees % 360);
+    updateGL();
+}
+
+
+/*!
+  Turns animation on or off
+*/
+
+void GLTexobj::toggleAnimation()
+{
+    animation = !animation;
+    if ( animation )
+	updateGL();
+    else
+	timer->stop();
+}
diff --git a/examples/opengl/texture/gltexobj.h b/examples/opengl/texture/gltexobj.h
new file mode 100644
index 0000000..62d8881
--- /dev/null
+++ b/examples/opengl/texture/gltexobj.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of an example program for Qt.  This example
+** program may be used, distributed and modified without limitation.
+**
+*****************************************************************************/
+
+/****************************************************************************
+**
+** This is a simple QGLWidget displaying an openGL wireframe box
+**
+****************************************************************************/
+
+#ifndef GLTEXOBJ_H
+#define GLTEXOBJ_H
+
+#include <qgl.h>
+
+
+class GLTexobj : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+
+    GLTexobj( QWidget* parent, const char* name );
+    ~GLTexobj();
+
+public slots:
+
+    void		setXRotation( int degrees );
+    void		setYRotation( int degrees );
+    void		setZRotation( int degrees );
+    void		toggleAnimation();
+
+protected:
+
+    void		initializeGL();
+    void		paintGL();
+    void		resizeGL( int w, int h );
+
+    virtual GLuint 	makeObject( const QImage& tex1, const QImage& tex2 );
+
+private:
+    bool animation;
+    GLuint object;
+    GLfloat xRot, yRot, zRot, scale;
+    QTimer* timer;
+};
+
+
+#endif // GLTEXOBJ_H
diff --git a/examples/opengl/texture/main.cpp b/examples/opengl/texture/main.cpp
new file mode 100644
index 0000000..0470d00
--- /dev/null
+++ b/examples/opengl/texture/main.cpp
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of an example program for Qt.  This example
+** program may be used, distributed and modified without limitation.
+**
+*****************************************************************************/
+//
+// Qt OpenGL example: Texture
+//
+// File: main.cpp
+//
+// The main() function 
+// 
+
+#include "globjwin.h"
+#include <qapplication.h>
+#include <qgl.h>
+
+/*
+  The main program is here. 
+*/
+
+int main( int argc, char **argv )
+{
+    QApplication::setColorSpec( QApplication::CustomColor );
+    QApplication a(argc,argv);
+
+    if ( !QGLFormat::hasOpenGL() ) {
+	qWarning( "This system has no OpenGL support. Exiting." );
+	return -1;
+    }
+    
+    GLObjectWindow* w = new GLObjectWindow;
+    w->resize( 400, 350 );
+    a.setMainWidget( w );
+    w->show();
+    int result = a.exec();
+    delete w;
+    return result;
+}
diff --git a/examples/opengl/texture/qtlogo.bmp b/examples/opengl/texture/qtlogo.bmp
new file mode 100644
index 0000000..b7f9215
--- /dev/null
+++ b/examples/opengl/texture/qtlogo.bmp
diff --git a/examples/opengl/texture/texture.doc b/examples/opengl/texture/texture.doc
new file mode 100644
index 0000000..28f1d3f
--- /dev/null
+++ b/examples/opengl/texture/texture.doc
@@ -0,0 +1,10 @@
+/*!   \page opengl-texture-example.html
+
+  \ingroup opengl-examples
+  \title OpenGL Texture Example
+
+This example program demonstrates how to use OpenGL 2D textures.
+
+See \c{$QTDIR/examples/opengl/texture} for the source code.
+
+*/
diff --git a/examples/opengl/texture/texture.pro b/examples/opengl/texture/texture.pro
new file mode 100644
index 0000000..a9a31b8
--- /dev/null
+++ b/examples/opengl/texture/texture.pro
@@ -0,0 +1,14 @@
+TEMPLATE	= app
+TARGET		= texture
+
+CONFIG		+= qt opengl warn_on release
+CONFIG -= dlopen_opengl
+DEPENDPATH	= ../include
+
+REQUIRES        = opengl
+
+HEADERS		= gltexobj.h \
+		  globjwin.h
+SOURCES		= gltexobj.cpp \
+		  globjwin.cpp \
+		  main.cpp