diff options
author | Mike Krus <mike.krus@kdab.com> | 2016-03-12 16:48:45 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-13 08:48:31 +0000 |
commit | 7d616f68b0615f73fcef7222eb800576fbbfd718 (patch) | |
tree | 39cb16c932fef2f9fa4c2d7981aaedaf8d9715b5 | |
parent | 61ef2b1a2c3c58a7a02db123363fb0f5550c468a (diff) |
QGeometryRenderer API changes
- primitiveCount -> vertexCount
- baseInstance -> firstInstance
- restartIndex -> restartIndexValue
- primitiveRestart -> primitiveRestartEnabled
- baseVertex -> indexOffset
Task-number: QTBUG-51515
Change-Id: I95e1e04e08b6441fcf8721db382f8f0c457f6faa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
20 files changed, 218 insertions, 218 deletions
diff --git a/examples/qt3d/compute-particles/ParticlesScene.qml b/examples/qt3d/compute-particles/ParticlesScene.qml index 0dd04d0a2..e9a309022 100644 --- a/examples/qt3d/compute-particles/ParticlesScene.qml +++ b/examples/qt3d/compute-particles/ParticlesScene.qml @@ -220,8 +220,8 @@ Entity { id: particleRenderEntity readonly property GeometryRenderer particlesRenderer: GeometryRenderer { instanceCount: particlesCount - baseVertex: 0 - baseInstance: 0 + indexOffset: 0 + firstInstance: 0 primitiveType: GeometryRenderer.Triangles geometry: { switch (particlesShape) { diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp index 0ecef24dc..68f2683bf 100644 --- a/examples/qt3d/custom-mesh-cpp/main.cpp +++ b/examples/qt3d/custom-mesh-cpp/main.cpp @@ -235,12 +235,12 @@ int main(int argc, char* argv[]) customGeometry->addAttribute(indexAttribute); customMeshRenderer->setInstanceCount(1); - customMeshRenderer->setBaseVertex(0); - customMeshRenderer->setBaseInstance(0); + customMeshRenderer->setIndexOffset(0); + customMeshRenderer->setFirstInstance(0); customMeshRenderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles); customMeshRenderer->setGeometry(customGeometry); // 4 faces of 3 points - customMeshRenderer->setPrimitiveCount(12); + customMeshRenderer->setVertexCount(12); customMeshEntity->addComponent(customMeshRenderer); customMeshEntity->addComponent(transform); diff --git a/examples/qt3d/custom-mesh-qml/main.qml b/examples/qt3d/custom-mesh-qml/main.qml index f56a00ab0..2d93d84f3 100644 --- a/examples/qt3d/custom-mesh-qml/main.qml +++ b/examples/qt3d/custom-mesh-qml/main.qml @@ -160,8 +160,8 @@ Entity { GeometryRenderer { id: customMesh instanceCount: 1 - baseVertex: 0 - baseInstance: 0 + indexOffset: 0 + firstInstance: 0 primitiveType: GeometryRenderer.Triangles Buffer { id: vertexBuffer diff --git a/src/3rdparty/assimp/code/BlenderTessellator.cpp b/src/3rdparty/assimp/code/BlenderTessellator.cpp index 98ccbad6a..8a7e274a3 100644 --- a/src/3rdparty/assimp/code/BlenderTessellator.cpp +++ b/src/3rdparty/assimp/code/BlenderTessellator.cpp @@ -146,7 +146,7 @@ void BlenderTessellatorGL::TriangulateDrawCalls( const TessDataGL& tessData ) for ( unsigned int i = 0; i < tessData.drawCalls.size( ); ++i ) { const DrawCallGL& drawCallGL = tessData.drawCalls[ i ]; - const VertexGL* vertices = &tessData.vertices[ drawCallGL.baseVertex ]; + const VertexGL* vertices = &tessData.vertices[ drawCallGL.baseVertex ]; if ( drawCallGL.drawMode == GL_TRIANGLES ) { MakeFacesFromTris( vertices, drawCallGL.vertexCount ); diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 3afc92731..1719cdd65 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -808,8 +808,8 @@ void Renderer::performDraw(GeometryRenderer *rGeometryRenderer, GLsizei primitiv if (rGeometryRenderer->primitiveType() == QGeometryRenderer::Patches) m_graphicsContext->setVerticesPerPatch(rGeometryRenderer->verticesPerPatch()); - if (rGeometryRenderer->primitiveRestart()) - m_graphicsContext->enablePrimitiveRestart(rGeometryRenderer->restartIndex()); + if (rGeometryRenderer->primitiveRestartEnabled()) + m_graphicsContext->enablePrimitiveRestart(rGeometryRenderer->restartIndexValue()); // TO DO: Add glMulti Draw variants if (drawIndexed) @@ -818,10 +818,10 @@ void Renderer::performDraw(GeometryRenderer *rGeometryRenderer, GLsizei primitiv indexType, reinterpret_cast<void*>(quintptr(indexAttribute->byteOffset())), rGeometryRenderer->instanceCount(), - rGeometryRenderer->baseVertex()); + rGeometryRenderer->indexOffset()); else m_graphicsContext->drawArraysInstanced(primType, - rGeometryRenderer->baseInstance(), + rGeometryRenderer->firstInstance(), primitiveCount, rGeometryRenderer->instanceCount()); @@ -831,7 +831,7 @@ void Renderer::performDraw(GeometryRenderer *rGeometryRenderer, GLsizei primitiv qCWarning(Rendering) << "GL error after drawing mesh:" << QString::number(err, 16); #endif - if (rGeometryRenderer->primitiveRestart()) + if (rGeometryRenderer->primitiveRestartEnabled()) m_graphicsContext->disablePrimitiveRestart(); // Unset dirtiness on rGeometryRenderer only @@ -944,7 +944,7 @@ bool Renderer::executeCommands(const RenderView *rv) Attribute *indexAttribute = Q_NULLPTR; bool specified = false; const bool requiresVAOUpdate = (!vao || !vao->isSpecified()) || (rGeometry->isDirty() || rGeometryRenderer->isDirty()); - GLsizei primitiveCount = rGeometryRenderer->primitiveCount(); + GLsizei primitiveCount = rGeometryRenderer->vertexCount(); // Append dirty Geometry to temporary vector // so that its dirtiness can be unset later diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index ec222d53e..0d494ba85 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -54,12 +54,12 @@ namespace Render { GeometryRenderer::GeometryRenderer() : BackendNode(ReadWrite) , m_instanceCount(0) - , m_primitiveCount(0) - , m_baseVertex(0) - , m_baseInstance(0) - , m_restartIndex(-1) + , m_vertexCount(0) + , m_indexOffset(0) + , m_firstInstance(0) + , m_restartIndexValue(-1) , m_verticesPerPatch(0) - , m_primitiveRestart(false) + , m_primitiveRestartEnabled(false) , m_primitiveType(QGeometryRenderer::Triangles) , m_dirty(false) , m_enabled(true) @@ -74,12 +74,12 @@ GeometryRenderer::~GeometryRenderer() void GeometryRenderer::cleanup() { m_instanceCount = 0; - m_primitiveCount = 0; - m_baseVertex = 0; - m_baseInstance = 0; - m_restartIndex = -1; + m_vertexCount = 0; + m_indexOffset = 0; + m_firstInstance = 0; + m_restartIndexValue = -1; m_verticesPerPatch = 0; - m_primitiveRestart = false; + m_primitiveRestartEnabled = false; m_primitiveType = QGeometryRenderer::Triangles; m_geometryId = Qt3DCore::QNodeId(); m_dirty = false; @@ -99,12 +99,12 @@ void GeometryRenderer::updateFromPeer(Qt3DCore::QNode *peer) QGeometryRenderer *geometryRenderer = static_cast<QGeometryRenderer *>(peer); if (geometryRenderer) { m_instanceCount = geometryRenderer->instanceCount(); - m_primitiveCount = geometryRenderer->primitiveCount(); - m_baseVertex = geometryRenderer->baseVertex(); - m_baseInstance = geometryRenderer->baseInstance(); - m_restartIndex = geometryRenderer->restartIndex(); + m_vertexCount = geometryRenderer->vertexCount(); + m_indexOffset = geometryRenderer->indexOffset(); + m_firstInstance = geometryRenderer->firstInstance(); + m_restartIndexValue = geometryRenderer->restartIndexValue(); m_verticesPerPatch = geometryRenderer->verticesPerPatch(); - m_primitiveRestart = geometryRenderer->primitiveRestart(); + m_primitiveRestartEnabled = geometryRenderer->primitiveRestartEnabled(); m_primitiveType = geometryRenderer->primitiveType(); m_enabled = geometryRenderer->isEnabled(); if (geometryRenderer->geometry() != Q_NULLPTR) @@ -127,23 +127,23 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) if (propertyName == QByteArrayLiteral("instanceCount")) { m_instanceCount = propertyChange->value().value<int>(); m_dirty = true; - } else if (propertyName == QByteArrayLiteral("primitiveCount")) { - m_primitiveCount = propertyChange->value().value<int>(); + } else if (propertyName == QByteArrayLiteral("vertexCount")) { + m_vertexCount = propertyChange->value().value<int>(); m_dirty = true; - } else if (propertyName == QByteArrayLiteral("baseVertex")) { - m_baseVertex = propertyChange->value().value<int>(); + } else if (propertyName == QByteArrayLiteral("indexOffset")) { + m_indexOffset = propertyChange->value().value<int>(); m_dirty = true; - } else if (propertyName == QByteArrayLiteral("baseInstance")) { - m_baseInstance = propertyChange->value().value<int>(); + } else if (propertyName == QByteArrayLiteral("firstInstance")) { + m_firstInstance = propertyChange->value().value<int>(); m_dirty = true; - } else if (propertyName == QByteArrayLiteral("restartIndex")) { - m_restartIndex = propertyChange->value().value<int>(); + } else if (propertyName == QByteArrayLiteral("restartIndexValue")) { + m_restartIndexValue = propertyChange->value().value<int>(); m_dirty = true; } else if (propertyName == QByteArrayLiteral("verticesPerPatch")) { m_verticesPerPatch = propertyChange->value().value<int>(); m_dirty = true; - } else if (propertyName == QByteArrayLiteral("primitiveRestart")) { - m_primitiveRestart = propertyChange->value().value<bool>(); + } else if (propertyName == QByteArrayLiteral("primitiveRestartEnabled")) { + m_primitiveRestartEnabled = propertyChange->value().value<bool>(); m_dirty = true; } else if (propertyName == QByteArrayLiteral("enabled")) { m_enabled = propertyChange->value().value<bool>(); diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h index b94c18dc9..5ca5296e1 100644 --- a/src/render/geometry/geometryrenderer_p.h +++ b/src/render/geometry/geometryrenderer_p.h @@ -79,12 +79,12 @@ public: inline Qt3DCore::QNodeId geometryId() const { return m_geometryId; } inline int instanceCount() const { return m_instanceCount; } - inline int primitiveCount() const { return m_primitiveCount; } - inline int baseVertex() const { return m_baseVertex; } - inline int baseInstance() const { return m_baseInstance; } - inline int restartIndex() const { return m_restartIndex; } + inline int vertexCount() const { return m_vertexCount; } + inline int indexOffset() const { return m_indexOffset; } + inline int firstInstance() const { return m_firstInstance; } + inline int restartIndexValue() const { return m_restartIndexValue; } inline int verticesPerPatch() const { return m_verticesPerPatch; } - inline bool primitiveRestart() const { return m_primitiveRestart; } + inline bool primitiveRestartEnabled() const { return m_primitiveRestartEnabled; } inline QGeometryRenderer::PrimitiveType primitiveType() const { return m_primitiveType; } inline bool isDirty() const { return m_dirty; } inline bool isEnabled() const { return m_enabled; } @@ -99,12 +99,12 @@ public: private: Qt3DCore::QNodeId m_geometryId; int m_instanceCount; - int m_primitiveCount; - int m_baseVertex; - int m_baseInstance; - int m_restartIndex; + int m_vertexCount; + int m_indexOffset; + int m_firstInstance; + int m_restartIndexValue; int m_verticesPerPatch; - bool m_primitiveRestart; + bool m_primitiveRestartEnabled; QGeometryRenderer::PrimitiveType m_primitiveType; bool m_dirty; bool m_enabled; diff --git a/src/render/geometry/qconemesh.h b/src/render/geometry/qconemesh.h index 025489668..1b0b7ca99 100644 --- a/src/render/geometry/qconemesh.h +++ b/src/render/geometry/qconemesh.h @@ -93,11 +93,11 @@ private: // to modify the QGeometryRenderer's properties void setInstanceCount(int instanceCount); - void setPrimitiveCount(int primitiveCount); - void setBaseVertex(int baseVertex); - void setBaseInstance(int baseInstance); - void setRestartIndex(int index); - void setPrimitiveRestart(bool enabled); + void setVertexCount(int vertexCount); + void setIndexOffset(int indexOffset); + void setFirstInstance(int firstInstance); + void setRestartIndexValue(int index); + void setPrimitiveRestartEnabled(bool enabled); void setGeometry(QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h index 784f53ecb..920c6aed2 100644 --- a/src/render/geometry/qcuboidmesh.h +++ b/src/render/geometry/qcuboidmesh.h @@ -92,11 +92,11 @@ private: // to modify the QGeometryRenderer's properties void setInstanceCount(int instanceCount); - void setPrimitiveCount(int primitiveCount); - void setBaseVertex(int baseVertex); - void setBaseInstance(int baseInstance); - void setRestartIndex(int index); - void setPrimitiveRestart(bool enabled); + void setVertexCount(int vertexCount); + void setIndexOffset(int indexOffset); + void setFirstInstance(int firstInstance); + void setRestartIndexValue(int index); + void setPrimitiveRestartEnabled(bool enabled); void setGeometry(QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h index 87ecc8e79..c26fa9ddd 100644 --- a/src/render/geometry/qcylindermesh.h +++ b/src/render/geometry/qcylindermesh.h @@ -81,11 +81,11 @@ private: // to modify the QGeometryRenderer's properties void setInstanceCount(int instanceCount); - void setPrimitiveCount(int primitiveCount); - void setBaseVertex(int baseVertex); - void setBaseInstance(int baseInstance); - void setRestartIndex(int index); - void setPrimitiveRestart(bool enabled); + void setVertexCount(int vertexCount); + void setIndexOffset(int indexOffset); + void setFirstInstance(int firstInstance); + void setRestartIndexValue(int index); + void setPrimitiveRestartEnabled(bool enabled); void setGeometry(QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index c89a8b417..bff87c70e 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -52,10 +52,10 @@ namespace Qt3DRender { QGeometryRendererPrivate::QGeometryRendererPrivate() : QComponentPrivate() , m_instanceCount(1) - , m_primitiveCount(0) - , m_baseVertex(0) - , m_baseInstance(0) - , m_restartIndex(-1) + , m_vertexCount(0) + , m_indexOffset(0) + , m_firstInstance(0) + , m_restartIndexValue(-1) , m_verticesPerPatch(0) , m_primitiveRestart(false) , m_geometry(Q_NULLPTR) @@ -76,19 +76,19 @@ QGeometryRendererPrivate::QGeometryRendererPrivate() */ /*! - * \qmlproperty int GeometryRenderer::primitiveCount + * \qmlproperty int GeometryRenderer::vertexCount * - * Holds the primitive count. + * Holds the vertex count. */ /*! - * \qmlproperty int GeometryRenderer::baseVertex + * \qmlproperty int GeometryRenderer::indexOffset * * Holds the base vertex. */ /*! - * \qmlproperty int GeometryRenderer::baseInstance + * \qmlproperty int GeometryRenderer::firstInstance * * Holds the base instance. */ @@ -186,36 +186,36 @@ int QGeometryRenderer::instanceCount() const } /*! - * \property QGeometryRenderer::primitiveCount + * \property QGeometryRenderer::vertexCount * * Holds the primitive count. */ -int QGeometryRenderer::primitiveCount() const +int QGeometryRenderer::vertexCount() const { Q_D(const QGeometryRenderer); - return d->m_primitiveCount; + return d->m_vertexCount; } /*! - * \property QGeometryRenderer::baseVertex + * \property QGeometryRenderer::indexOffset * * Holds the base vertex. */ -int QGeometryRenderer::baseVertex() const +int QGeometryRenderer::indexOffset() const { Q_D(const QGeometryRenderer); - return d->m_baseVertex; + return d->m_indexOffset; } /*! - * \property QGeometryRenderer::baseInstance + * \property QGeometryRenderer::firstInstance * * Holds the base instance. */ -int QGeometryRenderer::baseInstance() const +int QGeometryRenderer::firstInstance() const { Q_D(const QGeometryRenderer); - return d->m_baseInstance; + return d->m_firstInstance; } /*! @@ -223,10 +223,10 @@ int QGeometryRenderer::baseInstance() const * * Holds the restart index. */ -int QGeometryRenderer::restartIndex() const +int QGeometryRenderer::restartIndexValue() const { Q_D(const QGeometryRenderer); - return d->m_restartIndex; + return d->m_restartIndexValue; } /*! @@ -245,7 +245,7 @@ int QGeometryRenderer::verticesPerPatch() const * * Holds the primitive restart flag. */ -bool QGeometryRenderer::primitiveRestart() const +bool QGeometryRenderer::primitiveRestartEnabled() const { Q_D(const QGeometryRenderer); return d->m_primitiveRestart; @@ -292,44 +292,44 @@ void QGeometryRenderer::setInstanceCount(int instanceCount) emit instanceCountChanged(instanceCount); } -void QGeometryRenderer::setPrimitiveCount(int primitiveCount) +void QGeometryRenderer::setVertexCount(int vertexCount) { Q_D(QGeometryRenderer); - if (d->m_primitiveCount == primitiveCount) + if (d->m_vertexCount == vertexCount) return; - d->m_primitiveCount = primitiveCount; - emit primitiveCountChanged(primitiveCount); + d->m_vertexCount = vertexCount; + emit vertexCountChanged(vertexCount); } -void QGeometryRenderer::setBaseVertex(int baseVertex) +void QGeometryRenderer::setIndexOffset(int indexOffset) { Q_D(QGeometryRenderer); - if (d->m_baseVertex == baseVertex) + if (d->m_indexOffset == indexOffset) return; - d->m_baseVertex = baseVertex; - emit baseVertexChanged(baseVertex); + d->m_indexOffset = indexOffset; + emit indexOffsetChanged(indexOffset); } -void QGeometryRenderer::setBaseInstance(int baseInstance) +void QGeometryRenderer::setFirstInstance(int firstInstance) { Q_D(QGeometryRenderer); - if (d->m_baseInstance == baseInstance) + if (d->m_firstInstance == firstInstance) return; - d->m_baseInstance = baseInstance; - emit baseInstanceChanged(baseInstance); + d->m_firstInstance = firstInstance; + emit firstInstanceChanged(firstInstance); } -void QGeometryRenderer::setRestartIndex(int index) +void QGeometryRenderer::setRestartIndexValue(int index) { Q_D(QGeometryRenderer); - if (index == d->m_restartIndex) + if (index == d->m_restartIndexValue) return; - d->m_restartIndex = index; - emit restartIndexChanged(index); + d->m_restartIndexValue = index; + emit restartIndexValueChanged(index); } void QGeometryRenderer::setVerticesPerPatch(int verticesPerPatch) @@ -341,14 +341,14 @@ void QGeometryRenderer::setVerticesPerPatch(int verticesPerPatch) } } -void QGeometryRenderer::setPrimitiveRestart(bool enabled) +void QGeometryRenderer::setPrimitiveRestartEnabled(bool enabled) { Q_D(QGeometryRenderer); if (enabled == d->m_primitiveRestart) return; d->m_primitiveRestart = enabled; - emit primitiveRestartChanged(enabled); + emit primitiveRestartEnabledChanged(enabled); } void QGeometryRenderer::setGeometry(QGeometry *geometry) @@ -415,10 +415,10 @@ void QGeometryRenderer::copy(const QNode *ref) QComponent::copy(ref); const QGeometryRenderer *other = static_cast<const QGeometryRenderer *>(ref); d_func()->m_instanceCount = other->d_func()->m_instanceCount; - d_func()->m_primitiveCount = other->d_func()->m_primitiveCount; - d_func()->m_baseVertex = other->d_func()->m_baseVertex; - d_func()->m_baseInstance = other->d_func()->m_baseInstance; - d_func()->m_restartIndex = other->d_func()->m_restartIndex; + d_func()->m_vertexCount = other->d_func()->m_vertexCount; + d_func()->m_indexOffset = other->d_func()->m_indexOffset; + d_func()->m_firstInstance = other->d_func()->m_firstInstance; + d_func()->m_restartIndexValue = other->d_func()->m_restartIndexValue; d_func()->m_primitiveRestart = other->d_func()->m_primitiveRestart; d_func()->m_primitiveType = other->d_func()->m_primitiveType; d_func()->m_verticesPerPatch = other->d_func()->m_verticesPerPatch; diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 836a1cc0e..8644ff661 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -57,12 +57,12 @@ class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged) - Q_PROPERTY(int primitiveCount READ primitiveCount WRITE setPrimitiveCount NOTIFY primitiveCountChanged) - Q_PROPERTY(int baseVertex READ baseVertex WRITE setBaseVertex NOTIFY baseVertexChanged) - Q_PROPERTY(int baseInstance READ baseInstance WRITE setBaseInstance NOTIFY baseInstanceChanged) - Q_PROPERTY(int restartIndex READ restartIndex WRITE setRestartIndex NOTIFY restartIndexChanged) + Q_PROPERTY(int vertexCount READ vertexCount WRITE setVertexCount NOTIFY vertexCountChanged) + Q_PROPERTY(int indexOffset READ indexOffset WRITE setIndexOffset NOTIFY indexOffsetChanged) + Q_PROPERTY(int firstInstance READ firstInstance WRITE setFirstInstance NOTIFY firstInstanceChanged) + Q_PROPERTY(int restartIndexValue READ restartIndexValue WRITE setRestartIndexValue NOTIFY restartIndexValueChanged) Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged) - Q_PROPERTY(bool primitiveRestart READ primitiveRestart WRITE setPrimitiveRestart NOTIFY primitiveRestartChanged) + Q_PROPERTY(bool primitiveRestartEnabled READ primitiveRestartEnabled WRITE setPrimitiveRestartEnabled NOTIFY primitiveRestartEnabledChanged) Q_PROPERTY(Qt3DRender::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged) Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged) @@ -90,12 +90,12 @@ public: // also how to figure out which attribute(s?) hold the indices? int instanceCount() const; - int primitiveCount() const; - int baseVertex() const; - int baseInstance() const; - int restartIndex() const; + int vertexCount() const; + int indexOffset() const; + int firstInstance() const; + int restartIndexValue() const; int verticesPerPatch() const; - bool primitiveRestart() const; + bool primitiveRestartEnabled() const; QGeometry *geometry() const; PrimitiveType primitiveType() const; @@ -104,23 +104,23 @@ public: public Q_SLOTS: void setInstanceCount(int instanceCount); - void setPrimitiveCount(int primitiveCount); - void setBaseVertex(int baseVertex); - void setBaseInstance(int baseInstance); - void setRestartIndex(int index); + void setVertexCount(int vertexCount); + void setIndexOffset(int indexOffset); + void setFirstInstance(int firstInstance); + void setRestartIndexValue(int index); void setVerticesPerPatch(int verticesPerPatch); - void setPrimitiveRestart(bool enabled); + void setPrimitiveRestartEnabled(bool enabled); void setGeometry(QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); Q_SIGNALS: void instanceCountChanged(int instanceCount); - void primitiveCountChanged(int primitiveCount); - void baseVertexChanged(int baseVertex); - void baseInstanceChanged(int baseInstance); - void restartIndexChanged(int restartIndex); + void vertexCountChanged(int vertexCount); + void indexOffsetChanged(int indexOffset); + void firstInstanceChanged(int firstInstance); + void restartIndexValueChanged(int restartIndexValue); void verticesPerPatchChanged(int verticesPerPatch); - void primitiveRestartChanged(bool primitiveRestart); + void primitiveRestartEnabledChanged(bool primitiveRestartEnabled); void geometryChanged(QGeometry *geometry); void primitiveTypeChanged(PrimitiveType primitiveType); diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h index 359819349..6acf9ef79 100644 --- a/src/render/geometry/qgeometryrenderer_p.h +++ b/src/render/geometry/qgeometryrenderer_p.h @@ -66,10 +66,10 @@ public: Q_DECLARE_PUBLIC(QGeometryRenderer) int m_instanceCount; - int m_primitiveCount; - int m_baseVertex; - int m_baseInstance; - int m_restartIndex; + int m_vertexCount; + int m_indexOffset; + int m_firstInstance; + int m_restartIndexValue; int m_verticesPerPatch; bool m_primitiveRestart; QGeometry *m_geometry; diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h index 1eabb87a1..5cb4686ca 100644 --- a/src/render/geometry/qplanemesh.h +++ b/src/render/geometry/qplanemesh.h @@ -78,11 +78,11 @@ private: // to modify the QGeometryRenderer's properties void setInstanceCount(int instanceCount); - void setPrimitiveCount(int primitiveCount); - void setBaseVertex(int baseVertex); - void setBaseInstance(int baseInstance); - void setRestartIndex(int index); - void setPrimitiveRestart(bool enabled); + void setVertexCount(int vertexCount); + void setIndexOffset(int indexOffset); + void setFirstInstance(int firstInstance); + void setRestartIndexValue(int index); + void setPrimitiveRestartEnabled(bool enabled); void setGeometry(QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h index 5558579e6..a3218bc1d 100644 --- a/src/render/geometry/qspheremesh.h +++ b/src/render/geometry/qspheremesh.h @@ -82,11 +82,11 @@ private: // As this is a default provided geometry renderer, no one should be able // to modify the QGeometryRenderer's properties - void setPrimitiveCount(int primitiveCount); - void setBaseVertex(int baseVertex); - void setBaseInstance(int baseInstance); - void setRestartIndex(int index); - void setPrimitiveRestart(bool enabled); + void setVertexCount(int vertexCount); + void setIndexOffset(int indexOffset); + void setFirstInstance(int firstInstance); + void setRestartIndexValue(int index); + void setPrimitiveRestartEnabled(bool enabled); void setGeometry(QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h index de7af8474..b41f6449c 100644 --- a/src/render/geometry/qtorusmesh.h +++ b/src/render/geometry/qtorusmesh.h @@ -80,11 +80,11 @@ private: // to modify the QGeometryRenderer's properties void setInstanceCount(int instanceCount); - void setPrimitiveCount(int primitiveCount); - void setBaseVertex(int baseVertex); - void setBaseInstance(int baseInstance); - void setRestartIndex(int index); - void setPrimitiveRestart(bool enabled); + void setVertexCount(int vertexCount); + void setIndexOffset(int indexOffset); + void setFirstInstance(int firstInstance); + void setRestartIndexValue(int index); + void setPrimitiveRestartEnabled(bool enabled); void setGeometry(QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 27de35b8e..cf234e1d5 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -45,7 +45,7 @@ public: return Q_NULLPTR; } - bool operator ==(const Qt3DRender::QGeometryFactory &other) const + bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_FINAL { const TestFactory *otherFactory = functor_cast<TestFactory>(&other); if (otherFactory != Q_NULLPTR) @@ -73,11 +73,11 @@ private Q_SLOTS: Qt3DRender::QGeometryFactoryPtr factory(new TestFactory(1200)); geometryRenderer.setInstanceCount(1584); - geometryRenderer.setPrimitiveCount(1609); - geometryRenderer.setBaseVertex(750); - geometryRenderer.setBaseInstance(883); - geometryRenderer.setRestartIndex(65536); - geometryRenderer.setPrimitiveRestart(true); + geometryRenderer.setVertexCount(1609); + geometryRenderer.setIndexOffset(750); + geometryRenderer.setFirstInstance(883); + geometryRenderer.setRestartIndexValue(65536); + geometryRenderer.setPrimitiveRestartEnabled(true); geometryRenderer.setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches); geometryRenderer.setGeometry(&geometry); geometryRenderer.setGeometryFactory(factory); @@ -90,11 +90,11 @@ private Q_SLOTS: QCOMPARE(renderGeometryRenderer.peerId(), geometryRenderer.id()); QCOMPARE(renderGeometryRenderer.isDirty(), true); QCOMPARE(renderGeometryRenderer.instanceCount(), geometryRenderer.instanceCount()); - QCOMPARE(renderGeometryRenderer.primitiveCount(), geometryRenderer.primitiveCount()); - QCOMPARE(renderGeometryRenderer.baseVertex(), geometryRenderer.baseVertex()); - QCOMPARE(renderGeometryRenderer.baseInstance(), geometryRenderer.baseInstance()); - QCOMPARE(renderGeometryRenderer.restartIndex(), geometryRenderer.restartIndex()); - QCOMPARE(renderGeometryRenderer.primitiveRestart(), geometryRenderer.primitiveRestart()); + QCOMPARE(renderGeometryRenderer.vertexCount(), geometryRenderer.vertexCount()); + QCOMPARE(renderGeometryRenderer.indexOffset(), geometryRenderer.indexOffset()); + QCOMPARE(renderGeometryRenderer.firstInstance(), geometryRenderer.firstInstance()); + QCOMPARE(renderGeometryRenderer.restartIndexValue(), geometryRenderer.restartIndexValue()); + QCOMPARE(renderGeometryRenderer.primitiveRestartEnabled(), geometryRenderer.primitiveRestartEnabled()); QCOMPARE(renderGeometryRenderer.primitiveType(), geometryRenderer.primitiveType()); QCOMPARE(renderGeometryRenderer.geometryId(), geometry.id()); QCOMPARE(renderGeometryRenderer.geometryFactory(), factory); @@ -112,11 +112,11 @@ private Q_SLOTS: QVERIFY(renderGeometryRenderer.geometryId().isNull()); QCOMPARE(renderGeometryRenderer.isDirty(), false); QCOMPARE(renderGeometryRenderer.instanceCount(), 0); - QCOMPARE(renderGeometryRenderer.primitiveCount(), 0); - QCOMPARE(renderGeometryRenderer.baseVertex(), 0); - QCOMPARE(renderGeometryRenderer.baseInstance(), 0); - QCOMPARE(renderGeometryRenderer.restartIndex(), -1); - QCOMPARE(renderGeometryRenderer.primitiveRestart(), false); + QCOMPARE(renderGeometryRenderer.vertexCount(), 0); + QCOMPARE(renderGeometryRenderer.indexOffset(), 0); + QCOMPARE(renderGeometryRenderer.firstInstance(), 0); + QCOMPARE(renderGeometryRenderer.restartIndexValue(), -1); + QCOMPARE(renderGeometryRenderer.primitiveRestartEnabled(), false); QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3DRender::QGeometryRenderer::Triangles); QVERIFY(renderGeometryRenderer.geometryFactory().isNull()); QVERIFY(renderGeometryRenderer.isEnabled()); @@ -128,11 +128,11 @@ private Q_SLOTS: geometryRenderer.setInstanceCount(454); - geometryRenderer.setPrimitiveCount(350); - geometryRenderer.setBaseVertex(427); - geometryRenderer.setBaseInstance(383); - geometryRenderer.setRestartIndex(555); - geometryRenderer.setPrimitiveRestart(true); + geometryRenderer.setVertexCount(350); + geometryRenderer.setIndexOffset(427); + geometryRenderer.setFirstInstance(383); + geometryRenderer.setRestartIndexValue(555); + geometryRenderer.setPrimitiveRestartEnabled(true); geometryRenderer.setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches); geometryRenderer.setGeometry(&geometry); geometryRenderer.setGeometryFactory(factory); @@ -147,11 +147,11 @@ private Q_SLOTS: QVERIFY(renderGeometryRenderer.geometryId().isNull()); QCOMPARE(renderGeometryRenderer.isDirty(), false); QCOMPARE(renderGeometryRenderer.instanceCount(), 0); - QCOMPARE(renderGeometryRenderer.primitiveCount(), 0); - QCOMPARE(renderGeometryRenderer.baseVertex(), 0); - QCOMPARE(renderGeometryRenderer.baseInstance(), 0); - QCOMPARE(renderGeometryRenderer.restartIndex(), -1); - QCOMPARE(renderGeometryRenderer.primitiveRestart(), false); + QCOMPARE(renderGeometryRenderer.vertexCount(), 0); + QCOMPARE(renderGeometryRenderer.indexOffset(), 0); + QCOMPARE(renderGeometryRenderer.firstInstance(), 0); + QCOMPARE(renderGeometryRenderer.restartIndexValue(), -1); + QCOMPARE(renderGeometryRenderer.primitiveRestartEnabled(), false); QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3DRender::QGeometryRenderer::Triangles); QVERIFY(renderGeometryRenderer.geometryFactory().isNull()); QVERIFY(renderGeometryRenderer.isEnabled()); @@ -182,12 +182,12 @@ private Q_SLOTS: // WHEN updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); - updateChange->setPropertyName("primitiveCount"); + updateChange->setPropertyName("vertexCount"); updateChange->setValue(56); renderGeometryRenderer.sceneChangeEvent(updateChange); // THEN - QCOMPARE(renderGeometryRenderer.primitiveCount(), 56); + QCOMPARE(renderGeometryRenderer.vertexCount(), 56); QVERIFY(renderGeometryRenderer.isDirty()); renderGeometryRenderer.unsetDirty(); @@ -195,12 +195,12 @@ private Q_SLOTS: // WHEN updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); - updateChange->setPropertyName("baseVertex"); + updateChange->setPropertyName("indexOffset"); updateChange->setValue(65); renderGeometryRenderer.sceneChangeEvent(updateChange); // THEN - QCOMPARE(renderGeometryRenderer.baseVertex(), 65); + QCOMPARE(renderGeometryRenderer.indexOffset(), 65); QVERIFY(renderGeometryRenderer.isDirty()); renderGeometryRenderer.unsetDirty(); @@ -208,12 +208,12 @@ private Q_SLOTS: // WHEN updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); - updateChange->setPropertyName("baseInstance"); + updateChange->setPropertyName("firstInstance"); updateChange->setValue(82); renderGeometryRenderer.sceneChangeEvent(updateChange); // THEN - QCOMPARE(renderGeometryRenderer.baseInstance(), 82); + QCOMPARE(renderGeometryRenderer.firstInstance(), 82); QVERIFY(renderGeometryRenderer.isDirty()); renderGeometryRenderer.unsetDirty(); @@ -221,12 +221,12 @@ private Q_SLOTS: // WHEN updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); - updateChange->setPropertyName("restartIndex"); + updateChange->setPropertyName("restartIndexValue"); updateChange->setValue(46); renderGeometryRenderer.sceneChangeEvent(updateChange); // THEN - QCOMPARE(renderGeometryRenderer.restartIndex(), 46); + QCOMPARE(renderGeometryRenderer.restartIndexValue(), 46); QVERIFY(renderGeometryRenderer.isDirty()); renderGeometryRenderer.unsetDirty(); @@ -234,12 +234,12 @@ private Q_SLOTS: // WHEN updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); - updateChange->setPropertyName("primitiveRestart"); + updateChange->setPropertyName("primitiveRestartEnabled"); updateChange->setValue(true); renderGeometryRenderer.sceneChangeEvent(updateChange); // THEN - QCOMPARE(renderGeometryRenderer.primitiveRestart(), true); + QCOMPARE(renderGeometryRenderer.primitiveRestartEnabled(), true); QVERIFY(renderGeometryRenderer.isDirty()); renderGeometryRenderer.unsetDirty(); diff --git a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp index 6ef130ca8..6069dba9e 100644 --- a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp +++ b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp @@ -77,11 +77,11 @@ private Q_SLOTS: QCOMPARE(clone->id(), geomRenderer->id()); QCOMPARE(clone->instanceCount(), geomRenderer->instanceCount()); - QCOMPARE(clone->primitiveCount(), geomRenderer->primitiveCount()); - QCOMPARE(clone->baseVertex(), geomRenderer->baseVertex()); - QCOMPARE(clone->baseInstance(), geomRenderer->baseInstance()); - QCOMPARE(clone->restartIndex(), geomRenderer->restartIndex()); - QCOMPARE(clone->primitiveRestart(), geomRenderer->primitiveRestart()); + QCOMPARE(clone->vertexCount(), geomRenderer->vertexCount()); + QCOMPARE(clone->indexOffset(), geomRenderer->indexOffset()); + QCOMPARE(clone->firstInstance(), geomRenderer->firstInstance()); + QCOMPARE(clone->restartIndexValue(), geomRenderer->restartIndexValue()); + QCOMPARE(clone->primitiveRestartEnabled(), geomRenderer->primitiveRestartEnabled()); QCOMPARE(clone->primitiveType(), geomRenderer->primitiveType()); QCOMPARE(clone->geometryFactory(), geomRenderer->geometryFactory()); diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index ddd2eb500..1f3bb5f6d 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -50,7 +50,7 @@ public: return Q_NULLPTR; } - bool operator ==(const Qt3DRender::QGeometryFactory &other) const + bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_FINAL { const TestFactory *otherFactory = functor_cast<TestFactory>(&other); if (otherFactory != Q_NULLPTR) @@ -87,12 +87,12 @@ private Q_SLOTS: Qt3DRender::QGeometryRenderer *geometry1 = new Qt3DRender::QGeometryRenderer(); geometry1->setGeometry(new Qt3DRender::QGeometry()); geometry1->setInstanceCount(1); - geometry1->setBaseVertex(0); - geometry1->setBaseInstance(55); - geometry1->setRestartIndex(-1); - geometry1->setPrimitiveRestart(false); + geometry1->setIndexOffset(0); + geometry1->setFirstInstance(55); + geometry1->setRestartIndexValue(-1); + geometry1->setPrimitiveRestartEnabled(false); geometry1->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles); - geometry1->setPrimitiveCount(15); + geometry1->setVertexCount(15); geometry1->setVerticesPerPatch(2); geometry1->setGeometryFactory(Qt3DRender::QGeometryFactoryPtr(new TestFactory(383))); QTest::newRow("triangle") << geometry1; @@ -100,11 +100,11 @@ private Q_SLOTS: Qt3DRender::QGeometryRenderer *geometry2 = new Qt3DRender::QGeometryRenderer(); geometry2->setGeometry(new Qt3DRender::QGeometry()); geometry2->setInstanceCount(200); - geometry2->setBaseVertex(58); - geometry2->setBaseInstance(10); - geometry2->setRestartIndex(65535); - geometry2->setPrimitiveCount(2056); - geometry2->setPrimitiveRestart(true); + geometry2->setIndexOffset(58); + geometry2->setFirstInstance(10); + geometry2->setRestartIndexValue(65535); + geometry2->setVertexCount(2056); + geometry2->setPrimitiveRestartEnabled(true); geometry2->setVerticesPerPatch(3); geometry2->setPrimitiveType(Qt3DRender::QGeometryRenderer::Lines); geometry2->setGeometryFactory(Qt3DRender::QGeometryFactoryPtr(new TestFactory(305))); @@ -124,11 +124,11 @@ private Q_SLOTS: QCOMPARE(clone->id(), geometryRenderer->id()); QCOMPARE(clone->instanceCount(), geometryRenderer->instanceCount()); - QCOMPARE(clone->primitiveCount(), geometryRenderer->primitiveCount()); - QCOMPARE(clone->baseVertex(), geometryRenderer->baseVertex()); - QCOMPARE(clone->baseInstance(), geometryRenderer->baseInstance()); - QCOMPARE(clone->restartIndex(), geometryRenderer->restartIndex()); - QCOMPARE(clone->primitiveRestart(), geometryRenderer->primitiveRestart()); + QCOMPARE(clone->vertexCount(), geometryRenderer->vertexCount()); + QCOMPARE(clone->indexOffset(), geometryRenderer->indexOffset()); + QCOMPARE(clone->firstInstance(), geometryRenderer->firstInstance()); + QCOMPARE(clone->restartIndexValue(), geometryRenderer->restartIndexValue()); + QCOMPARE(clone->primitiveRestartEnabled(), geometryRenderer->primitiveRestartEnabled()); QCOMPARE(clone->primitiveType(), geometryRenderer->primitiveType()); QCOMPARE(clone->verticesPerPatch(), geometryRenderer->verticesPerPatch()); @@ -164,52 +164,52 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - geometryRenderer->setPrimitiveCount(1340); + geometryRenderer->setVertexCount(1340); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "primitiveCount"); + QCOMPARE(change->propertyName(), "vertexCount"); QCOMPARE(change->value().value<int>(), 1340); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); arbiter.events.clear(); // WHEN - geometryRenderer->setBaseVertex(883); + geometryRenderer->setIndexOffset(883); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "baseVertex"); + QCOMPARE(change->propertyName(), "indexOffset"); QCOMPARE(change->value().value<int>(), 883); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); arbiter.events.clear(); // WHEN - geometryRenderer->setBaseInstance(1200); + geometryRenderer->setFirstInstance(1200); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "baseInstance"); + QCOMPARE(change->propertyName(), "firstInstance"); QCOMPARE(change->value().value<int>(), 1200); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); arbiter.events.clear(); // WHEN - geometryRenderer->setRestartIndex(65535); + geometryRenderer->setRestartIndexValue(65535); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "restartIndex"); + QCOMPARE(change->propertyName(), "restartIndexValue"); QCOMPARE(change->value().value<int>(), 65535); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -229,13 +229,13 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - geometryRenderer->setPrimitiveRestart(true); + geometryRenderer->setPrimitiveRestartEnabled(true); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "primitiveRestart"); + QCOMPARE(change->propertyName(), "primitiveRestartEnabled"); QCOMPARE(change->value().value<bool>(), true); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); diff --git a/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp b/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp index 4964e4cdb..f89589a9d 100644 --- a/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp +++ b/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp @@ -180,12 +180,12 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer() customGeometry->addAttribute(indexAttribute); customMeshRenderer->setInstanceCount(1); - customMeshRenderer->setBaseVertex(0); - customMeshRenderer->setBaseInstance(0); + customMeshRenderer->setIndexOffset(0); + customMeshRenderer->setFirstInstance(0); customMeshRenderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles); customMeshRenderer->setGeometry(customGeometry); // 4 faces of 3 points - customMeshRenderer->setPrimitiveCount(12); + customMeshRenderer->setVertexCount(12); return customMeshRenderer; } @@ -301,12 +301,12 @@ Qt3DRender::QGeometryRenderer *customNonIndexedGeometryRenderer() customGeometry->addAttribute(colorAttribute); customMeshRenderer->setInstanceCount(1); - customMeshRenderer->setBaseVertex(0); - customMeshRenderer->setBaseInstance(0); + customMeshRenderer->setIndexOffset(0); + customMeshRenderer->setFirstInstance(0); customMeshRenderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles); customMeshRenderer->setGeometry(customGeometry); // 4 faces of 3 points - customMeshRenderer->setPrimitiveCount(12); + customMeshRenderer->setVertexCount(12); return customMeshRenderer; } |