summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/qmesh.h
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2015-11-18 09:34:27 +0000
committerSean Harmer <sean.harmer@kdab.com>2015-11-21 10:41:03 +0000
commit8970b041ecb17767c9277c8ff9df4a03cc3ae589 (patch)
tree8cb1f6c54f8d85f74edd0111bcee9e62b572ed9e /src/render/geometry/qmesh.h
parent7415a4b5161bbd3956d8ba94c1b719f5b87abfd4 (diff)
Added support for partial OBJ mesh loading
Added a subMesh string property to the QMesh class. This is passed to the ObjLoader and, if not empty, it will only load the sub meshes at match. The string is assumed to be a regular expression against which sub mesh names are matched. If the string is not a valid regex then a valid one is constructed. Change-Id: Iecc39af8a41429bb924fb1e3e47d8cbdb9ff1086 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/geometry/qmesh.h')
-rw-r--r--src/render/geometry/qmesh.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index 3125f26d0..a0d409b2e 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -55,6 +55,7 @@ class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+ Q_PROPERTY(QString subMesh READ subMesh WRITE setSubMesh NOTIFY subMeshChanged)
public:
explicit QMesh(Qt3DCore::QNode *parent = 0);
@@ -63,8 +64,12 @@ public:
void setSource(const QUrl &source);
QUrl source() const;
+ void setSubMesh(const QString &subMesh);
+ QString subMesh() const;
+
Q_SIGNALS:
void sourceChanged();
+ void subMeshChanged();
protected:
QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = 0);