1
=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
2
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-04-22 20:51:37 +0000
3
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-04-23 08:32:05 +0000
4
@@ -34,6 +34,7 @@
5
34
#include <QtQuick/QQuickWindow>
34
#include <QtQuick/QQuickWindow>
6
35
#include <QtQuick/QSGTextureProvider>
35
#include <QtQuick/QSGTextureProvider>
7
36
#include <QtQuick/private/qquickimage_p.h>
36
#include <QtQuick/private/qquickimage_p.h>
8
37
#include <QtQuick/private/qsgadaptationlayer_p.h>
9
37
#include <math.h>
38
#include <math.h>
10
38
39
11
39
// Anti-aliasing distance of the contour in pixels.
40
// Anti-aliasing distance of the contour in pixels.
12
@@ -208,6 +209,15 @@
13
208
        | (m_data.flags & ShapeMaterial::Data::Repeated);
209
        | (m_data.flags & ShapeMaterial::Data::Repeated);
14
209
}
210
}
15
210
211
16
212
void ShapeMaterial::updateTextures()
17
213
{
18
214
    if (m_data.flags & ShapeMaterial::Data::Textured && m_data.sourceTextureProvider) {
19
215
        if (QSGLayer* texture = qobject_cast<QSGLayer*>(m_data.sourceTextureProvider->texture())) {
20
216
            texture->updateTexture();
21
217
        }
22
218
    }
23
219
}
24
220
25
211
// --- Scene graph node ---
221
// --- Scene graph node ---
26
212
222
27
213
ShapeNode::ShapeNode()
223
ShapeNode::ShapeNode()
28
@@ -215,6 +225,7 @@
29
215
    , m_material()
225
    , m_material()
30
216
    , m_geometry(attributeSet(), vertexCount, indexCount, indexType)
226
    , m_geometry(attributeSet(), vertexCount, indexCount, indexType)
