diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:14:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:14:17 +0200 |
| commit | 6ebef79d390c79cd5ed792b96faa46d60737d366 (patch) | |
| tree | 1e81f6069c17474a11bf20eb407e196e1e53f0f4 /src/render/geometry | |
| parent | 109054eb34e15341d5e59d7e9931e1e5fd3604d3 (diff) | |
| parent | f24f85c718543cc51663ac2fe55eb3a3b50628ec (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
src/render/geometry/qattribute.cpp
Change-Id: I17d35c69f1835928930240b4fe45e565fd0dfa0f
Diffstat (limited to 'src/render/geometry')
| -rw-r--r-- | src/render/geometry/qattribute.cpp | 5 | ||||
| -rw-r--r-- | src/render/geometry/qgeometry.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index 7ace1ae3c..3067b0527 100644 --- a/src/render/geometry/qattribute.cpp +++ b/src/render/geometry/qattribute.cpp @@ -178,7 +178,8 @@ QString QAttribute::name() const /*! * \property QAttribute::vertexSize * - * Holds the data size. + * Holds the data size, it can only be 1 to 4 units (scalars and vectors), + * 9 units (3x3 matrices) or 16 units (4x4 matrices). */ uint QAttribute::vertexSize() const { @@ -304,7 +305,7 @@ void QAttribute::setVertexSize(uint size) Q_D(QAttribute); if (d->m_vertexSize == size) return; - Q_ASSERT(size >= 1 && size <= 4); + Q_ASSERT((size >= 1 && size <= 4) || (size == 9) || (size == 16)); d->m_vertexSize = size; emit vertexSizeChanged(size); emit dataSizeChanged(size); diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h index 70fea8cd9..143d98d1e 100644 --- a/src/render/geometry/qgeometry.h +++ b/src/render/geometry/qgeometry.h @@ -59,8 +59,8 @@ public: ~QGeometry(); QVector<QAttribute *> attributes() const; - void addAttribute(QAttribute *attribute); - void removeAttribute(QAttribute *attribute); + Q_INVOKABLE void addAttribute(Qt3DRender::QAttribute *attribute); + Q_INVOKABLE void removeAttribute(Qt3DRender::QAttribute *attribute); QAttribute *boundingVolumePositionAttribute() const; |