diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-24 10:25:01 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 10:11:51 +0200 |
commit | 3c7d4de151d0d87b687644381c5d8aaef06f21b2 (patch) | |
tree | 12c688048acac5f817b68dfbef088544a8ae946a /src/datavisualization/utils/surfaceobject.cpp | |
parent | fcb44309e4cd228245d310bdbd622e7a2ff98283 (diff) |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/datavisualization/utils/surfaceobject.cpp')
-rw-r--r-- | src/datavisualization/utils/surfaceobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index f9e4181e..96a75422 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -77,7 +77,7 @@ void SurfaceObject::setUpSmoothData(const QSurfaceDataArray &dataArray, const QR if (changeGeometry) m_vertices.resize(totalSize); - QVector<QVector2D> uvs; + QList<QVector2D> uvs; if (changeGeometry) uvs.resize(totalSize); int totalIndex = 0; @@ -315,7 +315,7 @@ void SurfaceObject::smoothUVs(const QSurfaceDataArray &dataArray, const bool zDescending = m_dataDimension.testFlag(SurfaceObject::ZDescending); const bool xDescending = m_dataDimension.testFlag(SurfaceObject::XDescending); - QVector<QVector2D> uvs; + QList<QVector2D> uvs; uvs.resize(m_rows * m_columns); int index = 0; for (int i = 0; i < m_rows; i++) { @@ -534,7 +534,7 @@ void SurfaceObject::setUpData(const QSurfaceDataArray &dataArray, const QRect &s if (changeGeometry) m_vertices.resize(totalSize); - QVector<QVector2D> uvs; + QList<QVector2D> uvs; if (changeGeometry) uvs.resize(totalSize); @@ -620,7 +620,7 @@ void SurfaceObject::coarseUVs(const QSurfaceDataArray &dataArray, const bool zDescending = m_dataDimension.testFlag(SurfaceObject::ZDescending); const bool xDescending = m_dataDimension.testFlag(SurfaceObject::XDescending); - QVector<QVector2D> uvs; + QList<QVector2D> uvs; uvs.resize(m_rows * m_columns * 2); int index = 0; int colLimit = m_columns - 1; @@ -802,12 +802,12 @@ void SurfaceObject::createCoarseGridlineIndices(int x, int y, int endX, int endY void SurfaceObject::uploadBuffers() { - QVector<QVector2D> uvs; // Empty dummy + QList<QVector2D> uvs; // Empty dummy createBuffers(m_vertices, uvs, m_normals, 0); } -void SurfaceObject::createBuffers(const QVector<QVector3D> &vertices, const QVector<QVector2D> &uvs, - const QVector<QVector3D> &normals, const GLint *indices) +void SurfaceObject::createBuffers(const QList<QVector3D> &vertices, const QList<QVector2D> &uvs, + const QList<QVector3D> &normals, const GLint *indices) { // Move to buffers glBindBuffer(GL_ARRAY_BUFFER, m_vertexbuffer); |