diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-23 15:14:07 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-02 14:18:20 +0100 |
commit | 6c8378eaf1edbbefe6aaa3672b0127816a004fd7 (patch) | |
tree | 8ee08fb447e052f7a7a685fbeaaa04f04ea60126 /src/declarative/items/qquickshadereffectnode_p.h | |
parent | e01219b77b1e889e70437635905d7ff820568e23 (diff) |
Say hello to QtQuick module
This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.
99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.
The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.
All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.
A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.
The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)
There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.
In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.
Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'src/declarative/items/qquickshadereffectnode_p.h')
-rw-r--r-- | src/declarative/items/qquickshadereffectnode_p.h | 151 |
1 files changed, 0 insertions, 151 deletions
diff --git a/src/declarative/items/qquickshadereffectnode_p.h b/src/declarative/items/qquickshadereffectnode_p.h deleted file mode 100644 index 50213ff396..0000000000 --- a/src/declarative/items/qquickshadereffectnode_p.h +++ /dev/null @@ -1,151 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKSHADEREFFECTNODE_P_H -#define QQUICKSHADEREFFECTNODE_P_H - -#include "qsgnode.h" -#include "qsgmaterial.h" -#include <private/qsgtextureprovider_p.h> -#include <qquickitem.h> - -#include <QtCore/qsharedpointer.h> -#include <QtCore/qpointer.h> - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Declarative) - -struct QQuickShaderEffectMaterialKey { - QByteArray vertexCode; - QByteArray fragmentCode; - const char *className; - - bool operator == (const QQuickShaderEffectMaterialKey &other) const; -}; - -uint qHash(const QQuickShaderEffectMaterialKey &key); - -// TODO: Implement support for multisampling. -struct QQuickShaderEffectProgram : public QQuickShaderEffectMaterialKey -{ - QQuickShaderEffectProgram() : respectsOpacity(false), respectsMatrix(false) {} - - QVector<QByteArray> attributeNames; - QSet<QByteArray> uniformNames; - - uint respectsOpacity : 1; - uint respectsMatrix : 1; -}; - - -class QQuickCustomMaterialShader; -class QQuickShaderEffectMaterial : public QSGMaterial -{ -public: - enum CullMode - { - NoCulling, - BackFaceCulling, - FrontFaceCulling - }; - - QQuickShaderEffectMaterial(); - virtual QSGMaterialType *type() const; - virtual QSGMaterialShader *createShader() const; - virtual int compare(const QSGMaterial *other) const; - - void setCullMode(CullMode face); - CullMode cullMode() const; - - void setProgramSource(const QQuickShaderEffectProgram &); - void setUniforms(const QVector<QPair<QByteArray, QVariant> > &uniformValues); - void setTextureProviders(const QVector<QPair<QByteArray, QSGTextureProvider *> > &textures); - const QVector<QPair<QByteArray, QSGTextureProvider *> > &textureProviders() const; - void updateTextures() const; - -protected: - friend class QQuickCustomMaterialShader; - - // The type pointer needs to be unique. It is not safe to let the type object be part of the - // QQuickShaderEffectMaterial, since it can be deleted and a new one constructed on top of the old - // one. The new QQuickShaderEffectMaterial would then get the same type pointer as the old one, and - // CustomMaterialShaders based on the old one would incorrectly be used together with the new - // one. To guarantee that the type pointer is unique, the type object must live as long as - // there are any CustomMaterialShaders of that type. - QSharedPointer<QSGMaterialType> m_type; - - QQuickShaderEffectProgram m_source; - QVector<QPair<QByteArray, QVariant> > m_uniformValues; - QVector<QPair<QByteArray, QSGTextureProvider *> > m_textures; - CullMode m_cullMode; - - static QHash<QQuickShaderEffectMaterialKey, QSharedPointer<QSGMaterialType> > materialMap; -}; - - -class QSGShaderEffectMesh; - -class QQuickShaderEffectNode : public QObject, public QSGGeometryNode -{ - Q_OBJECT -public: - QQuickShaderEffectNode(); - virtual ~QQuickShaderEffectNode(); - - virtual void preprocess(); - - QQuickShaderEffectMaterial *shaderMaterial() { return &m_material; } - -private Q_SLOTS: - void markDirtyTexture(); - -private: - QQuickShaderEffectMaterial m_material; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QQUICKSHADEREFFECTNODE_P_H |