Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/examples/opengl/hellogl_es2/glwidget.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    4444
    4545#include <QGLWidget>
     46#include <QtGui/qvector3d.h>
     47#include <QtGui/qmatrix4x4.h>
     48#include <QtOpenGL/qglshaderprogram.h>
    4649#include <QTime>
     50#include <QVector>
    4751
    4852class Bubble;
     
    7276    void quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4);
    7377    void extrude(qreal x1, qreal y1, qreal x2, qreal y2);
    74     QList<qreal> vertices;
    75     QList<qreal> normals;
    76     GLfloat *createdVertices;
    77     GLfloat *createdNormals;
    78     int m_vertexNumber;
     78    QVector<QVector3D> vertices;
     79    QVector<QVector3D> normals;
    7980    bool qtLogo;
    8081    QList<Bubble*> bubbles;
    8182    int frames;
    8283    QTime time;
    83     GLuint program1;
    84     GLuint program2;
    85     GLuint vertexAttr1;
    86     GLuint normalAttr1;
    87     GLuint matrixUniform1;
    88     GLuint vertexAttr2;
    89     GLuint normalAttr2;
    90     GLuint texCoordAttr2;
    91     GLuint matrixUniform2;
    92     GLuint textureUniform2;
     84    QGLShaderProgram program1;
     85    QGLShaderProgram program2;
     86    int vertexAttr1;
     87    int normalAttr1;
     88    int matrixUniform1;
     89    int vertexAttr2;
     90    int normalAttr2;
     91    int texCoordAttr2;
     92    int matrixUniform2;
     93    int textureUniform2;
    9394};
    9495#endif
Note: See TracChangeset for help on using the changeset viewer.