diff options
Diffstat (limited to 'tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp')
| -rw-r--r-- | tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp b/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp index 8904ccd25..7647b26e7 100644 --- a/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp +++ b/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp @@ -139,8 +139,8 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer() Qt3DRender::QAttribute *positionAttribute = new Qt3DRender::QAttribute(); positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); positionAttribute->setBuffer(vertexDataBuffer); - positionAttribute->setDataType(Qt3DRender::QAttribute::Float); - positionAttribute->setDataSize(3); + positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + positionAttribute->setVertexSize(3); positionAttribute->setByteOffset(0); positionAttribute->setByteStride(9 * sizeof(float)); positionAttribute->setCount(4); @@ -149,8 +149,8 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer() Qt3DRender::QAttribute *normalAttribute = new Qt3DRender::QAttribute(); normalAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); normalAttribute->setBuffer(vertexDataBuffer); - normalAttribute->setDataType(Qt3DRender::QAttribute::Float); - normalAttribute->setDataSize(3); + normalAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + normalAttribute->setVertexSize(3); normalAttribute->setByteOffset(3 * sizeof(float)); normalAttribute->setByteStride(9 * sizeof(float)); normalAttribute->setCount(4); @@ -159,8 +159,8 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer() Qt3DRender::QAttribute *colorAttribute = new Qt3DRender::QAttribute(); colorAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); colorAttribute->setBuffer(vertexDataBuffer); - colorAttribute->setDataType(Qt3DRender::QAttribute::Float); - colorAttribute->setDataSize(3); + colorAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + colorAttribute->setVertexSize(3); colorAttribute->setByteOffset(6 * sizeof(float)); colorAttribute->setByteStride(9 * sizeof(float)); colorAttribute->setCount(4); @@ -169,8 +169,8 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer() Qt3DRender::QAttribute *indexAttribute = new Qt3DRender::QAttribute(); indexAttribute->setAttributeType(Qt3DRender::QAttribute::IndexAttribute); indexAttribute->setBuffer(indexDataBuffer); - indexAttribute->setDataType(Qt3DRender::QAttribute::UnsignedShort); - indexAttribute->setDataSize(1); + indexAttribute->setVertexBaseType(Qt3DRender::QAttribute::UnsignedShort); + indexAttribute->setVertexSize(1); indexAttribute->setByteOffset(0); indexAttribute->setByteStride(0); indexAttribute->setCount(12); @@ -270,8 +270,8 @@ Qt3DRender::QGeometryRenderer *customNonIndexedGeometryRenderer() Qt3DRender::QAttribute *positionAttribute = new Qt3DRender::QAttribute(); positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); positionAttribute->setBuffer(vertexDataBuffer); - positionAttribute->setDataType(Qt3DRender::QAttribute::Float); - positionAttribute->setDataSize(3); + positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + positionAttribute->setVertexSize(3); positionAttribute->setByteOffset(0); positionAttribute->setByteStride(9 * sizeof(float)); positionAttribute->setCount(12); @@ -280,8 +280,8 @@ Qt3DRender::QGeometryRenderer *customNonIndexedGeometryRenderer() Qt3DRender::QAttribute *normalAttribute = new Qt3DRender::QAttribute(); normalAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); normalAttribute->setBuffer(vertexDataBuffer); - normalAttribute->setDataType(Qt3DRender::QAttribute::Float); - normalAttribute->setDataSize(3); + normalAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + normalAttribute->setVertexSize(3); normalAttribute->setByteOffset(3 * sizeof(float)); normalAttribute->setByteStride(9 * sizeof(float)); normalAttribute->setCount(12); @@ -290,8 +290,8 @@ Qt3DRender::QGeometryRenderer *customNonIndexedGeometryRenderer() Qt3DRender::QAttribute *colorAttribute = new Qt3DRender::QAttribute(); colorAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); colorAttribute->setBuffer(vertexDataBuffer); - colorAttribute->setDataType(Qt3DRender::QAttribute::Float); - colorAttribute->setDataSize(3); + colorAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + colorAttribute->setVertexSize(3); colorAttribute->setByteOffset(6 * sizeof(float)); colorAttribute->setByteStride(9 * sizeof(float)); colorAttribute->setCount(12); |