Changeset 561 for trunk/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.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/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.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 QtOpenGL module 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 ** … … 51 51 // 52 52 53 #ifndef QGL2PEXVERTEXARRAY_P_H 54 #define QGL2PEXVERTEXARRAY_P_H 55 53 56 #include <QRectF> 54 57 … … 56 59 #include <private/qvectorpath_p.h> 57 60 #include <private/qgl_p.h> 61 62 QT_BEGIN_NAMESPACE 58 63 59 64 class QGLPoint … … 63 68 x(new_x), y(new_y) {}; 64 69 65 QGLPoint( QPointFp) :70 QGLPoint(const QPointF &p) : 66 71 x(p.x()), y(p.y()) {}; 67 72 … … 78 83 struct QGLRect 79 84 { 80 QGLRect( QRectFr)85 QGLRect(const QRectF &r) 81 86 : left(r.left()), top(r.top()), right(r.right()), bottom(r.bottom()) {} 82 87 … … 99 104 boundingRectDirty(true) {} 100 105 101 void addPath(const QVectorPath &path, GLfloat curveInverseScale); 106 void addRect(const QRectF &rect); 107 void addPath(const QVectorPath &path, GLfloat curveInverseScale, bool outline = true); 102 108 void clear(); 103 109 104 110 QGLPoint* data() {return vertexArray.data();} 105 QVector<int>& stops() {return vertexArrayStops;} 111 int *stops() const { return vertexArrayStops.data(); } 112 int stopCount() const { return vertexArrayStops.size(); } 106 113 QGLRect boundingRect() const; 114 115 int vertexCount() const { return vertexArray.size(); } 107 116 108 117 void lineToArray(const GLfloat x, const GLfloat y); … … 110 119 private: 111 120 QDataBuffer<QGLPoint> vertexArray; 112 Q Vector<int>vertexArrayStops;121 QDataBuffer<int> vertexArrayStops; 113 122 114 123 GLfloat maxX; … … 117 126 GLfloat minY; 118 127 bool boundingRectDirty; 128 void addClosingLine(int index); 129 void addCentroid(const QVectorPath &path, int subPathIndex); 130 }; 119 131 120 inline void curveToArray(const QGLPoint &cp1, const QGLPoint &cp2, const QGLPoint &ep, GLfloat inverseScale); 121 }; 132 QT_END_NAMESPACE 133 134 #endif
Note:
See TracChangeset
for help on using the changeset viewer.