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 /examples/qt3d | |
| 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>
Diffstat (limited to 'examples/qt3d')
| -rw-r--r-- | examples/qt3d/compute-particles/ParticlesScene.qml | 4 | ||||
| -rw-r--r-- | examples/qt3d/custom-mesh-cpp/main.cpp | 6 | ||||
| -rw-r--r-- | examples/qt3d/custom-mesh-qml/main.qml | 4 |
3 files changed, 7 insertions, 7 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 |