Update default Material to use new Texture API

Breaks Texture Rendering until all following patches are merged

Change-Id: Id8663d54ec39697b6c59f626b8b1aa7d5b8d8ebf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

6 files changed, 23 insertions, 11 deletions

diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
index e9d520a13..3c9c800f4 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
@@ -46,7 +46,7 @@ Material {
     id: root
 
     property color ambient:  Qt.rgba( 0.05, 0.05, 0.05, 1.0 )
-    property alias diffuse: diffuseTexture.source
+    property alias diffuse: diffuseTextureImage.source
     property color specular: Qt.rgba( 0.95, 0.95, 0.95, 1.0 )
     property real shininess: 150.0
     property real textureScale: 1.0
@@ -65,6 +65,7 @@ Material {
                 }
                 generateMipMaps: true
                 maximumAnisotropy: 16.0
+                TextureImage { id: diffuseTextureImage; }
             }
         },
         Parameter { name: "ks"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) },
diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
index 367d0b9ef..55eaa9975 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
@@ -46,8 +46,8 @@ Material {
     id: root
 
     property color ambient:  Qt.rgba( 0.05, 0.05, 0.05, 1.0 )
-    property alias diffuse: diffuseTexture.source
-    property alias specular: specularTexture.source
+    property alias diffuse: diffuseTextureImage.source
+    property alias specular: specularTextureImage.source
     property real shininess: 150.0
     property real textureScale: 1.0
 
@@ -65,6 +65,7 @@ Material {
                 }
                 generateMipMaps: true
                 maximumAnisotropy: 16.0
+                TextureImage { id: diffuseTextureImage; }
             }
         },
         Parameter { name: "specularTexture";
@@ -78,6 +79,7 @@ Material {
                 }
                 generateMipMaps: true
                 maximumAnisotropy: 16.0
+                TextureImage { id: specularTextureImage; }
             }
         },
         Parameter { name: "shininess"; value: root.shininess },
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
index f238d0cdf..1aa0bcce8 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
@@ -46,9 +46,9 @@ Material {
     id: root
 
     property color ambient:  Qt.rgba( 0.05, 0.05, 0.05, 1.0 )
-    property alias diffuse: diffuseTexture.source
+    property alias diffuse: diffuseTextureImage.source
     property color specular: Qt.rgba( 0.95, 0.95, 0.95, 1.0 )
-    property alias normal: normalTexture.source
+    property alias normal: normalTextureImage.source
     property real shininess: 150.0
     property real textureScale: 1.0
 
@@ -66,6 +66,7 @@ Material {
                 }
                 generateMipMaps: true
                 maximumAnisotropy: 16.0
+                TextureImage { id: diffuseTextureImage; }
             }
         },
         Parameter {
@@ -79,6 +80,7 @@ Material {
                     y: WrapMode.Repeat
                 }
                 maximumAnisotropy: 16.0
+                TextureImage { id: normalTextureImage; }
             }
         },
         Parameter { name: "ks"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) },
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
index cf9f17178..d113c9c7e 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
@@ -46,9 +46,9 @@ Material {
     id: root
 
     property color ambient:  Qt.rgba( 0.05, 0.05, 0.05, 1.0 )
-    property alias diffuse: diffuseTexture.source
+    property alias diffuse: diffuseTextureImage.source
     property color specular: Qt.rgba( 0.95, 0.95, 0.95, 1.0 )
-    property alias normal: normalTexture.source
+    property alias normal: normalTextureImage.source
     property real shininess: 150.0
     property real textureScale: 1.0
 
@@ -66,6 +66,7 @@ Material {
                 }
                 generateMipMaps: true
                 maximumAnisotropy: 16.0
+                TextureImage { id: diffuseTextureImage; }
             }
         },
         Parameter {
@@ -79,6 +80,7 @@ Material {
                     y: WrapMode.Repeat
                 }
                 maximumAnisotropy: 16.0
+                TextureImage { id: normalTextureImage; }
             }
         },
         Parameter { name: "ks"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) },
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
index 0ba7b08fe..acd972f0c 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
@@ -46,9 +46,9 @@ Material {
     id: root
 
     property color ambient:  Qt.rgba( 0.05, 0.05, 0.05, 1.0 )
-    property alias diffuse: diffuseTexture.source
-    property alias specular: specularTexture.source
-    property alias normal: normalTexture.source
+    property alias diffuse: diffuseTextureImage.source
+    property alias specular: specularTextureImage.source
+    property alias normal: normalTextureImage.source
     property real shininess: 150.0
     property real textureScale: 1.0
 
@@ -66,6 +66,7 @@ Material {
                 }
                 generateMipMaps: true
                 maximumAnisotropy: 16.0
+                TextureImage { id: diffuseTextureImage; }
             }
         },
         Parameter { name: "specularTexture";
@@ -79,6 +80,7 @@ Material {
                 }
                 generateMipMaps: true
                 maximumAnisotropy: 16.0
+                TextureImage { id: specularTextureImage; }
             }
         },
         Parameter {
@@ -92,6 +94,7 @@ Material {
                     y: WrapMode.Repeat
                 }
                 maximumAnisotropy: 16.0
+                TextureImage { id: normalTextureImage; }
             }
         },
         Parameter { name: "shininess"; value: root.shininess },
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 14921e35f..33a64311c 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -183,13 +183,15 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<Qt3D::QAbstractTextureProvider>(uri, 2, 0, "Texture", QStringLiteral("Texture should be created from one of the subclasses"));
     qmlRegisterExtendedType<Qt3D::QTexture1D, Qt3D::Render::Quick::Quick3DTextureExtension>(uri, 2, 0, "Texture1D");
     qmlRegisterExtendedType<Qt3D::QTexture1DArray, Qt3D::Render::Quick::Quick3DTextureExtension>(uri, 2, 0, "Texture1DArray");
