summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers/gltf/gltfparser.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-02-25 15:54:36 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-02-29 14:51:33 +0000
commitc3f21b4e2834fd257157728e306aef11f06e01d8 (patch)
tree77eb89e5906a8a076345a7b4825cd1ee0c8c852a /src/plugins/sceneparsers/gltf/gltfparser.h
parent7994e86c0e6fd14954cc4a6092509132251cb006 (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 'src/plugins/sceneparsers/gltf/gltfparser.h')
-rw-r--r--src/plugins/sceneparsers/gltf/gltfparser.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.h b/src/plugins/sceneparsers/gltf/gltfparser.h
index 68fd839e5..ff2a9baec 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.h
+++ b/src/plugins/sceneparsers/gltf/gltfparser.h
@@ -130,7 +130,7 @@ private:
AccessorData(const QJsonObject& json);
QString bufferViewName;
- QAttribute::DataType type;
+ QAttribute::VertexBaseType type;
uint dataSize;
int count;
int offset;
@@ -166,7 +166,7 @@ private:
QFile* resolveLocalData(QString path) const;
QVariant parameterValueFromJSON(int type, const QJsonValue &value) const;
- static QAttribute::DataType accessorTypeFromJSON(int componentType);
+ static QAttribute::VertexBaseType accessorTypeFromJSON(int componentType);
static uint accessorDataSizeFromJson(const QString &type);
static QRenderState *buildStateEnable(int state);