diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-02 12:54:47 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-05 16:03:19 +0200 |
commit | 3c37d50d0e526959223b8c51dd75cde7a2527d9d (patch) | |
tree | bad3c01af4e28e27d660726b460a09650a4b2a31 /src/render/frontend/qmesh.h | |
parent | a20f272b2fe5179d95e397afc6aa3ed80afb7188 (diff) |
Refactored QAbstractMesh, QMesh and QAbstractShapeMesh
The Backend now monitors QAbstractMesh elements instead of QMesh.
QAbstractMesh subclasses have to implement a load method.
For QMesh it uses the ObjLoader to create MeshData from a source file
while QAbstractShapeMesh loads MeshData created by code.
Each scene parser can then implement its own QAbstractMesh subclass.
The loadmeshdatajobs has been corrected and works with QAbstractMesh.
Change-Id: I5caae63a153f18eaae3b2f1bdbfa8995c63a2d23
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qmesh.h')
-rw-r--r-- | src/render/frontend/qmesh.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/render/frontend/qmesh.h b/src/render/frontend/qmesh.h index a28152aa0..f6a6d08c3 100644 --- a/src/render/frontend/qmesh.h +++ b/src/render/frontend/qmesh.h @@ -69,10 +69,7 @@ public: void setSource(const QString &source); QString source() const; - // Not const because subclasses may want to perform - // more than just returning a MeshData straight away - virtual QAbstractMeshDataPtr data() Q_DECL_OVERRIDE; - void setData(QAbstractMeshDataPtr d) Q_DECL_OVERRIDE; + bool load() Q_DECL_OVERRIDE; Q_SIGNALS: void sourceChanged(); |