diff options
23 files changed, 144 insertions, 145 deletions
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp index c2ed0cdbd..e6ed1c277 100644 --- a/examples/cpp_example/main.cpp +++ b/examples/cpp_example/main.cpp @@ -53,7 +53,7 @@ #include <Qt3DRenderer/qtechnique.h> #include <Qt3DRenderer/qmaterial.h> #include <Qt3DCore/qabstracteffect.h> -#include <Qt3DRenderer/texture.h> +#include <Qt3DRenderer/qtexture.h> #include <Qt3DRenderer/qrenderpass.h> #include <Qt3DRenderer/qscene.h> diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp index e54890c18..7a99ee40f 100644 --- a/examples/torus-cpp/main.cpp +++ b/examples/torus-cpp/main.cpp @@ -51,7 +51,7 @@ #include <Qt3DRenderer/qtechnique.h> #include <Qt3DRenderer/qmaterial.h> #include <Qt3DCore/qabstracteffect.h> -#include <Qt3DRenderer/texture.h> +#include <Qt3DRenderer/qtexture.h> #include <Qt3DRenderer/qrenderpass.h> #include <Qt3DRenderer/qscene.h> diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 0b57962c9..d7379605e 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -53,7 +53,7 @@ #include <Qt3DRenderer/qtechniquefilter.h> #include <Qt3DRenderer/qrendertargetselector.h> #include <Qt3DRenderer/qabstractshapemesh.h> -#include <Qt3DRenderer/texture.h> +#include <Qt3DRenderer/qtexture.h> #include <Qt3DRenderer/qframegraph.h> #include <Qt3DRenderer/qtechnique.h> #include <Qt3DRenderer/qcameraselector.h> @@ -131,7 +131,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3D::QDirectionalLight>(uri, 2, 0, "DirectionalLight"); qmlRegisterType<Qt3D::QSpotLight>(uri, 2, 0, "SpotLight"); - qmlRegisterExtendedType<Qt3D::Texture, Qt3D::Render::Quick::Quick3DTexture>(uri, 2, 0, "Texture"); + qmlRegisterExtendedType<Qt3D::QTexture, Qt3D::Render::Quick::Quick3DTexture>(uri, 2, 0, "Texture"); // Framegraph components - TODO RenderTarget, RenderTargetSelector qmlRegisterExtendedType<Qt3D::QCameraSelector, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "CameraSelector"); qmlRegisterExtendedType<Qt3D::QRenderPassFilter, Qt3D::Render::Quick::Quick3DRenderPassFilter>(uri, 2, 0, "RenderPassFilter"); diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp index 9308efeb7..a175cbef3 100644 --- a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp @@ -40,8 +40,7 @@ ****************************************************************************/ #include "quick3dmaterial.h" -#include <QDebug> -#include <Qt3DRenderer/texture.h> +#include <Qt3DRenderer/qtexture.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp index 0301a2d0d..2cbd338a9 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp @@ -54,8 +54,8 @@ namespace Quick { Quick3DTexture::Quick3DTexture(QObject *parent) : QObject(parent) { - parentTexture()->setTarget(Texture::Target2D); - parentTexture()->setFormat(Texture::RGBA8_UNorm); + parentTexture()->setTarget(QTexture::Target2D); + parentTexture()->setFormat(QTexture::RGBA8_UNorm); } QUrl Quick3DTexture::source() const @@ -73,8 +73,8 @@ void Quick3DTexture::setSource(QUrl arg) QImage img; if (img.load(source)) { parentTexture()->setFormat(img.hasAlphaChannel() ? - Texture::RGBA8_UNorm : - Texture::RGB8_UNorm); + QTexture::RGBA8_UNorm : + QTexture::RGB8_UNorm); parentTexture()->setFromQImage(img); } else { @@ -90,13 +90,13 @@ void Quick3DTexture::setSource(QUrl arg) void Quick3DTexture::setRectangle(bool r) { - parentTexture()->setTarget(r ? Texture::TargetRectangle : - Texture::Target2D); + parentTexture()->setTarget(r ? QTexture::TargetRectangle : + QTexture::Target2D); } bool Quick3DTexture::isRectangle() const { - return (parentTexture()->target() == Texture::TargetRectangle); + return (parentTexture()->target() == QTexture::TargetRectangle); } } // Quick diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.h b/src/quick3d/quick3drenderer/items/quick3dtexture.h index b8673dcea..1ab75f994 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtexture.h +++ b/src/quick3d/quick3drenderer/items/quick3dtexture.h @@ -44,7 +44,7 @@ #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> #include <Qt3DQuick/quick3dnode.h> -#include <Qt3DRenderer/texture.h> +#include <Qt3DRenderer/qtexture.h> #include <QUrl> @@ -77,7 +77,7 @@ Q_SIGNALS: private: QUrl m_source; - inline Qt3D::Texture *parentTexture() const { return qobject_cast<Qt3D::Texture *>(parent()); } + inline Qt3D::QTexture *parentTexture() const { return qobject_cast<Qt3D::QTexture *>(parent()); } }; } // Quick diff --git a/src/render/backend/rendertexture.cpp b/src/render/backend/rendertexture.cpp index 08840efb9..e78333e2c 100644 --- a/src/render/backend/rendertexture.cpp +++ b/src/render/backend/rendertexture.cpp @@ -44,7 +44,7 @@ #include <QDebug> #include <QOpenGLTexture> #include <QOpenGLPixelTransferOptions> -#include <texture.h> +#include <qtexture.h> #include <texturedata.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ RenderTexture::RenderTexture() : { } -void RenderTexture::setPeer(Texture *peer) +void RenderTexture::setPeer(QTexture *peer) { m_peer = peer; } diff --git a/src/render/backend/rendertexture_p.h b/src/render/backend/rendertexture_p.h index 126f42451..0d23a52e2 100644 --- a/src/render/backend/rendertexture_p.h +++ b/src/render/backend/rendertexture_p.h @@ -52,7 +52,7 @@ class QOpenGLTexture; namespace Qt3D { -class Texture; +class QTexture; namespace Render { @@ -61,12 +61,12 @@ class RenderTexture public: RenderTexture(); - void setPeer(Texture* peer); + void setPeer(QTexture* peer); QOpenGLTexture* getOrCreateGLTexture() ; GLint textureId(); private: - Texture* m_peer; + QTexture* m_peer; QOpenGLTexture* m_gl; QOpenGLTexture *buildGLTexture(); diff --git a/src/render/backend/rendertextureprovider.cpp b/src/render/backend/rendertextureprovider.cpp index 6a194d06a..219b75f28 100644 --- a/src/render/backend/rendertextureprovider.cpp +++ b/src/render/backend/rendertextureprovider.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "rendertextureprovider_p.h" -#include "texture.h" +#include "qtexture.h" #include <Qt3DRenderer/private/rendertexture_p.h> QT_BEGIN_NAMESPACE @@ -52,7 +52,7 @@ RenderTextureProvider::RenderTextureProvider() { } -RenderTexturePtr RenderTextureProvider::get(Texture *t) +RenderTexturePtr RenderTextureProvider::get(QTexture *t) { if (m_dict.contains(t)) return m_dict.value(t); diff --git a/src/render/backend/rendertextureprovider_p.h b/src/render/backend/rendertextureprovider_p.h index 938c9039c..42b516148 100644 --- a/src/render/backend/rendertextureprovider_p.h +++ b/src/render/backend/rendertextureprovider_p.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Texture; +class QTexture; namespace Render { @@ -61,9 +61,9 @@ class RenderTextureProvider public: RenderTextureProvider(); - Render::RenderTexturePtr get(Texture* t); + Render::RenderTexturePtr get(QTexture* t); private: - QHash<Texture*, Render::RenderTexturePtr> m_dict; + QHash<QTexture*, Render::RenderTexturePtr> m_dict; }; } // namespace Render diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index b84104320..5a6c0d9ce 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -44,7 +44,7 @@ #include <Qt3DRenderer/qmaterial.h> #include <Qt3DRenderer/qopenglfilter.h> #include <Qt3DRenderer/renderlogging.h> -#include <Qt3DRenderer/texture.h> +#include <Qt3DRenderer/qtexture.h> #include <Qt3DRenderer/private/cameramanager_p.h> #include <Qt3DRenderer/private/cameraselectornode_p.h> @@ -460,7 +460,7 @@ QList<RenderRenderPass *> RenderView::findRenderPassesForTechnique(RenderTechniq return passes; } -void RenderView::createRenderTexture(Texture *tex) +void RenderView::createRenderTexture(QTexture *tex) { if (!m_renderer->textureManager()->contains(tex->uuid())) { RenderTexture *rTex = m_renderer->textureManager()->getOrCreateResource(tex->uuid()); @@ -613,9 +613,9 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass * } else { QVariant value = parameters.take(binding->parameterName()); - Texture *tex = Q_NULLPTR; + QTexture *tex = Q_NULLPTR; if (static_cast<QMetaType::Type>(value.type()) == QMetaType::QObjectStar && - (tex = value.value<Qt3D::Texture*>()) != Q_NULLPTR) { + (tex = value.value<Qt3D::QTexture *>()) != Q_NULLPTR) { createRenderTexture(tex); command->m_uniforms.setTexture(binding->shaderVariableName(), tex->uuid()); TextureUniform *texUniform = m_allocator->allocate<TextureUniform>(); @@ -633,9 +633,9 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass * if (uniformNames.contains(paramName)) { QVariant value = parameters.take(paramName); - Texture *tex = Q_NULLPTR; + QTexture *tex = Q_NULLPTR; if (static_cast<QMetaType::Type>(value.type()) == QMetaType::QObjectStar && - (tex = value.value<Qt3D::Texture*>()) != Q_NULLPTR) { + (tex = value.value<Qt3D::QTexture *>()) != Q_NULLPTR) { createRenderTexture(tex); command->m_uniforms.setTexture(paramName, tex->uuid()); TextureUniform *texUniform = m_allocator->allocate<TextureUniform>(); diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index 4868d2e22..2532ee175 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -121,7 +121,7 @@ private: RenderTechnique *findTechniqueForEffect(RenderEffect *effect); QList<RenderRenderPass *> findRenderPassesForTechnique(RenderTechnique *technique); - void createRenderTexture(Texture *tex); + void createRenderTexture(QTexture *tex); void setShaderAndUniforms(RenderCommand *command, RenderRenderPass *pass, QHash<QString, QVariant> ¶meters); QHash<QString, QVariant> parametersFromMaterialEffectTechnique(RenderMaterial *material, RenderEffect *effect, RenderTechnique *technique); RenderStateSet *buildRenderStateSet(RenderRenderPass *pass); diff --git a/src/render/backend/texturedatamanager.cpp b/src/render/backend/texturedatamanager.cpp index 1f9822c86..8059d9dda 100644 --- a/src/render/backend/texturedatamanager.cpp +++ b/src/render/backend/texturedatamanager.cpp @@ -56,7 +56,7 @@ TextureDataManager::TextureDataManager() { } -void Qt3D::Render::TextureDataManager::addTextureData(Qt3D::Texture *texture) +void Qt3D::Render::TextureDataManager::addTextureData(Qt3D::QTexture *texture) { if (!contains(texture->uuid()) && !m_texturesPending.contains(texture)) m_texturesPending.append(texture); diff --git a/src/render/backend/texturedatamanager_p.h b/src/render/backend/texturedatamanager_p.h index afacef660..4d78ad1be 100644 --- a/src/render/backend/texturedatamanager_p.h +++ b/src/render/backend/texturedatamanager_p.h @@ -43,7 +43,7 @@ #define QT3D_RENDER_TEXTUREDATAMANAGER_H #include <Qt3DCore/QResourcesManager> -#include <Qt3DRenderer/texture.h> +#include <Qt3DRenderer/qtexture.h> #include <Qt3DRenderer/texturedata.h> #include <QUuid> @@ -65,13 +65,13 @@ class TextureDataManager : public QResourcesManager<TexImageData, public: TextureDataManager(); - void addTextureData(Texture *texture); + void addTextureData(QTexture *texture); - QList<Texture *> texturesPending() const { return m_texturesPending; } + QList<QTexture *> texturesPending() const { return m_texturesPending; } void clearTexturesPending() { m_texturesPending.clear(); } private: - QList<Texture *> m_texturesPending; + QList<QTexture *> m_texturesPending; }; } // Render diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp index caab154aa..b0ab9cdae 100644 --- a/src/render/frontend/qmaterial.cpp +++ b/src/render/frontend/qmaterial.cpp @@ -41,7 +41,7 @@ #include "qmaterial.h" #include "qmaterial_p.h" -#include <texture.h> +#include <qtexture.h> #include <Qt3DCore/qabstracteffect.h> #include "renderlogging.h" #include "qparameter.h" @@ -139,7 +139,7 @@ TextureDict QMaterial::textureValues() const } // TO DO: Check if this is really needed -void QMaterial::setTextureParameter(QString name, Texture *tex) +void QMaterial::setTextureParameter(QString name, QTexture *tex) { Q_D(QMaterial); d->m_textures[name] = tex; diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h index c5f2bc27f..bbf4d4890 100644 --- a/src/render/frontend/qmaterial.h +++ b/src/render/frontend/qmaterial.h @@ -55,10 +55,10 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Texture; +class QTexture; class QParameter; class QMaterialPrivate; -typedef QMap<QString, Texture*> TextureDict; +typedef QMap<QString, QTexture*> TextureDict; class QT3DRENDERERSHARED_EXPORT QMaterial : public QAbstractMaterial { @@ -77,7 +77,7 @@ public: TextureDict textureValues() const; - void setTextureParameter(QString name, Texture* tex); + void setTextureParameter(QString name, QTexture* tex); protected: Q_DECLARE_PRIVATE(QMaterial) diff --git a/src/render/frontend/texture.cpp b/src/render/frontend/qtexture.cpp index 43beaed1d..1cfe2b8f0 100644 --- a/src/render/frontend/texture.cpp +++ b/src/render/frontend/qtexture.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "texture.h" +#include "qtexture.h" #include <texturedata.h> @@ -51,57 +51,57 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class TexturePrivate : public QNodePrivate +class QTexturePrivate : public QNodePrivate { public : - TexturePrivate(Texture *qq) + QTexturePrivate(QTexture *qq) : QNodePrivate(qq) - , m_target(Texture::Target2D) - , m_format(Texture::RGBA8U) + , m_target(QTexture::Target2D) + , m_format(QTexture::RGBA8U) , m_width(1) , m_height(1) , m_depth(1) , m_autoMipMap(false) - , m_minFilter(Texture::Nearest) - , m_magFilter(Texture::Nearest) - , m_wrapMode(Texture::ClampToEdge) - , m_status(Texture::Loading) + , m_minFilter(QTexture::Nearest) + , m_magFilter(QTexture::Nearest) + , m_wrapMode(QTexture::ClampToEdge) + , m_status(QTexture::Loading) {} - Q_DECLARE_PUBLIC(Texture) + Q_DECLARE_PUBLIC(QTexture) - Texture::Target m_target; - Texture::TextureFormat m_format; + QTexture::Target m_target; + QTexture::TextureFormat m_format; int m_width, m_height, m_depth; bool m_autoMipMap; QList<TexImageDataPtr> m_data; - Texture::Filter m_minFilter, m_magFilter; + QTexture::Filter m_minFilter, m_magFilter; // FIXME, store per direction - Texture::WrapMode m_wrapMode; - Texture::Status m_status; + QTexture::WrapMode m_wrapMode; + QTexture::Status m_status; }; -Texture::Texture(QNode *parent) - : QNode(*new TexturePrivate(this), parent) +QTexture::QTexture(QNode *parent) + : QNode(*new QTexturePrivate(this), parent) { } -Texture::Texture(TexturePrivate &dd, QNode *parent) +QTexture::QTexture(QTexturePrivate &dd, QNode *parent) : QNode(dd, parent) { } -Texture::~Texture() +QTexture::~QTexture() { } -void Texture::copy(const QNode *ref) +void QTexture::copy(const QNode *ref) { QNode::copy(ref); - const Texture *t = qobject_cast<const Texture *>(t); + const QTexture *t = qobject_cast<const QTexture *>(ref); if (t != Q_NULLPTR) { setTarget(t->target()); setSize(t->width(), t->height(), t->depth()); @@ -114,111 +114,111 @@ void Texture::copy(const QNode *ref) } } -void Texture::setTarget(Target target) +void QTexture::setTarget(Target target) { - Q_D(Texture); + Q_D(QTexture); if (d->m_target != target) { d->m_target = target; } } -void Texture::setSize(int w, int h, int d) +void QTexture::setSize(int w, int h, int d) { setWidth(w); setHeight(h); setDepth(d); } -void Texture::setWidth(int width) +void QTexture::setWidth(int width) { - Q_D(Texture); + Q_D(QTexture); if (d->m_width != width) { d->m_width = width; emit widthChanged(); } } -void Texture::setHeight(int height) +void QTexture::setHeight(int height) { - Q_D(Texture); + Q_D(QTexture); if (d->m_height != height) { d->m_height = height; emit heightChanged(); } } -void Texture::setDepth(int depth) +void QTexture::setDepth(int depth) { - Q_D(Texture); + Q_D(QTexture); if (d->m_depth != depth) { d->m_depth = depth; emit depthChanged(); } } -int Texture::width() const +int QTexture::width() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_width; } -int Texture::height() const +int QTexture::height() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_height; } -int Texture::depth() const +int QTexture::depth() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_depth; } -void Texture::setFormat(TextureFormat format) +void QTexture::setFormat(TextureFormat format) { - Q_D(Texture); + Q_D(QTexture); if (d->m_format != format) { d->m_format = format; emit formatChanged(); } } -Texture::TextureFormat Texture::format() const +QTexture::TextureFormat QTexture::format() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_format; } -void Texture::setStatus(Status status) +void QTexture::setStatus(Status status) { - Q_D(Texture); + Q_D(QTexture); if (status != d->m_status) { d->m_status = status; emit statusChanged(); } } -QNode *Texture::doClone(QNode *clonedParent) const +QNode *QTexture::doClone(QNode *clonedParent) const { // TO DO: Copy TexImageDataPtr - return new Texture(clonedParent); + return new QTexture(clonedParent); } -Texture::Status Texture::status() const +QTexture::Status QTexture::status() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_status; } -Texture::Target Texture::target() const +QTexture::Target QTexture::target() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_target; } -bool Texture::setFromQImage(QImage img, int layer) +bool QTexture::setFromQImage(QImage img, int layer) { - Q_D(Texture); + Q_D(QTexture); setSize(img.width(), img.height()); if ((d->m_target != Target2D) && @@ -237,21 +237,21 @@ bool Texture::setFromQImage(QImage img, int layer) return true; } -void Texture::addImageData(TexImageDataPtr imgData) +void QTexture::addImageData(TexImageDataPtr imgData) { - Q_D(Texture); + Q_D(QTexture); d->m_data.append(imgData); } -QList<TexImageDataPtr> Texture::imageData() const +QList<TexImageDataPtr> QTexture::imageData() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_data; } -void Texture::setGenerateMipMaps(bool gen) +void QTexture::setGenerateMipMaps(bool gen) { - Q_D(Texture); + Q_D(QTexture); if (d->m_autoMipMap != gen) { d->m_autoMipMap = gen; emit generateMipMapsChanged(); @@ -259,15 +259,15 @@ void Texture::setGenerateMipMaps(bool gen) } } -bool Texture::generateMipMaps() const +bool QTexture::generateMipMaps() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_autoMipMap; } -void Texture::setMinificationFilter(Filter f) +void QTexture::setMinificationFilter(Filter f) { - Q_D(Texture); + Q_D(QTexture); if (d->m_minFilter != f) { d->m_minFilter = f; emit minificationFilterChanged(); @@ -275,9 +275,9 @@ void Texture::setMinificationFilter(Filter f) } } -void Texture::setMagnificationFilter(Filter f) +void QTexture::setMagnificationFilter(Filter f) { - Q_D(Texture); + Q_D(QTexture); if (d->m_magFilter != f) { d->m_magFilter = f; emit magnificationFilterChanged(); @@ -285,21 +285,21 @@ void Texture::setMagnificationFilter(Filter f) } } -Texture::Filter Texture::minificationFilter() const +QTexture::Filter QTexture::minificationFilter() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_minFilter; } -Texture::Filter Texture::magnificationFilter() const +QTexture::Filter QTexture::magnificationFilter() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_magFilter; } -void Texture::setWrapMode(WrapMode wrapMode) +void QTexture::setWrapMode(WrapMode wrapMode) { - Q_D(Texture); + Q_D(QTexture); if (d->m_wrapMode != wrapMode) { d->m_wrapMode = wrapMode; emit wrapModeChanged(); @@ -307,9 +307,9 @@ void Texture::setWrapMode(WrapMode wrapMode) } } -Texture::WrapMode Texture::wrapMode() const +QTexture::WrapMode QTexture::wrapMode() const { - Q_D(const Texture); + Q_D(const QTexture); return d->m_wrapMode; } diff --git a/src/render/frontend/texture.h b/src/render/frontend/qtexture.h index cb06e70df..8fa8e8987 100644 --- a/src/render/frontend/texture.h +++ b/src/render/frontend/qtexture.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QT3D_TEXTURE_H -#define QT3D_TEXTURE_H +#ifndef QT3D_QTEXTURE_H +#define QT3D_QTEXTURE_H #include <QOpenGLTexture> #include <Qt3DRenderer/texturedata.h> @@ -51,9 +51,9 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class TexturePrivate; +class QTexturePrivate; -class QT3DRENDERERSHARED_EXPORT Texture : public QNode +class QT3DRENDERERSHARED_EXPORT QTexture : public QNode { Q_OBJECT Q_ENUMS(Target) @@ -61,20 +61,20 @@ class QT3DRENDERERSHARED_EXPORT Texture : public QNode Q_ENUMS(Filter) Q_ENUMS(WrapMode) Q_ENUMS(Status) - Q_PROPERTY(Texture::Target target READ target WRITE setTarget NOTIFY targetChanged) - Q_PROPERTY(Texture::TextureFormat format READ format WRITE setFormat NOTIFY formatChanged) + Q_PROPERTY(QTexture::Target target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(QTexture::TextureFormat format READ format WRITE setFormat NOTIFY formatChanged) Q_PROPERTY(bool generateMipMaps READ generateMipMaps WRITE setGenerateMipMaps NOTIFY generateMipMapsChanged) - Q_PROPERTY(Texture::WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged) - Q_PROPERTY(Texture::Status status READ status NOTIFY statusChanged) + Q_PROPERTY(QTexture::WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged) + Q_PROPERTY(QTexture::Status status READ status NOTIFY statusChanged) Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged) Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) Q_PROPERTY(int depth READ depth WRITE setDepth NOTIFY depthChanged) - Q_PROPERTY(Texture::Filter magnificationFilter READ magnificationFilter WRITE setMagnificationFilter NOTIFY magnificationFilterChanged) - Q_PROPERTY(Texture::Filter minificationFilter READ minificationFilter WRITE setMinificationFilter NOTIFY minificationFilterChanged) + Q_PROPERTY(QTexture::Filter magnificationFilter READ magnificationFilter WRITE setMagnificationFilter NOTIFY magnificationFilterChanged) + Q_PROPERTY(QTexture::Filter minificationFilter READ minificationFilter WRITE setMinificationFilter NOTIFY minificationFilterChanged) public: - explicit Texture(QNode *parent = 0); - ~Texture(); + explicit QTexture(QNode *parent = 0); + ~QTexture(); enum Status { Loading = 0, @@ -288,8 +288,8 @@ Q_SIGNALS: protected: - Q_DECLARE_PRIVATE(Texture) - Texture(TexturePrivate &dd, QNode *parent = 0); + Q_DECLARE_PRIVATE(QTexture) + QTexture(QTexturePrivate &dd, QNode *parent = 0); void setStatus(Status status); QNode *doClone(QNode *clonedParent) const Q_DECL_OVERRIDE; }; @@ -298,6 +298,6 @@ protected: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::Texture*) +Q_DECLARE_METATYPE(Qt3D::QTexture*) -#endif // QT3D_TEXTURE_H +#endif // QT3D_QTEXTURE_H diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri index 601e3aebe..c9e7bb8d2 100644 --- a/src/render/frontend/render-frontend.pri +++ b/src/render/frontend/render-frontend.pri @@ -12,7 +12,7 @@ HEADERS += \ $$PWD/tag.h \ $$PWD/qabstractshapemesh.h \ $$PWD/qitemmodelbuffer.h \ - $$PWD/texture.h \ + $$PWD/qtexture.h \ $$PWD/sphere.h \ $$PWD/qabstractscene.h \ $$PWD/qeffect.h \ @@ -66,7 +66,7 @@ SOURCES += \ $$PWD/qtechnique.cpp \ $$PWD/qabstractshapemesh.cpp \ $$PWD/qitemmodelbuffer.cpp \ - $$PWD/texture.cpp \ + $$PWD/qtexture.cpp \ $$PWD/sphere.cpp \ $$PWD/qabstractscene.cpp \ $$PWD/qeffect.cpp \ diff --git a/src/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp index ec570d9c8..1d3e8ff86 100644 --- a/src/render/io/assimpparser.cpp +++ b/src/render/io/assimpparser.cpp @@ -51,7 +51,7 @@ #include <qmath.h> #include <Qt3DCore/qentity.h> #include <qmaterial.h> -#include <texture.h> +#include <qtexture.h> #include "renderlogging.h" #include "qbuffer.h" #include "qattribute.h" @@ -594,7 +594,7 @@ void AssimpParser::loadMesh(uint meshIndex) void AssimpParser::loadEmbeddedTexture(uint textureIndex) { aiTexture *assimpTexture = m_aiScene->mTextures[textureIndex]; - Texture *texture = new Texture(); + QTexture *texture = new QTexture(); TexImageDataPtr textureData(new TexImageData(0, 0)); bool isCompressed = assimpTexture->mHeight == 0; @@ -774,7 +774,7 @@ void AssimpParser::copyMaterialTextures(QMaterial *material, aiMaterial *assimpM // Load texture if not already loaded bool textureLoaded = true; if (!m_materialTextures.contains(fullPath)) { - Texture *tex = new Texture(); + QTexture *tex = new QTexture(); QImage textureImage; if (!textureImage.load(fullPath) || !textureImage.isNull()) { tex->setFromQImage(textureImage); diff --git a/src/render/io/assimpparser_p.h b/src/render/io/assimpparser_p.h index adae4709b..2f7dca78a 100644 --- a/src/render/io/assimpparser_p.h +++ b/src/render/io/assimpparser_p.h @@ -65,7 +65,7 @@ class QMaterial; class QShaderProgram; class QEffect; class QCamera; -class Texture; +class QTexture; class QMesh; class AssimpMesh; @@ -124,8 +124,8 @@ private : QMap<uint, AssimpMesh *> m_meshes; QMap<uint, QMaterial*> m_materials; QMap<uint, QEffect *> m_effects; - QMap<uint, Texture*> m_embeddedTextures; - QMap<QString, Texture*> m_materialTextures; + QMap<uint, QTexture*> m_embeddedTextures; + QMap<QString, QTexture*> m_materialTextures; QMap<aiNode*, QEntity*> m_cameras; QHash<aiTextureType, QString> m_textureToParameterName; diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 0e39da1b6..91ae3f81f 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -55,7 +55,7 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qmatrixtransform.h> #include <Qt3DCore/qcameralens.h> -#include <texture.h> +#include <qtexture.h> #include <qparameter.h> #include <QJsonDocument> @@ -773,7 +773,7 @@ void GLTFParser::processJSONImage( QString id, QJsonObject jsonObj) void GLTFParser::processJSONTexture( QString id, QJsonObject jsonObj) { - Texture* tex = new Texture(); + QTexture* tex = new QTexture(); int target = jsonObj.value(KEY_TARGET).toInt(); @@ -781,8 +781,8 @@ void GLTFParser::processJSONTexture( QString id, QJsonObject jsonObj) //int pixelFormat = jsonObj.value(KEY_FORMAT).toInt(); //int internalFormat = jsonObj.value(KEY_INTERNAL_FORMAT).toInt(); - tex->setTarget(static_cast<Texture::Target>(target)); - tex->setFormat(Texture::RGBA8_UNorm /* static_cast<QOpenGLTexture::TextureFormat>(internalFormat)*/); + tex->setTarget(static_cast<QTexture::Target>(target)); + tex->setFormat(QTexture::RGBA8_UNorm /* static_cast<QOpenGLTexture::TextureFormat>(internalFormat)*/); QString samplerId = jsonObj.value(KEY_SAMPLER).toString(); QString source = jsonObj.value(KEY_SOURCE).toString(); @@ -801,11 +801,11 @@ void GLTFParser::processJSONTexture( QString id, QJsonObject jsonObj) QJsonObject sampler = samplersDict.value(samplerId).toObject(); - tex->setWrapMode(static_cast<Texture::WrapMode>(sampler.value(KEY_WRAP_S).toInt())); + tex->setWrapMode(static_cast<QTexture::WrapMode>(sampler.value(KEY_WRAP_S).toInt())); // tex->setWrapMode(sampler.value("wrapT").toInt()); - tex->setMinificationFilter(static_cast<Texture::Filter>(sampler.value(KEY_MIN_FILTER).toInt())); - tex->setMagnificationFilter(static_cast<Texture::Filter>(sampler.value(KEY_MAG_FILTER).toInt())); + tex->setMinificationFilter(static_cast<QTexture::Filter>(sampler.value(KEY_MIN_FILTER).toInt())); + tex->setMagnificationFilter(static_cast<QTexture::Filter>(sampler.value(KEY_MAG_FILTER).toInt())); m_textures[id] = tex; } diff --git a/src/render/io/gltfparser_p.h b/src/render/io/gltfparser_p.h index 1e8edf73f..ffbb18930 100644 --- a/src/render/io/gltfparser_p.h +++ b/src/render/io/gltfparser_p.h @@ -66,7 +66,7 @@ class QShaderProgram; class QEffect; class QCamera; class QCameraLens; -class Texture; +class QTexture; class GLTFParser : public AbstractSceneParser { @@ -146,7 +146,7 @@ private: // up our techniques QMap<QString, QEffect*> m_effectProxies; - QMap<QString, Texture*> m_textures; + QMap<QString, QTexture*> m_textures; QMap<QString, QImage> m_images; QFile* resolveLocalData(QString path); |