summaryrefslogtreecommitdiffstats
path: root/src/render/io/gltfparser.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-08-18 12:20:56 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-08-18 14:25:01 +0200
commit3f9961b6c9fddf1fcf17c83d7fb77f52af5c8fd7 (patch)
tree417d43bca6360255d7a4cd8b980a4fadc8290129 /src/render/io/gltfparser.cpp
parent7ae3f3b737fa893da5d12d8ec5aff09e82f6dfb6 (diff)
Rename MeshData -> QMeshData
Change-Id: I23a466ebd29666bed1c56f29c6f049544a4eca23 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
-rw-r--r--src/render/io/gltfparser.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index b2beae588..eff6a90d7 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -210,22 +210,22 @@ private:
class GLTFParserMeshFunctor : public QAbstractMeshFunctor
{
public:
- explicit GLTFParserMeshFunctor(MeshDataPtr meshData);
+ explicit GLTFParserMeshFunctor(QMeshDataPtr meshData);
QAbstractMeshDataPtr operator ()() Q_DECL_OVERRIDE;
private:
- MeshDataPtr m_meshData;
+ QMeshDataPtr m_meshData;
};
public:
explicit GLTFParserMesh(QNode *parent = 0);
void copy(const QNode *ref) Q_DECL_OVERRIDE;
- void setData(MeshDataPtr data);
+ void setData(QMeshDataPtr data);
QAbstractMeshFunctorPtr meshFunctor() const Q_DECL_OVERRIDE;
private:
- MeshDataPtr m_meshData;
+ QMeshDataPtr m_meshData;
GLTFParserMesh *doClone(QNode *clonedParent) const Q_DECL_OVERRIDE;
};
@@ -297,14 +297,14 @@ bool GLTFParser::isPathExtensionSupported(const QString &path)
return GLTFParser::isGLTFPath(path);
}
-MeshDataPtr GLTFParser::mesh(QString id)
+QMeshDataPtr GLTFParser::mesh(QString id)
{
parse();
if (m_meshDict.contains(id))
return m_meshDict.value(id);
qWarning() << "Unknown mesh" << id << "in GLTF file" << m_basePath;
- return MeshDataPtr();
+ return QMeshDataPtr();
}
QEntity* GLTFParser::defaultScene()
@@ -376,7 +376,7 @@ QEntity* GLTFParser::node(QString id)
continue;
}
- foreach (MeshDataPtr md, m_meshDict.values(m.toString())) {
+ foreach (QMeshDataPtr md, m_meshDict.values(m.toString())) {
QString matId = m_meshMaterialDict[md.data()];
GLTFParserMesh* meshComp = new GLTFParserMesh;
meshComp->setData(md);
@@ -681,7 +681,7 @@ void GLTFParser::processJSONMesh( QString id, QJsonObject jsonObj )
continue;
}
- MeshDataPtr md( new MeshData( type ) );
+ QMeshDataPtr md( new QMeshData( type ) );
m_meshMaterialDict[md.data()] = material;
QJsonObject attrs = primObj.value(KEY_ATTRIBUTES).toObject();
@@ -1002,7 +1002,7 @@ void GLTFParserMesh::copy(const QNode *ref)
}
}
-void GLTFParserMesh::setData(MeshDataPtr data)
+void GLTFParserMesh::setData(QMeshDataPtr data)
{
m_meshData = data;
QAbstractMesh::setDirty(this);
@@ -1018,7 +1018,7 @@ GLTFParserMesh *GLTFParserMesh::doClone(QNode *clonedParent) const
return new GLTFParserMesh(clonedParent);
}
-GLTFParserMesh::GLTFParserMeshFunctor::GLTFParserMeshFunctor(MeshDataPtr meshData)
+GLTFParserMesh::GLTFParserMeshFunctor::GLTFParserMeshFunctor(QMeshDataPtr meshData)
: QAbstractMeshFunctor()
, m_meshData(meshData)
{