diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 10:19:23 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-18 13:50:42 +0200 |
commit | fc1241691c060d9b45bd44279a8e3e3de145b692 (patch) | |
tree | 5afbe1c5faa81e4e168cbfa15207800e4011d235 /src/render/frontend/qmaterial.h | |
parent | a9af34e8d82dd789349297976fd905bd5e34fceb (diff) |
Restored QParameter dynamic updates
ParameterPack now just contains a list of parameters Uuid.
Material, Technique, Effect, RenderPass frontend and backend classes modified
to only send/receive the QParameter's uuid to signal that a parameter was
updated.
Use RenderParameter to monitor frontend QParameter.
RenderView slighly corrected to retrieve RenderParameter from the list of QUuid
and build the name-values hash from those.
Registered QBackendNodeFunctor to create a RenderParameter from a QParameter.
Change-Id: I715f194143a52d4e44519e73caf29516517f2b91
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qmaterial.h')
-rw-r--r-- | src/render/frontend/qmaterial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h index 7dccf350d..b65034b27 100644 --- a/src/render/frontend/qmaterial.h +++ b/src/render/frontend/qmaterial.h @@ -60,7 +60,7 @@ typedef QMap<QString, QTexture*> TextureDict; class QT3DRENDERERSHARED_EXPORT QMaterial : public QComponent { Q_OBJECT - Q_PROPERTY(Qt3D::QEffect* effect READ effect WRITE setEffect NOTIFY effectChanged) + Q_PROPERTY(Qt3D::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) public: explicit QMaterial(QNode *parent = 0); |