Default cpp materials + material-cpp example

QDiffuseMapMaterial
QDiffuseSpecularMapMaterial
QNormalDiffuseMapMaterial
QNormalDiffuseAlphaMapMaterial
QNormalDiffuseSpecularMapMaterial

material-cpp is mostly inspired from materials (QML) but nicer :).

Note: there seems to be an issue with qrc and QUrl. The behavior is different
between QML and C++.
-In C++ we need to prefix with have qrc:/ and convert that to :/ (passing :/
directly returns "" when QUrl toString is called)
-From QML no prefix is needed.
-For QImage path, :/ should be used.

Change-Id: Ib56fb9546c95c2872686a46ed048a290ab4a5b6f
Task-number: QTBUG-41548
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h
index 421a4c475..ab1a83a3b 100644
--- a/src/render/defaults/qphongmaterial_p.h
+++ b/src/render/defaults/qphongmaterial_p.h
@@ -59,6 +59,7 @@ class QPhongMaterial;
 
 class QPhongMaterialPrivate : public QMaterialPrivate
 {
+public:
     QPhongMaterialPrivate(QPhongMaterial *qq);
 
     void init();
@@ -76,9 +77,6 @@ class QPhongMaterialPrivate : public QMaterialPrivate
     QRenderPass *m_phongES2RenderPass;
     QShaderProgram *m_phongGL3Shader;
     QShaderProgram *m_phongGL2ES2Shader;
-    QParameterMapping *m_ambientParameterMapping;
-    QParameterMapping *m_diffuseParameterMapping;
-    QParameterMapping *m_specularParameterMapping;
 
     Q_DECLARE_PUBLIC(QPhongMaterial)
 };