Changeset 561 for trunk/examples/opengl/hellogl_es2/glwidget.h
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/examples/opengl/hellogl_es2/glwidget.h
r2 r561 2 2 ** 3 3 ** 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) 5 6 ** 6 7 ** This file is part of the examples of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 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. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** 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. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 44 44 45 45 #include <QGLWidget> 46 #include <QtGui/qvector3d.h> 47 #include <QtGui/qmatrix4x4.h> 48 #include <QtOpenGL/qglshaderprogram.h> 46 49 #include <QTime> 50 #include <QVector> 47 51 48 52 class Bubble; … … 72 76 void quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4); 73 77 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; 79 80 bool qtLogo; 80 81 QList<Bubble*> bubbles; 81 82 int frames; 82 83 QTime time; 83 GLuintprogram1;84 GLuintprogram2;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; 93 94 }; 94 95 #endif
Note:
See TracChangeset
for help on using the changeset viewer.