summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-02-05 11:48:17 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-02-08 15:03:08 +0000
commit611356ec16af90914716b8a4f33d8fb16f61b158 (patch)
tree3829883deb2ec7799e9b49ba687370444f6e89a5 /src
parent7de2d0362fccfeffffcabcec718810ce7997fa40 (diff)
Removed now useless Quick3DTextureCubeMapExtension
Change-Id: I1d5bbfa578cf5d9306d6614d39e20c9d4beabfa9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dtexture.cpp152
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dtexture.h52
2 files changed, 0 insertions, 204 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
index 759dfa85d..e06efe372 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
@@ -50,158 +50,6 @@ namespace Render {
namespace Quick {
-Quick3DTextureCubeMapExtension::Quick3DTextureCubeMapExtension(QObject *parent)
- : QObject(parent)
-{
-}
-
-void Quick3DTextureCubeMapExtension::setSource(const QUrl &source)
-{
- if (source != m_source) {
- m_source = source;
- emit sourceChanged();
- QUrl tmp(m_source);
- // Default to png extension for now
- tmp.setPath(m_source.path() + QStringLiteral("_posx.png"));
- setPositiveX(tmp);
- tmp.setPath(m_source.path() + QStringLiteral("_posy.png"));
- setPositiveY(tmp);
- tmp.setPath(m_source.path() + QStringLiteral("_posz.png"));
- setPositiveZ(tmp);
- tmp.setPath(m_source.path() + QStringLiteral("_negx.png"));
- setNegativeX(tmp);
- tmp.setPath(m_source.path() + QStringLiteral("_negy.png"));
- setNegativeY(tmp);
- tmp.setPath(m_source.path() + QStringLiteral("_negz.png"));
- setNegativeZ(tmp);
- }
-}
-
-void Quick3DTextureCubeMapExtension::setPositiveX(const QUrl &positiveX)
-{
- if (positiveX != m_positiveX) {
- m_positiveX = positiveX;
- emit positiveXChanged();
- loadFace(positiveX, QAbstractTextureProvider::CubeMapPositiveX);
- }
-}
-
-void Quick3DTextureCubeMapExtension::setPositiveY(const QUrl &positiveY)
-{
- if (positiveY != m_positiveY) {
- m_positiveY = positiveY;
- emit positiveYChanged();
- loadFace(positiveY, QAbstractTextureProvider::CubeMapPositiveY);
- }
-}
-
-void Quick3DTextureCubeMapExtension::setPositiveZ(const QUrl &positiveZ)
-{
- if (positiveZ != m_positiveZ) {
- m_positiveZ = positiveZ;
- emit positiveZChanged();
- loadFace(positiveZ, QAbstractTextureProvider::CubeMapPositiveZ);
- }
-}
-
-void Quick3DTextureCubeMapExtension::setNegativeX(const QUrl &negativeX)
-{
- if (negativeX != m_negativeX) {
- m_negativeX = negativeX;
- emit negativeXChanged();
- loadFace(negativeX, QAbstractTextureProvider::CubeMapNegativeX);
- }
-}
-
-void Quick3DTextureCubeMapExtension::setNegativeY(const QUrl &negativeY)
-{
- if (negativeY != m_negativeY) {
- m_negativeY = negativeY;
- emit negativeYChanged();
- loadFace(negativeY, QAbstractTextureProvider::CubeMapNegativeY);
- }
-}
-
-void Quick3DTextureCubeMapExtension::setNegativeZ(const QUrl &negativeZ)
-{
- if (negativeZ != m_negativeZ) {
- m_negativeZ = negativeZ;
- emit negativeZChanged();
- loadFace(negativeZ, QAbstractTextureProvider::CubeMapNegativeZ);
- }
-}
-
-QUrl Quick3DTextureCubeMapExtension::source() const
-{
- return m_source;
-}
-
-QUrl Quick3DTextureCubeMapExtension::positiveX() const
-{
- return m_positiveX;
-}
-
-QUrl Quick3DTextureCubeMapExtension::positiveY() const
-{
- return m_positiveY;
-}
-
-QUrl Quick3DTextureCubeMapExtension::positiveZ() const
-{
- return m_positiveZ;
-}
-
-QUrl Quick3DTextureCubeMapExtension::negativeX() const
-{
- return m_negativeX;
-}
-
-QUrl Quick3DTextureCubeMapExtension::negativeY() const
-{
- return m_negativeY;
-}
-
-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")) {
- QString source = faceUrl.toString().replace(QStringLiteral("qrc"), QStringLiteral(""));
- QImage img;
- // Status will be set by backend
-
-// parentTexture()->setStatus(QAbstractTextureProvider::Loading);
- if (img.load(source)) {
- TexImageDataPtr dataPtr(new TexImageData());
-
-// dataPtr->setCubeFace(static_cast<QOpenGLTexture::CubeMapFace>(face));
- if (parentTexture()->height() != img.height())
- parentTexture()->setHeight(img.height());
- if (parentTexture()->width() != img.width())
- parentTexture()->setWidth(img.width());
- QAbstractTextureProvider::TextureFormat format = img.hasAlphaChannel() ?
- QAbstractTextureProvider::RGBA8_UNorm :
- QAbstractTextureProvider::RGB8_UNorm;
- if (format != parentTexture()->format())
- parentTexture()->setFormat(format);
- dataPtr->setImage(img);
-// parentTexture()->addImageData(dataPtr);
-// parentTexture()->setStatus(QAbstractTextureProvider::Loaded);
- }
- else {
- qWarning() << "Failed to load image : " << source;
-// parentTexture()->setStatus(QAbstractTextureProvider::Error);
- }
- } else {
-// parentTexture()->setStatus(QAbstractTextureProvider::Error);
- qWarning() << "implement loading from remote URLs";
- }
-}
-
Quick3DTextureExtension::Quick3DTextureExtension(QObject *parent)
: QObject(parent)
{
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.h b/src/quick3d/quick3drenderer/items/quick3dtexture.h
index 006fe2b82..a6ac16925 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.h
@@ -76,58 +76,6 @@ private:
static void clearTextureImageList(QQmlListProperty<QAbstractTextureImage> *list);
};
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureCubeMapExtension : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged())
- Q_PROPERTY(QUrl positiveX READ positiveX WRITE setPositiveX NOTIFY positiveXChanged())
- Q_PROPERTY(QUrl positiveY READ positiveY WRITE setPositiveY NOTIFY positiveYChanged())
- Q_PROPERTY(QUrl positiveZ READ positiveZ WRITE setPositiveZ NOTIFY positiveZChanged())
- Q_PROPERTY(QUrl negativeX READ negativeX WRITE setNegativeX NOTIFY negativeXChanged())
- Q_PROPERTY(QUrl negativeY READ negativeY WRITE setNegativeY NOTIFY negativeYChanged())
- Q_PROPERTY(QUrl negativeZ READ negativeZ WRITE setNegativeZ NOTIFY negativeZChanged())
-
-public:
- explicit Quick3DTextureCubeMapExtension(QObject *parent = 0);
-
- void setSource(const QUrl &source);
- void setPositiveX(const QUrl &positiveX);
- void setPositiveY(const QUrl &positiveY);
- void setPositiveZ(const QUrl &positiveZ);
- void setNegativeX(const QUrl &negativeX);
- void setNegativeY(const QUrl &negativeY);
- void setNegativeZ(const QUrl &negativeZ);
-
- QUrl source() const;
- QUrl positiveX() const;
- QUrl positiveY() const;
- QUrl positiveZ() const;
- QUrl negativeX() const;
- QUrl negativeY() const;
- QUrl negativeZ() const;
-
-Q_SIGNALS:
- void positiveXChanged();
- void positiveYChanged();
- void positiveZChanged();
- void negativeXChanged();
- void negativeYChanged();
- void negativeZChanged();
- void sourceChanged();
-
-private:
- QUrl m_positiveX;
- QUrl m_positiveY;
- QUrl m_positiveZ;
- QUrl m_negativeX;
- QUrl m_negativeY;
- QUrl m_negativeZ;
- QUrl m_source;
-
- inline QTextureCubeMap *parentTexture() { return qobject_cast<QTextureCubeMap *>(parent()); }
- void loadFace(const QUrl &faceUrl, QAbstractTextureProvider::CubeMapFace face);
-};
-
} // Quick
} // Render