diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-08 17:17:52 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-09 16:01:17 +0200 |
commit | 54e8e8714fdadb5b98a33ca5026049818ea49c45 (patch) | |
tree | 943a122f27fe3702710198203fc27c800c506508 /src | |
parent | 527c58e8f06a44ba12868ebeecc3bc4286462bc8 (diff) |
Renamed ShaderProgram to QShaderProgram
Change-Id: I7a9fd824f1975791ee7448023d089e06c34de69d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/renderer.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/renderer.h | 6 | ||||
-rw-r--r-- | src/render/backend/rendershader.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/rendershader.h | 6 | ||||
-rw-r--r-- | src/render/backend/renderview.cpp | 2 | ||||
-rw-r--r-- | src/render/frontend/qrenderpass.h | 2 | ||||
-rw-r--r-- | src/render/frontend/qshaderprogram.cpp (renamed from src/render/frontend/shaderprogram.cpp) | 24 | ||||
-rw-r--r-- | src/render/frontend/qshaderprogram.h (renamed from src/render/frontend/shaderprogram.h) | 10 | ||||
-rw-r--r-- | src/render/frontend/render-frontend.pri | 4 | ||||
-rw-r--r-- | src/render/io/assimpparser.h | 2 | ||||
-rw-r--r-- | src/render/io/gltfparser.cpp | 4 | ||||
-rw-r--r-- | src/render/io/gltfparser.h | 4 |
13 files changed, 38 insertions, 38 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index cbd4e2f09..1dda5cfdc 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -46,7 +46,7 @@ #include <Qt3DRenderer/tag.h> #include <Qt3DRenderer/qmesh.h> #include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/shaderprogram.h> +#include <Qt3DRenderer/qshaderprogram.h> #include <Qt3DRenderer/qviewport.h> #include <Qt3DRenderer/qrenderpassfilter.h> #include <Qt3DRenderer/qtechniquefilter.h> @@ -96,7 +96,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3D::QParameterMapper>(uri, 2, 0, "ParameterMapper"); qmlRegisterExtendedType<Qt3D::QMaterial, Qt3D::Render::Quick::Quick3DMaterial>(uri, 2, 0, "Material"); qmlRegisterExtendedType<Qt3D::QRenderPass, Qt3D::Render::Quick::Quick3DRenderPass>(uri, 2, 0, "RenderPass"); - qmlRegisterType<Qt3D::ShaderProgram>(uri, 2, 0, "ShaderProgram"); + qmlRegisterType<Qt3D::QShaderProgram>(uri, 2, 0, "ShaderProgram"); qmlRegisterUncreatableType<Qt3D::QAbstractMesh>(uri, 2, 0, "QAbstractMesh", QStringLiteral("QAbstractMesh is abstract")); qmlRegisterType<Qt3D::QMesh>(uri, 2, 0, "Mesh"); diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 2aece3fc9..c59def36c 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -55,7 +55,7 @@ #include <qmaterial.h> #include <qmesh.h> #include <qtechnique.h> -#include <shaderprogram.h> +#include <qshaderprogram.h> #include <qrenderpass.h> #include <qabstractshapemesh.h> #include <cameramanager.h> @@ -153,7 +153,7 @@ void Renderer::buildDefaultTechnique() m_defaultTechnique = new QTechnique; m_defaultTechnique->setObjectName(QStringLiteral("default-technique")); - ShaderProgram* defaultShader = new ShaderProgram; + QShaderProgram* defaultShader = new QShaderProgram; defaultShader->setVertexSourceFile(QStringLiteral(":/shaders/diffuse.vert")); defaultShader->setFragmentSourceFile(QStringLiteral(":/shaders/diffuse.frag")); defaultShader->setObjectName(QStringLiteral("DefaultShader")); diff --git a/src/render/backend/renderer.h b/src/render/backend/renderer.h index b2bcc2625..78ed8a7e3 100644 --- a/src/render/backend/renderer.h +++ b/src/render/backend/renderer.h @@ -68,7 +68,7 @@ namespace Qt3D { class QCamera; class QEntity; class QMaterial; -class ShaderProgram; +class QShaderProgram; class QMesh; class QRenderPass; class QAbstractShapeMesh; @@ -184,10 +184,10 @@ private: QHash<QMaterial*, RenderMaterial*> m_materialHash; QHash<QTechnique *, RenderTechnique*> m_techniqueHash; - QHash<ShaderProgram*, RenderShader*> m_shaderHash; + QHash<QShaderProgram*, RenderShader*> m_shaderHash; RenderTechnique *createTechnique(QTechnique *tech); - RenderShader *getOrCreateShader(ShaderProgram *sp); + RenderShader *getOrCreateShader(QShaderProgram *sp); RenderMaterial *getOrCreateMaterial(QMaterial *mat); QMaterial* m_defaultMaterial; diff --git a/src/render/backend/rendershader.cpp b/src/render/backend/rendershader.cpp index 5440ed732..a0a12958b 100644 --- a/src/render/backend/rendershader.cpp +++ b/src/render/backend/rendershader.cpp @@ -45,7 +45,7 @@ #include <QOpenGLContext> #include <QOpenGLShaderProgram> #include <Qt3DRenderer/QGraphicsContext> -#include <shaderprogram.h> +#include <qshaderprogram.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ RenderShader::RenderShader() : { } -void RenderShader::setPeer(ShaderProgram *peer) +void RenderShader::setPeer(QShaderProgram *peer) { Q_ASSERT(peer); m_peer = peer; diff --git a/src/render/backend/rendershader.h b/src/render/backend/rendershader.h index e55e70d1c..02de7e775 100644 --- a/src/render/backend/rendershader.h +++ b/src/render/backend/rendershader.h @@ -54,7 +54,7 @@ class QOpenGLShaderProgram; namespace Qt3D { -class ShaderProgram; +class QShaderProgram; namespace Render { @@ -63,7 +63,7 @@ class RenderShader public: RenderShader(); - void setPeer(ShaderProgram* peer); + void setPeer(QShaderProgram* peer); QString name() const; void updateUniforms(const QUniformPack &pack); @@ -73,7 +73,7 @@ public: private: QOpenGLShaderProgram* m_program; - ShaderProgram* m_peer; + QShaderProgram* m_peer; QOpenGLShaderProgram *createProgram(); QOpenGLShaderProgram *createDefaultProgram(); diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index d6dbabb6d..c9b93e039 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -506,7 +506,7 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass * RenderShader *shader = Q_NULLPTR; if ((shader = m_renderer->shaderManager()->data(command->m_shader)) == Q_NULLPTR) { shader = m_renderer->shaderManager()->getOrCreateResource(rPass->shaderProgram()->uuid()); - shader->setPeer(qobject_cast<ShaderProgram*>(rPass->shaderProgram())); + shader->setPeer(qobject_cast<QShaderProgram*>(rPass->shaderProgram())); command->m_shader = m_renderer->shaderManager()->lookupHandle(rPass->shaderProgram()->uuid()); } // TO DO : To be corrected later on diff --git a/src/render/frontend/qrenderpass.h b/src/render/frontend/qrenderpass.h index ae4b401c8..4f538c6d9 100644 --- a/src/render/frontend/qrenderpass.h +++ b/src/render/frontend/qrenderpass.h @@ -45,7 +45,7 @@ #include <Qt3DCore/qabstractrenderpass.h> #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/shaderprogram.h> +#include <Qt3DRenderer/qshaderprogram.h> #include <Qt3DRenderer/drawstate.h> #include <Qt3DRenderer/renderpasscriterion.h> diff --git a/src/render/frontend/shaderprogram.cpp b/src/render/frontend/qshaderprogram.cpp index 9ea851c28..63abf91dc 100644 --- a/src/render/frontend/shaderprogram.cpp +++ b/src/render/frontend/qshaderprogram.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "shaderprogram.h" +#include "qshaderprogram.h" #include <QDebug> #include <QFile> @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -ShaderProgram::ShaderProgram(QNode *parent) +QShaderProgram::QShaderProgram(QNode *parent) : QAbstractShader(parent) , m_vertexSourceFile() , m_fragmentSourceFile() @@ -56,7 +56,7 @@ ShaderProgram::ShaderProgram(QNode *parent) { } -void ShaderProgram::setVertexSourceFile(const QString& vertexSourceFile) +void QShaderProgram::setVertexSourceFile(const QString& vertexSourceFile) { if (vertexSourceFile != m_vertexSourceFile) { m_vertexSourceFile = vertexSourceFile; @@ -65,12 +65,12 @@ void ShaderProgram::setVertexSourceFile(const QString& vertexSourceFile) } } -QString ShaderProgram::vertexSourceFile() const +QString QShaderProgram::vertexSourceFile() const { return m_vertexSourceFile; } -void ShaderProgram::setFragmentSourceFile(const QString& fragmentSourceFile) +void QShaderProgram::setFragmentSourceFile(const QString& fragmentSourceFile) { if (fragmentSourceFile != m_fragmentSourceFile) { m_fragmentSourceFile = fragmentSourceFile; @@ -79,7 +79,7 @@ void ShaderProgram::setFragmentSourceFile(const QString& fragmentSourceFile) } } -QString ShaderProgram::fragmentSourceFile() const +QString QShaderProgram::fragmentSourceFile() const { return m_fragmentSourceFile; } @@ -89,7 +89,7 @@ QString ShaderProgram::fragmentSourceFile() const * Note that if vertexSourceFile is set, when load is called, * the shader code will be replaced by the shader located at vertexSourceFile. */ -void ShaderProgram::setVertexShader(const QByteArray &vertexShader) +void QShaderProgram::setVertexShader(const QByteArray &vertexShader) { if (vertexShader != m_cachedVertexCode) { m_cachedVertexCode = vertexShader; @@ -103,7 +103,7 @@ void ShaderProgram::setVertexShader(const QByteArray &vertexShader) * Note that if a fragmentSourceFile is set, when load is called, * the shader code will be replaced by the shader located at fragmentSourceFile. */ -void ShaderProgram::setFragmentShader(const QByteArray &fragmentShader) +void QShaderProgram::setFragmentShader(const QByteArray &fragmentShader) { if (fragmentShader != m_cachedFragmentCode) { m_cachedFragmentCode = fragmentShader; @@ -112,7 +112,7 @@ void ShaderProgram::setFragmentShader(const QByteArray &fragmentShader) } } -QByteArray ShaderProgram::vertexSourceCode() const +QByteArray QShaderProgram::vertexSourceCode() const { if (!isLoaded() && m_cachedVertexCode.isEmpty()) return QByteArray(); @@ -120,7 +120,7 @@ QByteArray ShaderProgram::vertexSourceCode() const return m_cachedVertexCode; } -QByteArray ShaderProgram::fragmentSourceCode() const +QByteArray QShaderProgram::fragmentSourceCode() const { if (!isLoaded() && m_cachedFragmentCode.isEmpty()) return QByteArray(); @@ -128,12 +128,12 @@ QByteArray ShaderProgram::fragmentSourceCode() const return m_cachedFragmentCode; } -bool ShaderProgram::isLoaded() const +bool QShaderProgram::isLoaded() const { return m_isLoaded; } -void ShaderProgram::load() +void QShaderProgram::load() { if (m_isLoaded) return; diff --git a/src/render/frontend/shaderprogram.h b/src/render/frontend/qshaderprogram.h index ff6b84d24..c995133f6 100644 --- a/src/render/frontend/shaderprogram.h +++ b/src/render/frontend/qshaderprogram.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QT3D_SHADERPROGRAM_H -#define QT3D_SHADERPROGRAM_H +#ifndef QT3D_QSHADERPROGRAM_H +#define QT3D_QSHADERPROGRAM_H #include <QUuid> #include <Qt3DCore/qabstractshader.h> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class QT3DRENDERERSHARED_EXPORT ShaderProgram : public QAbstractShader +class QT3DRENDERERSHARED_EXPORT QShaderProgram : public QAbstractShader { Q_OBJECT Q_PROPERTY(QString vertexSourceFile READ vertexSourceFile WRITE setVertexSourceFile NOTIFY vertexSourceFileChanged) @@ -59,7 +59,7 @@ class QT3DRENDERERSHARED_EXPORT ShaderProgram : public QAbstractShader Q_PROPERTY(QByteArray fragmentShader READ fragmentSourceCode WRITE setFragmentShader NOTIFY fragmentShaderChanged) public: - explicit ShaderProgram(QNode *parent = 0); + explicit QShaderProgram(QNode *parent = 0); void setVertexSourceFile(const QString &vertexSourceFile); QString vertexSourceFile() const; @@ -100,4 +100,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_SHADERPROGRAM_H +#endif // QT3D_QSHADERPROGRAM_H diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri index 8d8144aa6..5a60a7477 100644 --- a/src/render/frontend/render-frontend.pri +++ b/src/render/frontend/render-frontend.pri @@ -6,7 +6,7 @@ HEADERS += \ $$PWD/qmaterial.h \ $$PWD/qmesh.h \ $$PWD/qrenderpass.h \ - $$PWD/shaderprogram.h \ + $$PWD/qshaderprogram.h \ $$PWD/qtechnique.h \ $$PWD/tag.h \ $$PWD/qabstractshapemesh.h \ @@ -46,7 +46,7 @@ SOURCES += \ $$PWD/qmaterial.cpp \ $$PWD/qmesh.cpp \ $$PWD/qrenderpass.cpp \ - $$PWD/shaderprogram.cpp \ + $$PWD/qshaderprogram.cpp \ $$PWD/qtechnique.cpp \ $$PWD/qabstractshapemesh.cpp \ $$PWD/qitemmodelbuffer.cpp \ diff --git a/src/render/io/assimpparser.h b/src/render/io/assimpparser.h index 6ead76383..c706fd8ab 100644 --- a/src/render/io/assimpparser.h +++ b/src/render/io/assimpparser.h @@ -62,7 +62,7 @@ class QFile; namespace Qt3D { class QMaterial; -class ShaderProgram; +class QShaderProgram; class QEffect; class QCamera; class Texture; diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index c8a0ca143..fa23b3ca2 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -48,7 +48,7 @@ #include <qmesh.h> #include <qmaterial.h> #include <qtechnique.h> -#include <shaderprogram.h> +#include <qshaderprogram.h> #include <qeffect.h> #include <Qt3DCore/qcamera.h> #include <Qt3DCore/qtransform.h> @@ -695,7 +695,7 @@ void GLTFParser::processName(const QJsonObject &json, QObject *ins) void GLTFParser::processJSONProgram( QString id, QJsonObject jsonObj) { - ShaderProgram* prog = new ShaderProgram; + QShaderProgram* prog = new QShaderProgram; prog->setObjectName(id); QString fragName = jsonObj.value(KEY_FRAGMENT_SHADER).toString(), diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser.h index 57ac2248c..d06dc6d0b 100644 --- a/src/render/io/gltfparser.h +++ b/src/render/io/gltfparser.h @@ -61,7 +61,7 @@ class QFile; namespace Qt3D { class QMaterial; -class ShaderProgram; +class QShaderProgram; class QEffect; class QCamera; class QCameraLens; @@ -149,7 +149,7 @@ private: QMap<QString, BufferPtr> m_buffers; QMap<QString, QString> m_shaderPaths; - QMap<QString, ShaderProgram*> m_programs; + QMap<QString, QShaderProgram*> m_programs; QMap<QString, QTechnique *> m_techniques; // glTF doesn't deal in effects, but we need a trivial one to wrap |