diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
commit | 1d333d3375874efb8d37df37dc5ef561573794ad (patch) | |
tree | 2d8c995f64c05c84c1fcceb2c5cb40fcae69855f /tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml | |
parent | b106d86c433706928b0b0c206a0d9f831681e1bf (diff) | |
parent | e79a2658cde899d6ee11ec3c0d0a3768eb2c864b (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
Diffstat (limited to 'tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml')
-rw-r--r-- | tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml index ddea979124..7a743453ab 100644 --- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml +++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml @@ -6,8 +6,8 @@ Rectangle { color: "skyblue" ShaderEffect { anchors.centerIn: parent - width: 16 * 16 - height: 24 * 16 + width: 22 * 12 + height: 16 * 12 property variant source: ShaderEffectSource { sourceItem: Rectangle { width: 22 * 20 @@ -40,18 +40,7 @@ Rectangle { } smooth: true } - vertexShader: " - uniform highp mat4 qt_Matrix; - attribute highp vec4 qt_Vertex; - attribute highp vec2 qt_MultiTexCoord0; - varying highp vec2 qt_TexCoord0; - void main() { - highp vec4 pos = qt_Vertex; - pos.x += sin(qt_Vertex.y * 0.02) * 20.; - pos.y += sin(qt_Vertex.x * 0.02) * 20.; - gl_Position = qt_Matrix * pos; - qt_TexCoord0 = qt_MultiTexCoord0; - }" + vertexShader: "qrc:shaders/wave.vert" mesh: GridMesh { property int r: 1 resolution: Qt.size(r, r) |