diff options
Diffstat (limited to 'src/effects/shadereffectitem.h')
-rw-r--r-- | src/effects/shadereffectitem.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/effects/shadereffectitem.h b/src/effects/shadereffectitem.h index 15cfb54..1aa5c5c 100644 --- a/src/effects/shadereffectitem.h +++ b/src/effects/shadereffectitem.h @@ -59,21 +59,21 @@ class QGLFramebufferObject; class ShaderEffectSource : public QObject { Q_OBJECT - Q_PROPERTY(QxItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged); - Q_PROPERTY(QUrl sourceImage READ sourceImage WRITE setSourceImage NOTIFY sourceImageChanged); - Q_PROPERTY(FilterMode mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged); - Q_PROPERTY(FilterMode filtering READ filtering WRITE setFiltering NOTIFY filteringChanged); - Q_PROPERTY(WrapMode horizontalWrap READ horizontalWrap WRITE setHorizontalWrap NOTIFY horizontalWrapChanged); - Q_PROPERTY(WrapMode verticalWrap READ verticalWrap WRITE setVerticalWrap NOTIFY verticalWrapChanged); - Q_PROPERTY(QSize margins READ margins WRITE setMargins NOTIFY marginsChanged); - Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged); - Q_PROPERTY(int width READ width NOTIFY widthChanged); - Q_PROPERTY(int height READ height NOTIFY heightChanged); - Q_PROPERTY(bool static READ isStatic WRITE setStatic NOTIFY staticChanged); - Q_PROPERTY(bool hideOriginal READ hideOriginal WRITE setHideOriginal NOTIFY hideOriginalChanged); - Q_PROPERTY(bool active READ isActive NOTIFY activeChanged); - Q_ENUMS(FilterMode); - Q_ENUMS(WrapMode); + Q_PROPERTY(QxItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged) + Q_PROPERTY(QUrl sourceImage READ sourceImage WRITE setSourceImage NOTIFY sourceImageChanged) + Q_PROPERTY(FilterMode mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged) + Q_PROPERTY(FilterMode filtering READ filtering WRITE setFiltering NOTIFY filteringChanged) + Q_PROPERTY(WrapMode horizontalWrap READ horizontalWrap WRITE setHorizontalWrap NOTIFY horizontalWrapChanged) + Q_PROPERTY(WrapMode verticalWrap READ verticalWrap WRITE setVerticalWrap NOTIFY verticalWrapChanged) + Q_PROPERTY(QSize margins READ margins WRITE setMargins NOTIFY marginsChanged) + Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged) + Q_PROPERTY(int width READ width NOTIFY widthChanged) + Q_PROPERTY(int height READ height NOTIFY heightChanged) + Q_PROPERTY(bool static READ isStatic WRITE setStatic NOTIFY staticChanged) + Q_PROPERTY(bool hideOriginal READ hideOriginal WRITE setHideOriginal NOTIFY hideOriginalChanged) + Q_PROPERTY(bool active READ isActive NOTIFY activeChanged) + Q_ENUMS(FilterMode) + Q_ENUMS(WrapMode) public: enum FilterMode @@ -214,11 +214,11 @@ private: class ShaderEffectItem : public QxItem, public AbstractEffect { Q_OBJECT - Q_PROPERTY(QString fragmentShader READ fragmentShader WRITE setFragmentShader NOTIFY fragmentShaderChanged); - Q_PROPERTY(QString vertexShader READ vertexShader WRITE setVertexShader NOTIFY vertexShaderChanged); - Q_PROPERTY(bool blending READ blending WRITE setBlending NOTIFY blendingChanged); - Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged); - Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged); + Q_PROPERTY(QString fragmentShader READ fragmentShader WRITE setFragmentShader NOTIFY fragmentShaderChanged) + Q_PROPERTY(QString vertexShader READ vertexShader WRITE setVertexShader NOTIFY vertexShaderChanged) + Q_PROPERTY(bool blending READ blending WRITE setBlending NOTIFY blendingChanged) + Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged) + Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged) public: ShaderEffectItem(QxItem *parent = 0); |