-    qmlRegisterExtendedType<Qt3D::QTexture2D, Qt3D::Render::Quick::Quick3DTexture2DExtension>(uri, 2, 0, "Texture2D");
+    qmlRegisterExtendedType<Qt3D::QTexture2D, Qt3D::Render::Quick::Quick3DTextureExtension>(uri, 2, 0, "Texture2D");
     qmlRegisterExtendedType<Qt3D::QTexture2DArray, Qt3D::Render::Quick::Quick3DTextureExtension>(uri, 2, 0, "Texture2DArray");
     qmlRegisterExtendedType<Qt3D::QTexture3D, Qt3D::Render::Quick::Quick3DTextureExtension>(uri, 2, 0, "Texture3D");
     qmlRegisterExtendedType<Qt3D::QTextureCubeMap, Qt3D::Render::Quick::Quick3DTextureCubeMapExtension>(uri, 2, 0, "TextureCubeMap");
     qmlRegisterExtendedType<Qt3D::QTextureCubeMapArray, Qt3D::Render::Quick::Quick3DTextureExtension>(uri, 2, 0, "TextureCubeMapArray");
     qmlRegisterExtendedType<Qt3D::QTexture2DMultisample, Qt3D::Render::Quick::Quick3DTextureExtension>(uri, 2, 0, "Texture2DMultisample");
     qmlRegisterExtendedType<Qt3D::QTexture2DMultisampleArray, Qt3D::Render::Quick::Quick3DTextureExtension>(uri, 2, 0, "Texture2DMultisampleArray");
+    qmlRegisterUncreatableType<Qt3D::QAbstractTextureImage>(uri, 2, 0, "QAbstractTextureImage", QStringLiteral("QAbstractTextureImage is abstract"));
+    qmlRegisterType<Qt3D::QTextureImage>(uri, 2, 0, "TextureImage");
 
     // Meshes
     qmlRegisterUncreatableType<Qt3D::QAbstractMesh>(uri, 2, 0, "QAbstractMesh", QStringLiteral("QAbstractMesh is abstract"));