diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-30 13:07:35 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-05 12:43:37 +0200 |
| commit | bbdc3be3611c4dcc73817b701e586956d0433692 (patch) | |
| tree | 1b252b03cd29a4639c9289398b47b3625199a01d /src/render/io/gltfparser.cpp | |
| parent | fa397f3e469fa9e89bb6e62401a50c8fb1f33cf1 (diff) | |
Renamed Mesh to QMesh
Change-Id: Ic6a6a67814a992bef4c88b3409b140b011509668
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
| -rw-r--r-- | src/render/io/gltfparser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 6e493e544..7d24a919d 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -45,7 +45,7 @@ #include "renderlogging.h" #include <Qt3DCore/entity.h> -#include <mesh.h> +#include <qmesh.h> #include <material.h> #include <technique.h> #include <shaderprogram.h> @@ -339,7 +339,7 @@ Entity* GLTFParser::node(QString id) if ( jsonObj.contains(KEY_MESHES) ) { - typedef QList<Mesh*> MeshList; + typedef QList<QMesh*> MeshList; QMap<QString, MeshList> materialDict; foreach (QJsonValue m, jsonObj.value(KEY_MESHES).toArray()) @@ -351,7 +351,7 @@ Entity* GLTFParser::node(QString id) foreach (MeshDataPtr md, m_meshDict.values(m.toString())) { QString matId = m_meshMaterialDict[md.data()]; - Mesh* meshComp = new Mesh; + QMesh* meshComp = new QMesh; meshComp->setData(md); materialDict[matId].append(meshComp); } @@ -360,7 +360,7 @@ Entity* GLTFParser::node(QString id) if (materialDict.size() == 1) { // common case result->addComponent(material(materialDict.firstKey())); - foreach (Mesh* m, materialDict.first()) + foreach (QMesh* m, materialDict.first()) result->addComponent(m); } else { // need to make a child entity per material @@ -369,7 +369,7 @@ Entity* GLTFParser::node(QString id) result->addChild(subEntity); subEntity->addComponent(material(matId)); - foreach (Mesh* m, materialDict.value(matId)) + foreach (QMesh* m, materialDict.value(matId)) subEntity->addComponent(m); } // of distinct material iteration } // of multiple materials case |