diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-25 15:54:36 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-02-29 14:51:33 +0000 |
| commit | c3f21b4e2834fd257157728e306aef11f06e01d8 (patch) | |
| tree | 77eb89e5906a8a076345a7b4825cd1ee0c8c852a /examples | |
| parent | 7994e86c0e6fd14954cc4a6092509132251cb006 (diff) | |
QAttribute API changes
- rename dataType to vertexBaseType
- rename dataSize to vertexSize
Change-Id: I0eca7054dd69e8aac69bc1d7d5023a7ca6ca9da2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qt3d/compute-particles/ParticlesScene.qml | 8 | ||||
| -rw-r--r-- | examples/qt3d/custom-mesh-qml/main.qml | 16 | ||||
| -rw-r--r-- | examples/qt3d/instanced-arrays-qml/main.qml | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/examples/qt3d/compute-particles/ParticlesScene.qml b/examples/qt3d/compute-particles/ParticlesScene.qml index aaaa25114..4ba9896f0 100644 --- a/examples/qt3d/compute-particles/ParticlesScene.qml +++ b/examples/qt3d/compute-particles/ParticlesScene.qml @@ -129,8 +129,8 @@ Entity { id: particlePositionDataAttribute name: "particlePosition" attributeType: Attribute.VertexAttribute - dataType: Attribute.Float - dataSize: 3 + vertexBaseType: Attribute.Float + vertexSize: 3 divisor: 1 byteStride: 12 * floatSize buffer: particleBuffer @@ -140,8 +140,8 @@ Entity { id: particleColorDataAttribute name: "particleColor" attributeType: Attribute.VertexAttribute - dataType: Attribute.Float - dataSize: 3 + vertexBaseType: Attribute.Float + vertexSize: 3 divisor: 1 byteOffset: 8 * floatSize byteStride: 12 * floatSize diff --git a/examples/qt3d/custom-mesh-qml/main.qml b/examples/qt3d/custom-mesh-qml/main.qml index 6c27de460..033be0e67 100644 --- a/examples/qt3d/custom-mesh-qml/main.qml +++ b/examples/qt3d/custom-mesh-qml/main.qml @@ -177,8 +177,8 @@ Entity { geometry: Geometry { Attribute { attributeType: Attribute.VertexAttribute - dataType: Attribute.Float - dataSize: 3 + vertexBaseType: Attribute.Float + vertexSize: 3 byteOffset: 0 byteStride: 9 * 4 count: 4 @@ -188,8 +188,8 @@ Entity { Attribute { attributeType: Attribute.VertexAttribute - dataType: Attribute.Float - dataSize: 3 + vertexBaseType: Attribute.Float + vertexSize: 3 byteOffset: 3 * 4 byteStride: 9 * 4 count: 4 @@ -199,8 +199,8 @@ Entity { Attribute { attributeType: Attribute.VertexAttribute - dataType: Attribute.Float - dataSize: 3 + vertexBaseType: Attribute.Float + vertexSize: 3 byteOffset: 6 * 4 byteStride: 9 * 4 count: 4 @@ -210,8 +210,8 @@ Entity { Attribute { attributeType: Attribute.IndexAttribute - dataType: Attribute.UnsignedShort - dataSize: 1 + vertexBaseType: Attribute.UnsignedShort + vertexSize: 1 byteOffset: 0 byteStride: 0 count: 12 diff --git a/examples/qt3d/instanced-arrays-qml/main.qml b/examples/qt3d/instanced-arrays-qml/main.qml index 96a258da4..b2a8577ac 100644 --- a/examples/qt3d/instanced-arrays-qml/main.qml +++ b/examples/qt3d/instanced-arrays-qml/main.qml @@ -154,8 +154,8 @@ Entity { id: instanceDataAttribute name: "pos" attributeType: Attribute.VertexAttribute - dataType: Attribute.Float - dataSize: 3 + vertexBaseType: Attribute.Float + vertexSize: 3 divisor: 1 buffer: _instanceBuffer } |