Remove Quick3DTexture2DExtension, this is not needed anymore

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

2 files changed, 1 insertions, 54 deletions

diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
index 172da793d..759dfa85d 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
@@ -50,42 +50,6 @@ namespace Render {
 
 namespace Quick {
 
-// TO DO: This needs to be reworked to handle more than just 2D images
-Quick3DTexture2DExtension::Quick3DTexture2DExtension(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QUrl Quick3DTexture2DExtension::source() const
-{
-    return m_source;
-}
-
-void Quick3DTexture2DExtension::setSource(QUrl arg)
-{
-    if (m_source != arg) {
-        m_source = arg;
-        // There is maybe a better way to check for resources files
-        if (m_source.isLocalFile() || m_source.scheme() == QStringLiteral("qrc")) {
-            QString source = m_source.toString().replace(QStringLiteral("qrc"), QStringLiteral(""));
-            QImage img;
-            if (img.load(source)) {
-                parentTexture()->setFormat(img.hasAlphaChannel() ?
-                                               QAbstractTextureProvider::RGBA8_UNorm :
-                                               QAbstractTextureProvider::RGB8_UNorm);
-                parentTexture()->setFromQImage(img);
-            }
-            else {
-                qWarning() << "Failed to load image : " << source;
-            }
-
-        } else {
-            qWarning() << "implement loading from remote URLs";
-        }
-        emit sourceChanged();
-    }
-}
-
 Quick3DTextureCubeMapExtension::Quick3DTextureCubeMapExtension(QObject *parent)
     : QObject(parent)
 {
@@ -202,6 +166,7 @@ QUrl Quick3DTextureCubeMapExtension::negativeZ() const
     return m_negativeZ;
 }
 
+// TO DO: To be modified to work with the Texture API refactoring
 void Quick3DTextureCubeMapExtension::loadFace(const QUrl &faceUrl, QAbstractTextureProvider::CubeMapFace face)
 {
     if (faceUrl.isLocalFile() || faceUrl.scheme() == QStringLiteral("qrc")) {
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.h b/src/quick3d/quick3drenderer/items/quick3dtexture.h
index 7dfa08859..006fe2b82 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.h
@@ -57,24 +57,6 @@ namespace Render {
 
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2DExtension : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-public:
-    explicit Quick3DTexture2DExtension(QObject *parent = 0);
-
-    QUrl source() const;
-    void setSource(QUrl arg);
-
-Q_SIGNALS:
-    void sourceChanged();
-
-private:
-    QUrl m_source;
-    inline Qt3D::QAbstractTextureProvider *parentTexture() const { return qobject_cast<Qt3D::QAbstractTextureProvider *>(parent()); }
-};
-
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureExtension : public QObject
 {
     Q_OBJECT