31
217
{
227
{
32
228
    QSGNode::setFlag(UsePreprocess, true);
33
218
    memcpy(m_geometry.indexData(), indices(), indexCount * indexTypeSize);
229
    memcpy(m_geometry.indexData(), indices(), indexCount * indexTypeSize);
34
219
    m_geometry.setDrawingMode(drawingMode);
230
    m_geometry.setDrawingMode(drawingMode);
35
220
    m_geometry.setIndexDataPattern(indexDataPattern);
231
    m_geometry.setIndexDataPattern(indexDataPattern);
36
221
232
37
=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.h'
38
--- modules/Ubuntu/Components/plugin/ucubuntushape.h	2015-04-14 21:50:54 +0000
39
+++ modules/Ubuntu/Components/plugin/ucubuntushape.h	2015-04-23 08:32:05 +0000
40
@@ -75,6 +75,7 @@
41
75
    virtual QSGMaterialType* type() const;
75
    virtual QSGMaterialType* type() const;
42
76
    virtual QSGMaterialShader* createShader() const;
76
    virtual QSGMaterialShader* createShader() const;
43
77
    virtual int compare(const QSGMaterial* other) const;
77
    virtual int compare(const QSGMaterial* other) const;
44
78
    virtual void updateTextures();
45
78
    const Data* constData() const { return &m_data; }
79
    const Data* constData() const { return &m_data; }
46
79
    Data* data() { return &m_data; }
80
    Data* data() { return &m_data; }
47
80
81
48
@@ -107,6 +108,7 @@
49
107
    ShapeNode();
108
    ShapeNode();
50
108
    ShapeMaterial* material() { return &m_material; }
109
    ShapeMaterial* material() { return &m_material; }
51
109
    QSGGeometry* geometry() { return &m_geometry; }
110
    QSGGeometry* geometry() { return &m_geometry; }
52
111
    void preprocess() { m_material.updateTextures(); }
53
110
112
54
111
private:
113
private:
55
112
    ShapeMaterial m_material;
114
    ShapeMaterial m_material;
56
113
115
57
=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp'
58
--- modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-04-22 20:51:37 +0000
59
+++ modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-04-23 08:32:05 +0000
60
@@ -60,6 +60,7 @@
61
60
    , m_geometry(attributeSet(), ShapeNode::vertexCount, ShapeNode::indexCount,
60
    , m_geometry(attributeSet(), ShapeNode::vertexCount, ShapeNode::indexCount,
62
61
                 ShapeNode::indexType)
61
                 ShapeNode::indexType)
63
62
{
62
{
64
63
    QSGNode::setFlag(UsePreprocess, true);
65
63
    memcpy(m_geometry.indexData(), ShapeNode::indices(),
64
    memcpy(m_geometry.indexData(), ShapeNode::indices(),
66
64
           ShapeNode::indexCount * ShapeNode::indexTypeSize);
65
           ShapeNode::indexCount * ShapeNode::indexTypeSize);
67
65
    m_geometry.setDrawingMode(ShapeNode::drawingMode);
66
    m_geometry.setDrawingMode(ShapeNode::drawingMode);
68
66
67
69
=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h'
70
--- modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h	2015-03-10 18:49:20 +0000
71
+++ modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h	2015-04-23 08:32:05 +0000
72
@@ -57,6 +57,7 @@
73
57
57
74
58
    ShapeOverlayNode();
58
    ShapeOverlayNode();
75
59
    QSGGeometry* geometry() { return &m_geometry; }
59
    QSGGeometry* geometry() { return &m_geometry; }
76
60
    void preprocess() { m_material.updateTextures(); }
77
60
61
78
61
private:
62
private:
79
62
    ShapeOverlayMaterial m_material;
63
    ShapeOverlayMaterial m_material;
80
63
64
81
=== added file 'tests/resources/ubuntushape/AnimatedShaderEffectSource.qml'
82
--- tests/resources/ubuntushape/AnimatedShaderEffectSource.qml	1970-01-01 00:00:00 +0000
83
+++ tests/resources/ubuntushape/AnimatedShaderEffectSource.qml	2015-04-23 08:32:05 +0000
84
@@ -0,0 +1,63 @@
85
1
/*
86
2
 * Copyright 2015 Canonical Ltd.
87
3
 *
88
4
 * This program is free software; you can redistribute it and/or modify
89
5
 * it under the terms of the GNU Lesser General Public License as published by
90
6
 * the Free Software Foundation; version 3.
91
7
 *
92
8
 * This program is distributed in the hope that it will be useful,
93
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
94
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
95
11
 * GNU Lesser General Public License for more details.
96
12
 *
97
13
 * You should have received a copy of the GNU Lesser General Public License
98
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
99
15
 */
100
16
101
17
// Test if the UbuntuShape is correctly updated when its source is a ShaderEffectSource.
102
18
103
19
import QtQuick 2.4
104
20
import Ubuntu.Components 1.2
105
21
106
22
Rectangle {
107
23
    id: root
108
24
    width: 300
109
25
    height: 150
110
26
    color: "#c0c0c0"
111
27
112
28
    Text {
113
29
        id: text
114
30
        anchors.centerIn: parent
115
31
        font.family: "Ubuntu"
116
32
        font.pixelSize: 34
117
33
        color: "#c0c0c0"
118
34
        text: "This is a scrolling text... "
119
35
        font.bold: true
120
36
    }
121
37
122
38
    ShaderEffectSource {
123
39
        id: effectSource
124
40
        sourceItem: text
125
41
        hideSource: true
126
42
        visible: false
127
43
    }
128
44
129
45
    UbuntuShape {
130
46
        id: shape
131
47
        anchors.fill: parent
132
48
        anchors.margins: 50
133
49
        backgroundColor: "black"
134
50
        radius: "medium"
135
51
        source: effectSource
136
52
        sourceFillMode: UbuntuShape.Pad
137
53
        sourceHorizontalAlignment: UbuntuShape.AlignLeft
138
54
        sourceHorizontalWrapMode: UbuntuShape.Repeat
139
55
140
56
        PropertyAnimation on sourceTranslation {
141
57
            from: Qt.vector2d(0.0, 0.0)
142
58
            to: Qt.vector2d(-text.width / shape.width, 0.0)
143
59
            loops: Animation.Infinite
144
60
            duration: 2500
145
61
        }
146
62
    }
147
63
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-04-30
Tim Peeters		2015-04-23	Approve on 2015-04-24
Review via email: mp+257228@code.launchpad.net